Changeset 2229

Timestamp:

Feb 29, 2008, 2:10:58 PM (16 years ago)

Author:

patdenice

Message:

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.

Location:

trunk

Files:

• include/functions_url.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (2 diffs)
• profile.php (modified) (1 diff)

trunk/include/functions_url.inc.php

@@ -61 +61 @@
   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)
     {

trunk/include/functions_user.inc.php

@@ -867 +867 @@
   {
     $user_ids = array();
-    if (is_integer($arg_id))
+    if (is_numeric($arg_id))
     {
       $user_ids[] = $arg_id;
@@ -1228 +1228 @@
   else
   {
-    if (is_adviser())
+    if (script_basename() == 'admin' and is_adviser())
     {
       return 'adviser.mode@'.$_SERVER['SERVER_NAME'];

trunk/profile.php

@@ -229 +229 @@
       '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'],