From c38328da6b3bdd931c05e0a9087f0c75174f312d Mon Sep 17 00:00:00 2001 From: patdenice Date: Fri, 29 Feb 2008 13:10:58 +0000 Subject: Merge from revision 2228. Resolved bugs: 741 and 793: Added user does not appear in listing. 769: show email address in adviser mode when editing user profil. 800: get_absolute_root_url does not work with https protocol. git-svn-id: http://piwigo.org/svn/trunk@2229 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_url.inc.php | 10 +++++++++- include/functions_user.inc.php | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php index 00511e151..44b592036 100644 --- a/include/functions_url.inc.php +++ b/include/functions_url.inc.php @@ -60,7 +60,15 @@ function get_absolute_root_url($with_scheme=true) $url = ''; if ($with_scheme) { - $url .= 'http://'.$_SERVER['HTTP_HOST']; + if (empty($_SERVER['HTTPS'])) + { + $url .= 'http://'; + } + else + { + $url .= 'https://'; + } + $url .= $_SERVER['HTTP_HOST']; if ($_SERVER['SERVER_PORT'] != 80) { $url_port = ':'.$_SERVER['SERVER_PORT']; diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 53d6da3c1..e78ffb01a 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -866,7 +866,7 @@ function create_user_infos($arg_id, $override_values = null) else { $user_ids = array(); - if (is_integer($arg_id)) + if (is_numeric($arg_id)) { $user_ids[] = $arg_id; } @@ -1227,7 +1227,7 @@ function get_email_address_as_display_text($email_address) } else { - if (is_adviser()) + if (script_basename() == 'admin' and is_adviser()) { return 'adviser.mode@'.$_SERVER['SERVER_NAME']; } -- cgit v1.2.3