From 234a64607b54be1003659cdb192d6328c2bf5cf8 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Fri, 29 Feb 2008 13:04:00 +0000
Subject: 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/branches/branch-1_7@2228 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_url.inc.php  | 10 +++++++++-
 include/functions_user.inc.php |  4 ++--
 profile.php                    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 99d30acf5..fb94cb4b4 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 14666da7f..6817ec263 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -838,7 +838,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;
     }
@@ -1233,7 +1233,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'];
     }
diff --git a/profile.php b/profile.php
index 127ba3cc8..26d73b5a9 100644
--- a/profile.php
+++ b/profile.php
@@ -225,7 +225,7 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
     array(
       'USERNAME'=>$userdata['username'],
       'USERID'=>$userdata['id'],
-      'EMAIL'=>@$userdata['email'],
+      'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
       'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
       'NB_ROW_PAGE'=>$userdata['nb_line_page'],
       'RECENT_PERIOD'=>$userdata['recent_period'],
-- 
cgit v1.2.3