Changeset 18049


Ignore:
Timestamp:
09/19/12 17:35:21 (7 years ago)
Author:
Eric
Message:

Using pwg_mail_notification_admins() to send validation link to admins and webmaster - Removing commented code
Reference language files updated for admin's email subject and content
changelog.txt.php updated - Todo : New simplifed administration panel

Location:
extensions/UserAdvManager/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r17974 r18049  
    341341 
    342342-- 2.41.0 : Bug 2744 fixed - User connexion rejection does not work if no group/status/privacy is set 
    343                                                 New unvalidated user controls more efficient 
    344                                                 New simplifed administration panel 
     343            New unvalidated user controls more efficient 
     344            Get admins emails instead of webmaster's for sending validation email 
     345            TODO - New simplifed administration panel 
    345346*/ 
    346347?> 
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r17989 r18049  
    11811181                if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') 
    11821182                { 
    1183                         $keyargs_content = array(); 
    1184                 $keyargs_content[] = get_l10n_args('Manual validation needed for %s', $username); 
     1183                                $keyargs_content = array(); 
     1184                $keyargs_content[] = get_l10n_args('UAM Manual validation needed for %s', $username); 
    11851185                $keyargs_content[] = get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)); 
    1186                 pwg_mail_notification_admins(get_l10n_args('Manual validation for %s',$username),$keyargs_content,false); 
    1187 #               $admins = array(); 
    1188 #      $query = ' 
    1189 #    SELECT 
    1190 #        u.'.$conf['user_fields']['username'].' AS username, 
    1191 #        u.'.$conf['user_fields']['email'].' AS mail_address 
    1192 #      FROM '.USERS_TABLE.' AS u 
    1193 #        JOIN '.USER_INFOS_TABLE.' AS i ON i.user_id =  u.'.$conf['user_fields']['id'].' 
    1194 #      WHERE i.status in (\'webmaster\',  \'admin\') 
    1195 #        AND '.$conf['user_fields']['email'].' IS NOT NULL 
    1196 #        AND i.user_id <> '.$user['id'].' 
    1197 #      ORDER BY username 
    1198 #    ;'; 
    1199 #     
    1200 #      $datas = pwg_query($query); 
    1201 #      if (!empty($datas)) 
    1202 #      { 
    1203 #        while ($admin = pwg_db_fetch_assoc($datas)) 
    1204 #        { 
    1205 #          if (!empty($admin['mail_address'])) 
    1206 #          { 
    1207 #            array_push($admins, format_email($admin['username'], $admin['mail_address'])); 
    1208 #          } 
    1209 #        } 
    1210 #      } 
    1211 #      pwg_mail(implode(', ', $admins), array( 
    1212 #               'subject' => $subject, 
    1213 #      'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 
    1214 #    )); 
     1186                pwg_mail_notification_admins(get_l10n_args('UAM Subjet manual validation for %s',$username),$keyargs_content,false); 
    12151187                } 
    12161188                else 
  • extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r17947 r18049  
    427427Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>'; 
    428428// --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7 
     429 
     430 
     431// --------- Starting below: New or revised $lang ---- from version 2.41.0 
     432$lang['UAM Subjet manual validation for %s'] = 'Registration of %s waits for validation'; 
     433$lang['UAM Manual validation needed for %s'] = 'The user %s has registered and awaits for manual validation by an admin.'; 
     434// --------- End: New or revised $lang ---- from version 2.41.0 
    429435?> 
  • extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r17988 r18049  
    434434 
    435435// --------- Starting below: New or revised $lang ---- from version 2.41.0 
    436 $lang['Manual validation for %s'] = 'Inscription de %s à valider'; 
     436$lang['UAM Subjet manual validation for %s'] = 'Inscription de %s à valider'; 
     437$lang['UAM Manual validation needed for %s'] = 'L\'utilisateur %s s\'est inscrit et demande une validation manuelle par un administrateur.'; 
    437438// --------- End: New or revised $lang ---- from version 2.41.0 
    438439?> 
Note: See TracChangeset for help on using the changeset viewer.