Changeset 27158 for trunk

Timestamp:

Feb 4, 2014, 12:02:38 PM (11 years ago)

Author:

mistic100

Message:

remove PHP < 5.2 code

Location:

trunk/include

Files:

• functions.inc.php (modified) (2 diffs)
• functions_user.inc.php (modified) (1 diff)

trunk/include/functions.inc.php

@@ -2019 +2019 @@
 function url_check_format($url)
 {
-  if (version_compare(PHP_VERSION, '5.2.0') >= 0)
-  {
-    return filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED)!==false;
-  }
-  else
-  {
-    // http://mathiasbynens.be/demo/url-regex @imme_emosol
-    return (bool)preg_match('@^https?://(-\.)?([^\s/?\.#-]+\.?)+(/[^\s]*)?$@iS', $url);
-  }
+  return filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED)!==false;
 }
 
@@ -2038 +2030 @@
 function email_check_format($mail_address)
 {
-  if (version_compare(PHP_VERSION, '5.2.0') >= 0)
-  {
-    return filter_var($mail_address, FILTER_VALIDATE_EMAIL)!==false;
-  }
-  else
-  {
-    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
-    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
-    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
-
-    return (bool)preg_match($regex, $mail_address);
-  }
+  return filter_var($mail_address, FILTER_VALIDATE_EMAIL)!==false;
 }
 

trunk/include/functions_user.inc.php

@@ -940 +940 @@
     {
       $cookie = $user_id.'-'.$now.'-'.$key;
-      if (version_compare(PHP_VERSION, '5.2', '>=') )
-      {
-        setcookie($conf['remember_me_name'],
-            $cookie,
-            time()+$conf['remember_me_length'],
-            cookie_path(),ini_get('session.cookie_domain'),ini_get('session.cookie_secure'),
-            ini_get('session.cookie_httponly')
-          );
-      }
-      else
-      {
-        setcookie($conf['remember_me_name'],
-            $cookie,
-            time()+$conf['remember_me_length'],
-            cookie_path(),ini_get('session.cookie_domain'),ini_get('session.cookie_secure')
-          );
-      }
+      setcookie($conf['remember_me_name'],
+        $cookie,
+        time()+$conf['remember_me_length'],
+        cookie_path(),ini_get('session.cookie_domain'),ini_get('session.cookie_secure'),
+        ini_get('session.cookie_httponly')
+        );
     }
   }