Changeset 9400

Timestamp:

Feb 27, 2011, 6:57:20 PM (14 years ago)

Author:

Eric

Message:

bug 2206 fixed : The email sent to renamed users shows standard information (new username and related email address) in addition of customizable text. The email subject shows the old username.

Location:

extensions/LCAS/trunk

Files:

• admin/LCAS_admin.php (modified) (2 diffs)
• include/functions.inc.php (modified) (3 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/LCAS/trunk/admin/LCAS_admin.php

@@ -102 +102 @@
           if ($count < 1)
           {
+            // Get old username befor update - Usefull for user notification if is set
+            $query ='
+              SELECT username
+              FROM '.USERS_TABLE.'
+              WHERE id = '.$lcas_UserToUpdate.'
+            ;';
+
+            $data = pwg_db_fetch_assoc(pwg_query($query));
+  
             // Username update
             $query = '
@@ -114 +123 @@
             if (isset($conf_LCAS[1]) and $conf_LCAS[1] == 'true')
             {
-              LCAS_SendMail($lcas_UserToUpdate, $_POST['user-'.$lcas_UserToUpdate]);
+              LCAS_SendMail($lcas_UserToUpdate, $data['username'], $_POST['user-'.$lcas_UserToUpdate]);
             }
+
             // Reloading conflict table content
             $page['all_users'] = LCAS_get_user_list($conf_LCAS[0]);

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

@@ -87 +87 @@
 
 /* Function called from LCAS_admin.php to send notification email */
-function LCAS_SendMail($id, $username)
+function LCAS_SendMail($id, $oldusername, $username)
 {
   global $conf;
@@ -117 +117 @@
   }
 
-  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Username_updated_for_%s', stripslashes($username)));
+  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Username_updated_for_%s', stripslashes($oldusername)));
 
   if (isset($conf_LCAS[2]) and $conf_LCAS[2] <> '')
@@ -134 +134 @@
 WHERE id = '.$id.'
 ;';
+
   $data = pwg_db_fetch_assoc(pwg_query($query));
+
+/* User standard information */
+  $info = array(
+      get_l10n_args('LCAS_NewUsername: %s', stripslashes($username)),
+      get_l10n_args('LCAS_NewUser_Email: %s',$data['mail_address']),
+      get_l10n_args('', ''),
+    );
 
 /* Send the email with subject and contents */
   pwg_mail($data['mail_address'], array(
     'subject' => $subject,
-    'content' => ($customtxt),
+    'content' => ($customtxt."\n\n").(l10n_args($info)),
   ));
 

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

@@ -50 +50 @@
 /* Email subject */
 $lang['Username_updated_for_%s'] = 'Username update for %s';
+$lang['LCAS_NewUsername: %s'] = 'Your new username : %s';
+$lang['LCAS_NewUser_Email: %s'] = 'Related to this email address : %s';
 ?>

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

@@ -48 +48 @@
 $lang['LCAS_EnableOption'] = ' Activer';
 
-/* Email subject */
+/* Emailing */
 $lang['Username_updated_for_%s'] = 'Nom d\'utilisateur mis à jour pour %s';
+$lang['LCAS_NewUsername: %s'] = 'Votre nouveau nom d\'utilisateur : %s';
+$lang['LCAS_NewUser_Email: %s'] = 'Correspondant à l\'adresse email : %s';
 ?>