mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 11:49:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove is_adviser() and get_email_address_as_display_text()

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@25729 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2013-11-26 20:54:07 +00:00
parent 79f0a80f33
commit 45afbb48fb
3 changed files with 5 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/notification_by_mail.php
View file

@ -169,7 +169,7 @@ order by
$page['infos'][] = l10n( $page['infos'][] = l10n(
'User %s [%s] added.', 'User %s [%s] added.',
stripslashes($nbm_user['username']), stripslashes($nbm_user['username']),
get_email_address_as_display_text($nbm_user['mail_address']) $nbm_user['mail_address']
); );
} }
@ -646,7 +646,7 @@ switch ($page['mode'])
{ {
if (get_boolean($nbm_user['enabled'])) if (get_boolean($nbm_user['enabled']))
{ {
$opt_true[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.get_email_address_as_display_text($nbm_user['mail_address']).']'; $opt_true[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.$nbm_user['mail_address'].']';
if ((isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true']))) if ((isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true'])))
{ {
$opt_true_selected[] = $nbm_user['check_key']; $opt_true_selected[] = $nbm_user['check_key'];
@ -654,7 +654,7 @@ switch ($page['mode'])
} }
else else
{ {
$opt_false[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.get_email_address_as_display_text($nbm_user['mail_address']).']'; $opt_false[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.$nbm_user['mail_address'].']';
if (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false'])) if (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false']))
{ {
$opt_false_selected[] = $nbm_user['check_key']; $opt_false_selected[] = $nbm_user['check_key'];
@ -700,7 +700,7 @@ switch ($page['mode'])
!in_array($nbm_user['check_key'], $_POST['send_selection']) // not selected !in_array($nbm_user['check_key'], $_POST['send_selection']) // not selected
) ? '' : 'checked="checked"', ) ? '' : 'checked="checked"',
'USERNAME'=> stripslashes($nbm_user['username']), 'USERNAME'=> stripslashes($nbm_user['username']),
'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']), 'EMAIL' => $nbm_user['mail_address'],
'LAST_SEND'=> $nbm_user['last_send'] 'LAST_SEND'=> $nbm_user['last_send']
); );
} }

30
include/functions_user.inc.php
View file

@ -1316,18 +1316,6 @@ function is_webmaster($user_status='')
return is_autorize_status(ACCESS_WEBMASTER, $user_status); return is_autorize_status(ACCESS_WEBMASTER, $user_status);
} }
/**
* Adviser status is depreciated from piwigo 2.2
* @return false
*/
function is_adviser()
{
// TODO for Piwigo 2.4 : trigger a warning. We don't do it on Piwigo 2.3
// to avoid changes for plugin contributors
// trigger_error('call to obsolete function is_adviser', E_USER_WARNING);
return false;
}
/** /**
* Returns if current user can edit/delete/validate a comment. * Returns if current user can edit/delete/validate a comment.
* *
@ -1371,24 +1359,6 @@ function can_manage_comment($action, $comment_author_id)
return false; return false;
} }
/**
* Return mail address as display text
* @return string
*/
function get_email_address_as_display_text($email_address)
{
global $conf;
if (!isset($email_address) or (trim($email_address) == ''))
{
return '';
}
else
{
return $email_address;
}
}
/** /**
* Compute sql WHERE condition with restrict and filter data. * Compute sql WHERE condition with restrict and filter data.
* "FandF" means Forbidden and Filters. * "FandF" means Forbidden and Filters.

2
profile.php
View file

@ -304,7 +304,7 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
$template->assign( $template->assign(
array( array(
'USERNAME'=>stripslashes($userdata['username']), 'USERNAME'=>stripslashes($userdata['username']),
'EMAIL'=>get_email_address_as_display_text(@$userdata['email']), 'EMAIL'=>@$userdata['email'],
'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'], 'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'],
'ACTIVATE_COMMENTS'=>$conf['activate_comments'], 'ACTIVATE_COMMENTS'=>$conf['activate_comments'],
'NB_IMAGE_PAGE'=>$userdata['nb_image_page'], 'NB_IMAGE_PAGE'=>$userdata['nb_image_page'],