Changeset 6823

Timestamp:

08/31/10 18:48:54 (3 years ago)

Author:

Eric

Message:

Merge from Trunk to Branch 2.15

Location:

extensions/NBC_UserAdvManager/branches/2.15

Files:

• admin/UAM_admin.php (modified) (4 diffs)
• admin/template/uam.css (modified) (1 diff)
• changelog.txt.php (modified) (1 diff)
• language/de_DE/help/plugin.lang.php (modified) (1 diff)
• language/en_UK/help/plugin.lang.php (modified) (1 diff)
• language/es_ES/help/plugin.lang.php (modified) (1 diff)
• language/fr_FR/help/plugin.lang.php (modified) (1 diff)
• language/it_IT/help/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (2 diffs)

extensions/NBC_UserAdvManager/branches/2.15/admin/UAM_admin.php

@@ -352 +352 @@
                 $msg_error1 = '';
                 
-/* username insensible a la casse */
-    if (isset($conf_UAM[2]) and $conf_UAM[2] == 'true')
-          {
-                        $query = "
-SELECT ".$conf['user_fields']['username']."
-  FROM ".USERS_TABLE." p1
-WHERE EXISTS(
-  SELECT ".$conf['user_fields']['username']."
-         FROM ".USERS_TABLE." p2
-        WHERE p1.".$conf['user_fields']['id']." <> p2.".$conf['user_fields']['id']."
-         AND LOWER(p1.".$conf['user_fields']['username'].") = LOWER(p2.".$conf['user_fields']['username'].")
-        )
-;";
-                          
-                  $result = pwg_query($query);
-                        
-                  while($row = pwg_db_fetch_assoc($result))
-                {
-                                $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_no_casse').stripslashes($row['username']);
-                        }
-                }
-
-                $msg_error2 = '';
-                
 /* Username without forbidden keys */
     if ( isset($conf_UAM[6]) and $conf_UAM[6] == 'true' )
@@ -389 +365 @@
                         {
                                 if (!ValidateUsername(stripslashes($row['username'])))
-                                        $msg_error2 .= (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
+                                        $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
                         }
                 }
 
-                $msg_error3 = '';
+                $msg_error2 = '';
                 
 /* Email without forbidden domain */
