Changeset 18049

Timestamp:

Sep 19, 2012, 5:35:21 PM (12 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:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -341 +341 @@
 
 -- 2.41.0 : Bug 2744 fixed - User connexion rejection does not work if no group/status/privacy is set
-                                                New unvalidated user controls more efficient
-                                                New simplifed administration panel
+            New unvalidated user controls more efficient
+            Get admins emails instead of webmaster's for sending validation email
+            TODO - New simplifed administration panel
 */
 ?>

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -1181 +1181 @@
                 if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
                 {
-                        $keyargs_content = array();
-                $keyargs_content[] = get_l10n_args('Manual validation needed for %s', $username);
+                                $keyargs_content = array();
+                $keyargs_content[] = get_l10n_args('UAM Manual validation needed for %s', $username);
                 $keyargs_content[] = get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email));
-                pwg_mail_notification_admins(get_l10n_args('Manual validation for %s',$username),$keyargs_content,false);
-#               $admins = array();
-#      $query = '
-#    SELECT
-#        u.'.$conf['user_fields']['username'].' AS username,
-#        u.'.$conf['user_fields']['email'].' AS mail_address
-#      FROM '.USERS_TABLE.' AS u
-#        JOIN '.USER_INFOS_TABLE.' AS i ON i.user_id =  u.'.$conf['user_fields']['id'].'
-#      WHERE i.status in (\'webmaster\',  \'admin\')
-#        AND '.$conf['user_fields']['email'].' IS NOT NULL
-#        AND i.user_id <> '.$user['id'].'
-#      ORDER BY username
-#    ;';
-#    
-#      $datas = pwg_query($query);
-#      if (!empty($datas))
-#      {
-#        while ($admin = pwg_db_fetch_assoc($datas))
-#        {
-#          if (!empty($admin['mail_address']))
-#          {
-#            array_push($admins, format_email($admin['username'], $admin['mail_address']));
-#          }
-#        }
-#      }
-#      pwg_mail(implode(', ', $admins), array(
-#               'subject' => $subject,
-#      'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(),
-#    ));
+                pwg_mail_notification_admins(get_l10n_args('UAM Subjet manual validation for %s',$username),$keyargs_content,false);
                 }
                 else

extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

@@ -427 +427 @@
 Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>';
 // --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.41.0
+$lang['UAM Subjet manual validation for %s'] = 'Registration of %s waits for validation';
+$lang['UAM Manual validation needed for %s'] = 'The user %s has registered and awaits for manual validation by an admin.';
+// --------- End: New or revised $lang ---- from version 2.41.0
 ?>

extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php

@@ -434 +434 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.41.0
-$lang['Manual validation for %s'] = 'Inscription de %s à valider';
+$lang['UAM Subjet manual validation for %s'] = 'Inscription de %s à valider';
+$lang['UAM Manual validation needed for %s'] = 'L\'utilisateur %s s\'est inscrit et demande une validation manuelle par un administrateur.';
 // --------- End: New or revised $lang ---- from version 2.41.0
 ?>