+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014 |
+ | Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| 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$
*
*/
*
* @return bool
* true if valid date
- * @static
*/
public static function currentDate($date, $monthRequired = TRUE) {
$config = CRM_Core_Config::singleton();
*
* @return bool
* true if valid date
- * @static
*/
public static function mysqlDate($date) {
// allow date to be null
'currency', array(
'keyColumn' => 'name',
'labelColumn' => 'symbol',
- ));
+ )
+ );
$value = str_replace($currencySymbols, '', $value);
if ($config->monetaryThousandSeparator) {
// 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);
}
return TRUE;
}
- // allow between 4-6 digits as postal code since india needs 6 and US needs 5 (or
- // if u disregard the first 0, 4 (thanx excel!)
- // FIXME: we need to figure out how to localize such rules
/**
+ * allow between 4-6 digits as postal code since india needs 6 and US needs 5 (or
+ * if u disregard the first 0, 4 (thanx excel!)
+ * FIXME: we need to figure out how to localize such rules
* @param $value
*
* @return bool
* 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
*/
/**
* 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
*/
* 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
*/
}
/**
- * 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';
*
* @return bool
* true if valid date
- * @static
*/
public static function qfDate($date) {
$config = CRM_Core_Config::singleton();
public static function qfKey($key) {
return ($key) ? CRM_Core_Key::valid($key) : FALSE;
}
+
}