Changeset 6823


Ignore:
Timestamp:
Aug 31, 2010, 6:48:54 PM (10 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.15

Location:
extensions/NBC_UserAdvManager/branches/2.15
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.15/admin/UAM_admin.php

    r6787 r6823  
    352352                $msg_error1 = '';
    353353               
    354 /* username insensible a la casse */
    355     if (isset($conf_UAM[2]) and $conf_UAM[2] == 'true')
    356           {
    357                         $query = "
    358 SELECT ".$conf['user_fields']['username']."
    359   FROM ".USERS_TABLE." p1
    360 WHERE EXISTS(
    361   SELECT ".$conf['user_fields']['username']."
    362          FROM ".USERS_TABLE." p2
    363         WHERE p1.".$conf['user_fields']['id']." <> p2.".$conf['user_fields']['id']."
    364          AND LOWER(p1.".$conf['user_fields']['username'].") = LOWER(p2.".$conf['user_fields']['username'].")
    365         )
    366 ;";
    367                          
    368                   $result = pwg_query($query);
    369                        
    370                   while($row = pwg_db_fetch_assoc($result))
    371                 {
    372                                 $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_no_casse').stripslashes($row['username']);
    373                         }
    374                 }
    375 
    376                 $msg_error2 = '';
    377                
    378354/* Username without forbidden keys */
    379355    if ( isset($conf_UAM[6]) and $conf_UAM[6] == 'true' )
     
    389365                        {
    390366                                if (!ValidateUsername(stripslashes($row['username'])))
    391                                         $msg_error2 .= (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
     367                                        $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
    392368                        }
    393369                }
    394370
    395                 $msg_error3 = '';
     371                $msg_error2 = '';
    396372               
    397373/* Email without forbidden domain */
     
    413389                                  if (preg_match($pattern, $row['mail_address']))
    414390                                  {
    415                                                 $msg_error3 .=  (($msg_error3 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
     391                                                $msg_error2 .=  (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
    416392                                        }
    417393                                }
     
    425401                        $errors[] = $msg_error2.'<br><br>';
    426402               
    427                 if ($msg_error3 <> '')
    428                 $errors[] = $msg_error3.'<br><br>';
    429                
    430                 if ($msg_error1 <> '' or $msg_error2 <> '' or $msg_error3 <> '')
     403                if ($msg_error1 <> '' or $msg_error2 <> '')
    431404                array_push($page['errors'], l10n('Err_audit_advise'));
    432405                else
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/uam.css

    r6787 r6823  
    3535}
    3636
     37/* Bloc expand-collapse instructions */
    3738.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded
    3839{
  • extensions/NBC_UserAdvManager/branches/2.15/changelog.txt.php

    r6787 r6823  
    191191            Bug 1808 fixed - The Tracking users table is ordered by default on "LastVisit" field (last in at top)
    192192            Bug 1809 fixed - Addition of a direct link to user's profile in all UAM tables. The link gives a new window
    193             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.
     193            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.
     194
     195-- 2.15.6 : Bug 1819 fixed - Wrong help text on redirection function
     196            Bug 1821 fixed - Cleanup of old deprecated functions slags (Case sensitivity on logins)
     197            Bug 1834 fixed - Improving plugin installation and uninstallation process
    194198*/
    195199?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/de_DE/help/plugin.lang.php

    r6776 r6823  
    176176Diese 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&auml;nkungen auf der Galerie), w&auml;hrend ein Benutzer, der seine Registrierung best&auml;tigt wird in einem &quot;normalen&quot; Gruppe eingestellt werden.';
    177177$lang['UAM_RedirTitle'] = 'Umleitung auf &quot;Benutzerdaten&quot; Seite';
     178// --------- End: New or revised $lang ---- from version 2.15.4
     179
     180
     181// --------- Starting below: New or revised $lang ---- from version 2.15.6
    178182$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>
    179 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.';
    180 // --------- End: New or revised $lang ---- from version 2.15.4
     183Bitte 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.';
     184// --------- End: New or revised $lang ---- from version 2.15.6
    181185?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/help/plugin.lang.php

    r6776 r6823  
    176176This 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 &quot;normal&quot; group.';
    177177$lang['UAM_RedirTitle'] = 'Redirect to &quot;Customization&quot; page';
     178// --------- End: New or revised $lang ---- from version 2.15.4
     179
     180
     181// --------- Starting below: New or revised $lang ---- from version 2.15.6
    178182$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>
    179 Please note: This feature applies to all already registered users including those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status.';
    180 // --------- End: New or revised $lang ---- from version 2.15.4
     183Please 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.';
     184// --------- End: New or revised $lang ---- from version 2.15.6
    181185?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/es_ES/help/plugin.lang.php

    r6776 r6823  
    177177Esta opci&oacute;n se utiliza generalmente con la asignaci&oacute;n autom&aacute;tica de grupo y / o estatutos. Por ejemplo, un usuario que no ha validado su registro se encuentra en un grupo espec&iacute;fico de usuarios (con o sin restricciones a la galer&iacute;a) mientras que un usuario que haya validado su registro se encuentra en un &quot;normal&quot; del grupo.';
    178178$lang['UAM_RedirTitle'] = 'Redirigir a la página de &quot;personalizaci&oacute;n&quot;';
     179// --------- End: New or revised $lang ---- from version 2.15.4
     180
     181
     182// --------- Starting below: New or revised $lang ---- from version 2.15.6
    179183$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>
    180 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;.';
    181 // --------- End: New or revised $lang ---- from version 2.15.4
     184Atenció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.';
     185// --------- End: New or revised $lang ---- from version 2.15.6
    182186?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/fr_FR/help/plugin.lang.php

    r6776 r6823  
    175175A savoir: Cette fonction s\'applique également à tous les utilisateurs déjà inscrits, y compris ceux disposant du status &quot;admin&quot;, &quot;webmaster&quot; ou &quot;generique&quot;.';
    176176// --------- End: New or revised $lang ---- from version 2.15.4
     177
     178
     179// --------- Starting below: New or revised $lang ---- from version 2.15.6
     180$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>
     181A 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.';
     182// --------- End: New or revised $lang ---- from version 2.15.6
    177183?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/it_IT/help/plugin.lang.php

    r6776 r6823  
    173173Questa opzione &egrave; generalmente utilizzato con l\'assegnazione automatica di gruppo e / o statuto. Ad esempio, un utente che non ha convalidato la loro registrazione sar&agrave; ambientato in un gruppo specifico di utenti (con o senza le restrizioni alla galleria), mentre un utente che ha convalidato la sua registrazione &egrave; fissato in un &quot;normale&quot; del gruppo.';
    174174/*TODO*/$lang['UAM_RedirTitle'] = 'Redirect to &quot;Customization&quot; page';
     175// --------- End: New or revised $lang ---- from version 2.15.4
     176
     177
     178// --------- Starting below: New or revised $lang ---- from version 2.15.6
    175179/*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>
    176 Please note: This feature applies to all already registered users including those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status.';
    177 // --------- End: New or revised $lang ---- from version 2.15.4
     180Please 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.';
     181// --------- End: New or revised $lang ---- from version 2.15.6
    178182?>
  • extensions/NBC_UserAdvManager/branches/2.15/main.inc.php

    r6787 r6823  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.15.5
     4Version: 2.15.6
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
  • extensions/NBC_UserAdvManager/branches/2.15/maintain.inc.php

    r6776 r6823  
    2626Best regards,
    2727
    28 The admin of the gallery.','false','false');
     28The admin of the gallery.','false','false','false');
    2929
    3030  $q = '
     
    208208  }
    209209
     210  if (isset($conf['UserAdvManager_Redir']))
     211  {
     212    $q = '
     213DELETE FROM '.CONFIG_TABLE.'
     214WHERE param="UserAdvManager_Redir"
     215;';
     216
     217    pwg_query($q);
     218  }
     219
    210220  $q = 'DROP TABLE '.USER_CONFIRM_MAIL_TABLE.';';
    211221  pwg_query( $q );
Note: See TracChangeset for help on using the changeset viewer.