From dda9f5db6678ca617aee36c0281d39325db5ef8c Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 23 Sep 2008 01:04:41 +0000 Subject: - removed #debug css rule (why would we need that in default-layout?) - order by rank is not available in calendar/chronology mode - small non-functional change in functions_search.inc.php (handy for plugin) - unused variables/smaller code/unused params in func call git-svn-id: http://piwigo.org/svn/trunk@2572 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_user.inc.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'include/functions_user.inc.php') diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index b25105c6e..472487342 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -42,7 +42,7 @@ function validate_mail_address($user_id, $mail_address) } $atom = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]'; // before arobase - $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name + $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i'; if ( !preg_match( $regex, $mail_address ) ) @@ -851,14 +851,7 @@ function get_default_language() */ function get_browser_language(&$lang) { - if (!empty($_SERVER["HTTP_ACCEPT_LANGUAGE"])) - { - $browser_language = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2); - } - else - { - $browser_language = ''; - } + $browser_language = substr(@$_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2); foreach (get_languages() as $language_code => $language_name) { if (substr($language_code, 0, 2) == $browser_language) -- cgit v1.2.3