phpcs fix

[civicrm-core.git] / CRM / Utils / Rule.php

diff --git a/CRM/Utils/Rule.php b/CRM/Utils/Rule.php
index fbd45cedd254510a5b843fe515bec278722dfaaa..f5b1df363f9f7e0c4ee4056614b1782e0bf37a85 100644 (file)
--- a/CRM/Utils/Rule.php
+++ b/CRM/Utils/Rule.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -227,7 +227,6 @@ class CRM_Utils_Rule {
    *
    * @return bool
    *   true if valid date
-   * @static
    */
   public static function currentDate($date, $monthRequired = TRUE) {
     $config = CRM_Core_Config::singleton();
@@ -319,7 +318,6 @@ class CRM_Utils_Rule {
    *
    * @return bool
    *   true if valid date
-   * @static
    */
   public static function mysqlDate($date) {
     // allow date to be null
@@ -431,7 +429,8 @@ class CRM_Utils_Rule {
       'currency', array(
         'keyColumn' => 'name',
         'labelColumn' => 'symbol',
-      ));
+      )
+    );
     $value = str_replace($currencySymbols, '', $value);
 
     if ($config->monetaryThousandSeparator) {
@@ -444,7 +443,9 @@ class CRM_Utils_Rule {
     // ugly fix for CRM-6391: do not drop the thousand separator if
     // it looks like it’s separating decimal part (because a given
     // value undergoes a second cleanMoney() call, for example)
-    if ($mon_thousands_sep != '.' or substr($value, -3, 1) != '.') {
+    // CRM-15835 - in case the amount/value contains 0 after decimal
+    // eg 150.5 the following if condition will pass
+    if ($mon_thousands_sep != '.' or (substr($value, -3, 1) != '.' && substr($value, -2, 1) != '.')) {
       $value = str_replace($mon_thousands_sep, '', $value);
     }
 
@@ -557,8 +558,6 @@ class CRM_Utils_Rule {
    * See how file rules are written in HTML/QuickForm/file.php
    * Checks to make sure the uploaded file is ascii
    *
-   * @param array Uploaded file info (from $_FILES)
-   *
    * @return bool
    *   true if file has been uploaded, false otherwise
    */
@@ -574,8 +573,6 @@ class CRM_Utils_Rule {
   /**
    * Checks to make sure the uploaded file is in UTF-8, recodes if it's not
    *
-   * @param array Uploaded file info (from $_FILES)
-   *
    * @return bool
    *   whether file has been uploaded properly and is now in UTF-8
    */
@@ -604,8 +601,6 @@ class CRM_Utils_Rule {
    * See how file rules are written in HTML/QuickForm/file.php
    * Checks to make sure the uploaded file is html
    *
-   * @param array Uploaded file info (from $_FILES)
-   *
    * @return bool
    *   true if file has been uploaded, false otherwise
    */
@@ -619,16 +614,15 @@ class CRM_Utils_Rule {
   }
 
   /**
-   * Check if there is a record with the same name in the db
+   * Check if there is a record with the same name in the db.
    *
    * @param string $value
    *   The value of the field we are checking.
    * @param array $options
    *   The daoName and fieldName (optional ).
    *
-   * @return boolean
+   * @return bool
    *   true if object exists
-   * @static
    */
   public static function objectExists($value, $options) {
     $name = 'name';
@@ -756,7 +750,6 @@ class CRM_Utils_Rule {
    *
    * @return bool
    *   true if valid date
-   * @static
    */
   public static function qfDate($date) {
     $config = CRM_Core_Config::singleton();
@@ -808,4 +801,5 @@ class CRM_Utils_Rule {
   public static function qfKey($key) {
     return ($key) ? CRM_Core_Key::valid($key) : FALSE;
   }
+
 }