Changeset 127 for branches/2.0singleton/lib/FormValidator.inc.php

Timestamp:

May 25, 2006 10:21:07 PM (18 years ago)

Author:

scdev

Message:

Updated App.inc.php thru Hierarchy.inc.php

File:

• branches/2.0singleton/lib/FormValidator.inc.php (modified) (5 diffs)

branches/2.0singleton/lib/FormValidator.inc.php

@@ -389 +389 @@
     function validateEmail($form_name)
     {
+        $app =& App::getInstance();
+    
         $email = getFormData($form_name);
         if ('' == trim($email)) {
@@ -400 +402 @@
         if (!preg_match($e->getParam('regex'), $email, $e_parts)) {
             $this->addError($form_name, sprintf(_("<strong>%s</strong> is not a valid email address."), oTxt($email)));
-            App::logMsg(sprintf('The email address %s is not valid.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('The email address %s is not valid.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -412 +414 @@
         if (strlen($local) > 64 || strlen($domain) > 191) {
             $this->addError($form_name, sprintf(_("<strong>Email address</strong> must contain less than 256 characters."), oTxt($email)));
-            App::logMsg(sprintf('The email address %s must contain less than 256 characters.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('The email address %s must contain less than 256 characters.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -420 +422 @@
         if ((ip2long($domain) == '-1' || ip2long($domain) === false) && function_exists('checkdnsrr') && !checkdnsrr($domain . '.', 'MX') && gethostbyname($domain) == $domain) {
             $this->addError($form_name, sprintf(_("<strong>%s</strong> is not a valid email domain name"), oTxt($domain)));
-            App::logMsg(sprintf('The email address %s contains an invalid email domain name (%s).', getFormData($form_name), $domain), LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg(sprintf('The email address %s contains an invalid email domain name (%s).', getFormData($form_name), $domain), LOG_INFO, __FILE__, __LINE__);
             return false;
         }
@@ -454 +456 @@
     function validateStrDate($form_name, $msg='')
     {
+        $app =& App::getInstance();
+    
         if (($timestamp = strtotime(getFormData($form_name, '0'))) === -1) {
             $this->addError($form_name, $msg);
-            App::logMsg(sprintf('The string date %s is not valid.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('The string date %s is not valid.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         } else {