archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from revision 2228.

Browse source 
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
This commit is contained in:
patdenice 2008-02-29 13:10:58 +00:00
commit c38328da6b
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/functions_url.inc.php
View file

@ -60,7 +60,15 @@ function get_absolute_root_url($with_scheme=true)
$url = ''; $url = '';
if ($with_scheme) 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) if ($_SERVER['SERVER_PORT'] != 80)
{ {
$url_port = ':'.$_SERVER['SERVER_PORT']; $url_port = ':'.$_SERVER['SERVER_PORT'];

4
include/functions_user.inc.php
View file

@ -866,7 +866,7 @@ function create_user_infos($arg_id, $override_values = null)
else else
{ {
$user_ids = array(); $user_ids = array();
if (is_integer($arg_id)) if (is_numeric($arg_id))
{ {
$user_ids[] = $arg_id; $user_ids[] = $arg_id;
} }
@ -1227,7 +1227,7 @@ function get_email_address_as_display_text($email_address)
} }
else else
{ {
if (is_adviser()) if (script_basename() == 'admin' and is_adviser())
{ {
return 'adviser.mode@'.$_SERVER['SERVER_NAME']; return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
} }

2
profile.php
View file

@ -228,7 +228,7 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
array( array(
'USERNAME'=>$userdata['username'], 'USERNAME'=>$userdata['username'],
'USERID'=>$userdata['id'], 'USERID'=>$userdata['id'],
'EMAIL'=>@$userdata['email'], 'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
'NB_IMAGE_LINE'=>$userdata['nb_image_line'], 'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
'NB_ROW_PAGE'=>$userdata['nb_line_page'], 'NB_ROW_PAGE'=>$userdata['nb_line_page'],
'RECENT_PERIOD'=>$userdata['recent_period'], 'RECENT_PERIOD'=>$userdata['recent_period'],