@@ -413 +389 @@
                                   if (preg_match($pattern, $row['mail_address']))
                                   {
-                                                $msg_error3 .=  (($msg_error3 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
+                                                $msg_error2 .=  (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
                                         }
                                 }
@@ -425 +401 @@
                         $errors[] = $msg_error2.'<br><br>';
                 
-                if ($msg_error3 <> '')
-                $errors[] = $msg_error3.'<br><br>';
-                
-                if ($msg_error1 <> '' or $msg_error2 <> '' or $msg_error3 <> '')
+                if ($msg_error1 <> '' or $msg_error2 <> '')
                 array_push($page['errors'], l10n('Err_audit_advise'));
                 else

extensions/NBC_UserAdvManager/branches/2.15/admin/template/uam.css

@@ -35 +35 @@
 }
 
+/* Bloc expand-collapse instructions */
 .instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded
 {

extensions/NBC_UserAdvManager/branches/2.15/changelog.txt.php

@@ -191 +191 @@
             Bug 1808 fixed - The Tracking users table is ordered by default on "LastVisit" field (last in at top) 
             Bug 1809 fixed - Addition of a direct link to user's profile in all UAM tables. The link gives a new window
-            Bug 1810 partially fixed - Auto login is not performed after visitors have validated their registration but the "home" button changes his link to redirect to identification page when the redirection option is set. Note: The redirection to profile.php doesn't work because I was unable to use the log_user() function on ConfirmMail page. This feature is still under investigation to perform the best way. 
+            Bug 1810 partially fixed - Auto login is not performed after visitors have validated their registration but the "home" button changes his link to redirect to identification page when the redirection option is set. Note: The redirection to profile.php doesn't work because I was unable to use the log_user() function on ConfirmMail page. This feature is still under investigation to perform the best way.
+
+-- 2.15.6 : Bug 1819 fixed - Wrong help text on redirection function
+            Bug 1821 fixed - Cleanup of old deprecated functions slags (Case sensitivity on logins)
+            Bug 1834 fixed - Improving plugin installation and uninstallation process
 */
 ?>

extensions/NBC_UserAdvManager/branches/2.15/language/de_DE/help/plugin.lang.php

@@ -176 +176 @@
 Diese Option ist in der Regel mit der automatischen Zuordnung der Gruppe und / oder Satzung verwendet. Zum Beispiel, ein Benutzer, der nicht validiert ihre Eintragung in eine bestimmte Gruppe von Nutzern eingestellt werden (mit oder ohne Einschränkungen auf der Galerie), während ein Benutzer, der seine Registrierung bestätigt wird in einem "normalen" Gruppe eingestellt werden.';
 $lang['UAM_RedirTitle'] = 'Umleitung auf "Benutzerdaten" Seite';
+// --------- End: New or revised $lang ---- from version 2.15.4
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.6
 $lang['UAM_RedirTitle_d'] = 'Diese Option automatisch umleiten ein registrierter Benutzer zum sein Benutzerdaten Seite nur bei seinem ersten Anschluss an die Galerie.<br><br>
-Bitte beachten Sie: Diese Funktion gilt für alle bereits registrierten Nutzern einschließlich derjenigen mit &quot;admin&quot;, &quot;Webmaster&quot; oder &quot;Generic&quot; Status.';
-// --------- End: New or revised $lang ---- from version 2.15.4
+Bitte beachten Sie: Dieses Feature funktioniert nicht für alle registrierten Nutzer. Diejenigen mit &quot;admin&quot;, &quot;Webmaster&quot; oder &quot;Generic&quot; Status sind ausgeschlossen.';
+// --------- End: New or revised $lang ---- from version 2.15.6
 ?>

extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/help/plugin.lang.php

@@ -176 +176 @@
 This option is generally used with the automatic assignment of group and/or statutes. For example, a user who has not validated their registration will be set in a specific group of users (with or without restrictions on the gallery) while a user who validated his registration shall be set in a "normal" group.';
 $lang['UAM_RedirTitle'] = 'Redirect to "Customization" page';
+// --------- End: New or revised $lang ---- from version 2.15.4
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.6
 $lang['UAM_RedirTitle_d'] = 'This option automatically redirect a registered user to his customization page only at his first connection to the gallery.<br><br>
-Please note: This feature applies to all already registered users including those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status.';
-// --------- End: New or revised $lang ---- from version 2.15.4
+Please note: This feature does not apply to all registered users. Those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status are excluded.';
+// --------- End: New or revised $lang ---- from version 2.15.6
 ?>

extensions/NBC_UserAdvManager/branches/2.15/language/es_ES/help/plugin.lang.php

@@ -177 +177 @@
 Esta opción se utiliza generalmente con la asignación automática de grupo y / o estatutos. Por ejemplo, un usuario que no ha validado su registro se encuentra en un grupo específico de usuarios (con o sin restricciones a la galería) mientras que un usuario que haya validado su registro se encuentra en un "normal" del grupo.';
 $lang['UAM_RedirTitle'] = 'Redirigir a la página de "personalización"';
+// --------- End: New or revised $lang ---- from version 2.15.4
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.6
 $lang['UAM_RedirTitle_d'] = 'Esta opción se redireccionan automáticamente un usuario registrado para su página de personalización sólo en su primera conexión a la galería.<br><br>
-Atención: Esta característica se aplica a todos los usuarios ya registrados, incluidos aquellos con estados &quot;admin&quot;, &quot;webmaster&quot; o &quot;generic&quot;.';
-// --------- End: New or revised $lang ---- from version 2.15.4
+Atención: Esta característica no se aplica a todos los usuarios registrados. Las personas con estados &quot;admin&quot;, &quot;webmaster&quot; o &quot;generic&quot; están excluidos.';
+// --------- End: New or revised $lang ---- from version 2.15.6
 ?>

extensions/NBC_UserAdvManager/branches/2.15/language/fr_FR/help/plugin.lang.php

@@ -175 +175 @@
 A savoir: Cette fonction s\'applique également à tous les utilisateurs déjà inscrits, y compris ceux disposant du status "admin", "webmaster" ou "generique".';
 // --------- End: New or revised $lang ---- from version 2.15.4
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.6
+$lang['UAM_RedirTitle_d'] = 'Cette option permet de rediriger automatiquement un utilisateur inscrit vers sa page de personnalisation uniquement lors de sa première connexion à la galerie.<br><br>
+A savoir: Cette fonction ne s\'applique pas à tous les utilisateurs déjà inscrits. Ceux disposant du status &quot;admin&quot;, &quot;webmaster&quot; ou &quot;generique&quot; sont exclus de la règle.';
+// --------- End: New or revised $lang ---- from version 2.15.6
 ?>

extensions/NBC_UserAdvManager/branches/2.15/language/it_IT/help/plugin.lang.php

@@ -173 +173 @@
 Questa opzione è generalmente utilizzato con l\'assegnazione automatica di gruppo e / o statuto. Ad esempio, un utente che non ha convalidato la loro registrazione sarà ambientato in un gruppo specifico di utenti (con o senza le restrizioni alla galleria), mentre un utente che ha convalidato la sua registrazione è fissato in un "normale" del gruppo.';
 /*TODO*/$lang['UAM_RedirTitle'] = 'Redirect to "Customization" page';
+// --------- End: New or revised $lang ---- from version 2.15.4
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.6
 /*TODO*/$lang['UAM_RedirTitle_d'] = 'This option automatically redirect a registered user to his customization page only at his first connection to the gallery.<br><br>
-Please note: This feature applies to all already registered users including those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status.';
-// --------- End: New or revised $lang ---- from version 2.15.4
+Please note: This feature does not apply to all registered users. Those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status are excluded.';
+// --------- End: New or revised $lang ---- from version 2.15.6
 ?>

extensions/NBC_UserAdvManager/branches/2.15/main.inc.php

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

extensions/NBC_UserAdvManager/branches/2.15/maintain.inc.php

@@ -26 +26 @@
 Best regards,
 
-The admin of the gallery.','false','false');
+The admin of the gallery.','false','false','false');
 
   $q = '
@@ -208 +208 @@
   }
 
+  if (isset($conf['UserAdvManager_Redir']))
+  {
+    $q = '
+DELETE FROM '.CONFIG_TABLE.'
+WHERE param="UserAdvManager_Redir"
+;';
+
+    pwg_query($q);
+  }
+
   $q = 'DROP TABLE '.USER_CONFIRM_MAIL_TABLE.';';
   pwg_query( $q );