Changeset 25729


Ignore:
Timestamp:
Nov 26, 2013, 9:54:07 PM (7 years ago)
Author:
mistic100
Message:

remove is_adviser() and get_email_address_as_display_text()

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/notification_by_mail.php

    r25360 r25729  
    170170        'User %s [%s] added.',
    171171        stripslashes($nbm_user['username']),
    172         get_email_address_as_display_text($nbm_user['mail_address'])
     172        $nbm_user['mail_address']
    173173        );
    174174    }
     
    647647      if (get_boolean($nbm_user['enabled']))
    648648      {
    649         $opt_true[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.get_email_address_as_display_text($nbm_user['mail_address']).']';
     649        $opt_true[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.$nbm_user['mail_address'].']';
    650650        if ((isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true'])))
    651651        {
     
    655655      else
    656656      {
    657         $opt_false[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.get_email_address_as_display_text($nbm_user['mail_address']).']';
     657        $opt_false[ $nbm_user['check_key'] ] = stripslashes($nbm_user['username']).'['.$nbm_user['mail_address'].']';
    658658        if (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false']))
    659659        {
     
    701701                            )   ? '' : 'checked="checked"',
    702702              'USERNAME'=> stripslashes($nbm_user['username']),
    703               'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']),
     703              'EMAIL' => $nbm_user['mail_address'],
    704704              'LAST_SEND'=> $nbm_user['last_send']
    705705              );
  • trunk/include/functions_user.inc.php

    r25728 r25729  
    13181318
    13191319/**
    1320  * Adviser status is depreciated from piwigo 2.2
    1321  * @return false
    1322  */
    1323 function is_adviser()
    1324 {
    1325   // TODO for Piwigo 2.4 : trigger a warning. We don't do it on Piwigo 2.3
    1326   // to avoid changes for plugin contributors
    1327   // trigger_error('call to obsolete function is_adviser', E_USER_WARNING);
    1328   return false;
    1329 }
    1330 
    1331 /**
    13321320 * Returns if current user can edit/delete/validate a comment.
    13331321 *
     
    13701358
    13711359  return false;
    1372 }
    1373 
    1374 /**
    1375  * Return mail address as display text
    1376  * @return string
    1377  */
    1378 function get_email_address_as_display_text($email_address)
    1379 {
    1380   global $conf;
    1381 
    1382   if (!isset($email_address) or (trim($email_address) == ''))
    1383   {
    1384     return '';
    1385   }
    1386   else
    1387   {
    1388     return $email_address;
    1389   }
    13901360}
    13911361
  • trunk/profile.php

    r25120 r25729  
    305305    array(
    306306      'USERNAME'=>stripslashes($userdata['username']),
    307       'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
     307      'EMAIL'=>@$userdata['email'],
    308308      'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'],
    309309      'ACTIVATE_COMMENTS'=>$conf['activate_comments'],
Note: See TracChangeset for help on using the changeset viewer.