adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 09:43:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove PHP < 5.2 code

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@27158 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-02-04 11:02:38 +00:00
parent f286327ad6
commit 922de9a63d
2 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+2 -21
View File
@@ -2018,15 +2018,7 @@ function mobile_theme()
*/
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;
}
/**
@@ -2037,18 +2029,7 @@ function url_check_format($url)
*/
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;
}
/**
include/functions_user.inc.php
+6 -17
View File
@@ -939,23 +939,12 @@ function log_user($user_id, $remember_me)
if ($key!==false)
{
$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')
);
}
}
else