Changeset 4281

Timestamp:

Nov 16, 2009, 9:09:33 PM (15 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Bug 1238 fixed - Simple custom email text wasn't send when Extended Description plugin wasn't set.
• Ending of IT translations

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• include/functions_UserAdvManager.inc.php (modified) (7 diffs)
• main.inc.php (modified) (2 diffs)

extensions/NBC_UserAdvManager/trunk/include/functions_UserAdvManager.inc.php

@@ -18 +18 @@
   {
     case 1:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Add of %s', $username));
+      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Add of %s', stripslashes($username)));
       $password = $password <> '' ? $password : l10n('UserAdvManager_empty_pwd');
       
-      if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager[10]) and $conf_nbc_UserAdvManager[10] <> '')
-        $infos1_perso = get_user_language_desc($conf_nbc_UserAdvManager[10])."\n\n";
+      if (isset($conf_nbc_UserAdvManager[10]) and $conf_nbc_UserAdvManager[10] <> '')
+      {
+        if (function_exists('get_user_language_desc'))
+        {
+          $infos1_perso = get_user_language_desc($conf_nbc_UserAdvManager[10])."\n\n";
+        }
+        else $infos1_perso = l10n($conf_nbc_UserAdvManager[10])."\n\n"; 
+      }
       
       break;
       
     case 2:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', $username));
+      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
       $password = $password <> '' ? $password : l10n('UserAdvManager_empty_pwd');
 
@@ -33 +39 @@
         
     case 3:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', $username));
+      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
       $password = $password <> '' ? $password : l10n('UserAdvManager_no_update_pwd');
 
@@ -42 +48 @@
   {
     $infos1 = array(
-      get_l10n_args('infos_mail %s', $username),
-      get_l10n_args('User: %s', $username),
+      get_l10n_args('infos_mail %s', stripslashes($username)),
+      get_l10n_args('User: %s', stripslashes($username)),
       get_l10n_args('Password: %s', $password),
       get_l10n_args('Email: %s', $email),
@@ -59 +65 @@
     );
 
-    if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager[11]) and $conf_nbc_UserAdvManager[11] <> '')
-      $infos2_perso = get_user_language_desc($conf_nbc_UserAdvManager[11])."\n\n";
+    if (isset($conf_nbc_UserAdvManager[11]) and $conf_nbc_UserAdvManager[11] <> '')
+    {
+      if (function_exists('get_user_language_desc'))
+      {
+        $infos2_perso = get_user_language_desc($conf_nbc_UserAdvManager[11])."\n\n";
+      }
+      else $infos2_perso = l10n($conf_nbc_UserAdvManager[11])."\n\n";
+    }
   }
 
@@ -106 +118 @@
   {
     case 1:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_with_key_of_%s', $username));
-      
-      if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and $confirm)
+      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_with_key_of_%s', stripslashes($username)));
+      
+      if (isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and $confirm)
       {
-                                $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
-                        
-                                $infos2 = array
-                                (
-                                        get_l10n_args('Link: %s', ResetConfirmMail($user_id)),
-                                        get_l10n_args('', ''),
-                                );
+        if (function_exists('get_user_language_desc'))
+        {
+          $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
+        }
+                                else $infos1 = l10n($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
+
+        $infos2 = array
+        (
+          get_l10n_args('Link: %s', ResetConfirmMail($user_id)),
+          get_l10n_args('', ''),
+        );        
                         }
+      
                 break;
       
     case 2:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_without_key_of_%s', $username));
-      
-      if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and !$confirm)
+      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_without_key_of_%s', stripslashes($username)));
+      
+      if (isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and !$confirm)
       {
-                                $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
+        if (function_exists('get_user_language_desc'))
+        {
+          $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
+        }
+        else $infos1 = l10n($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";                            
       }
+      
     break;
         }
+  
   pwg_mail($email, array(
     'subject' => $subject,
@@ -155 +178 @@
         $infos1_perso = "";
 
-  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_remainder_of_%s', $username));
-      
-  if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager[19]) and $conf_nbc_UserAdvManager[19] <> '' and isset($conf_nbc_UserAdvManager[17]) and $conf_nbc_UserAdvManager[17] == 'true')
-  {
-    $infos1 = get_user_language_desc($conf_nbc_UserAdvManager[19])."\n\n";
+  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_remainder_of_%s', stripslashes($username)));
+      
+  if (isset($conf_nbc_UserAdvManager[19]) and $conf_nbc_UserAdvManager[19] <> '' and isset($conf_nbc_UserAdvManager[17]) and $conf_nbc_UserAdvManager[17] == 'true')
+  {
+    if (function_exists('get_user_language_desc'))
+    {
+      $infos1 = get_user_language_desc($conf_nbc_UserAdvManager[19])."\n\n";
+    }
+    else $infos1 = l10n($conf_nbc_UserAdvManager[19])."\n\n";
+    
     resetlastvisit($user_id);
   }
@@ -588 +616 @@
     list($username) = mysql_fetch_row(pwg_query($query));
 
-    return isset($username) ? $username : '';
+    return isset($username) ? stripslashes($username) : '';
   }
 }

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: NBC UserAdvManager
-Version: 2.12.6
+Version: 2.12.7
 Description: Renforcer les possibilités de gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
@@ -99 +99 @@
 -- 2.12.6 : Bug 1236 fixed -  Admins was unable to add a new user in the user_list page.
             Beginning of IT translations
+            
+-- 2.12.7 : Bug 1238 fixed -  Simple custom email text wasn't send when Extended Description plugin wasn't set.
+            Ending of IT translations
 */