Changeset 13822 for extensions/UserAdvManager

Timestamp:

Mar 30, 2012, 9:38:52 PM (13 years ago)

Author:

Eric

Message:

Bug 2602 fixed - Sql error when Confirmation by admin is set
en_UK reference translation spellchecking

Location:

extensions/UserAdvManager/trunk

Files:

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

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -285 +285 @@
 
 -- 2.30.4 : Bug 2580 fixed - DE translation files corrupted
+
+-- 2.30.5 : Bug 2583 fixed - help.lang.php was not loaded correctly
+            Bug 2602 fixed - Sql error when Confirmation by admin is set 
+            en_UK reference translation spellchecking
+            de_DE translation updated
+            fr_FR translation updated
+
+**************************************************************
+***** Plugin history (branch 2.40 - Piwigo 2.4 compliant)*****
+**************************************************************
+-- 2.40.0 : Bug 2570 fixed - Adding Wiki link to complete plugin documentation
+            Bug 2591 fixed - Excluding Adult_Content generic users from users tracking list
 */
 ?>

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

@@ -100 +100 @@
   if ($register_user['username'] != "16" and $register_user['username'] != "18")
   {
+    $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
+    
     if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
     {
       // This is to send an information email and set user to "waiting" group or status until admin validation
       // -----------------------------------------------------------------------------------------------------
-      $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
       SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation
@@ -118 +119 @@
       // This is to send an information email without validation key
       // -----------------------------------------------------------
-      $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
       SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
     }
@@ -127 +127 @@
       if (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'true')
       {
-        $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
       }
       elseif (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'false')
       {
-        $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
       elseif (!is_admin())
       {
-        $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
       }
@@ -1598 +1595 @@
   }
 
-  if (!is_admin() and $conf_UAM[2] <> -1) // Set privacy level
+  if (!is_admin() and $conf_UAM[35] <> -1) // Set privacy level
   {
     $query = "
@@ -1604 +1601 @@
   (user_id, level)
 VALUES
-  ('".$user_id."', '".$conf_UAM[level]."')
+  ('".$user_id."', '".$conf_UAM[35]."')
 ;";
     pwg_query($query);

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

@@ -240 +240 @@
 $lang['UAM_Default_ConfirmMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].
 
-To complete the procedure and be able to browse through the pictures, thank you kindly confirm your registration by clicking on the link in this message.';
+To complete the process and be able to browse through the pictures, thank you kindly confirm your registration by clicking on the link in this message.';
 $lang['UAM_Default_GhstReminder_Txt'] = 'Hello [username].
         

extensions/UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.30.4
+Version: 2.40.0
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216