Changeset 2228


Ignore:
Timestamp:
Feb 29, 2008, 2:04:00 PM (16 years ago)
Author:
patdenice
Message:

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:
branches/branch-1_7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1_7/include/functions_url.inc.php

    r2082 r2228  
    6161  if ($with_scheme)
    6262  {
    63     $url .= 'http://'.$_SERVER['HTTP_HOST'];
     63    if (empty($_SERVER['HTTPS']))
     64    {
     65      $url .= 'http://';
     66    }
     67    else
     68    {
     69      $url .= 'https://';
     70    }
     71    $url .= $_SERVER['HTTP_HOST'];
    6472    if ($_SERVER['SERVER_PORT'] != 80)
    6573    {
  • branches/branch-1_7/include/functions_user.inc.php

    r2220 r2228  
    839839  {
    840840    $user_ids = array();
    841     if (is_integer($arg_id))
     841    if (is_numeric($arg_id))
    842842    {
    843843      $user_ids[] = $arg_id;
     
    12341234  else
    12351235  {
    1236     if (is_adviser())
     1236    if (script_basename() == 'admin' and is_adviser())
    12371237    {
    12381238      return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
  • branches/branch-1_7/profile.php

    r2015 r2228  
    226226      'USERNAME'=>$userdata['username'],
    227227      'USERID'=>$userdata['id'],
    228       'EMAIL'=>@$userdata['email'],
     228      'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
    229229      'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
    230230      'NB_ROW_PAGE'=>$userdata['nb_line_page'],
Note: See TracChangeset for help on using the changeset viewer.