Changeset 25729

Timestamp:

Nov 26, 2013, 9:54:07 PM (10 years ago)

Author:

mistic100

Message:

remove is_adviser() and get_email_address_as_display_text()

Location:

trunk

Files:

• admin/notification_by_mail.php (modified) (4 diffs)
• include/functions_user.inc.php (modified) (2 diffs)
• profile.php (modified) (1 diff)

trunk/admin/notification_by_mail.php

@@ -170 +170 @@
         'User %s [%s] added.',
         stripslashes($nbm_user['username']),
-        get_email_address_as_display_text($nbm_user['mail_address'])
+        $nbm_user['mail_address']
         );
     }
@@ -647 +647 @@
       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'])))
         {
@@ -655 +655 @@
       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']))
         {
@@ -701 +701 @@
                             )   ? '' : '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']
               );

trunk/include/functions_user.inc.php

@@ -1318 +1318 @@
 
 /**
- * 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.
  *
@@ -1370 +1358 @@
 
   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;
-  }
 }
 

trunk/profile.php

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