From 45afbb48fb9b18ccc8d4ca792cc64a23ec3bb6db Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Tue, 26 Nov 2013 20:54:07 +0000
Subject: [PATCH] remove is_adviser() and get_email_address_as_display_text()

git-svn-id: http://piwigo.org/svn/trunk@25729 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/notification_by_mail.php |  8 ++++----
 include/functions_user.inc.php | 30 ------------------------------
 profile.php                    |  2 +-
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 8c2f5e278..fefc23560 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -169,7 +169,7 @@ order by
       $page['infos'][] = l10n(
         'User %s [%s] added.',
         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']))
       {
-        $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'])))
         {
           $opt_true_selected[] = $nbm_user['check_key'];
@@ -654,7 +654,7 @@ switch ($page['mode'])
       }
       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']))
         {
           $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
                             )   ? '' : 'checked="checked"',
               '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']
               );
         }
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index ece020b59..0500f772f 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -1316,18 +1316,6 @@ function is_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.
  *
@@ -1371,24 +1359,6 @@ function can_manage_comment($action, $comment_author_id)
   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.
  * "FandF" means Forbidden and Filters.
diff --git a/profile.php b/profile.php
index 050459ccf..eae1d9a7a 100644
--- a/profile.php
+++ b/profile.php
@@ -304,7 +304,7 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
   $template->assign(
     array(
       'USERNAME'=>stripslashes($userdata['username']),
-      'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
+      'EMAIL'=>@$userdata['email'],
       'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'],
       'ACTIVATE_COMMENTS'=>$conf['activate_comments'],
       'NB_IMAGE_PAGE'=>$userdata['nb_image_page'],