Changeset 4416


Ignore:
Timestamp:
Dec 3, 2009, 6:52:38 PM (15 years ago)
Author:
Eric
Message:

[NBC_UserAdvManager] Merged from Trunk to Branch 2.13

  • Bug 1302 fixed : Re-coded double email check on registration.
  • Bug 1304 fixed : Adding of plugin version in plugin admin panel title.
Location:
extensions/NBC_UserAdvManager/branches/2.13
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.13/changelog.txt.php

    r4406 r4416  
    111111            Code refactory and improvements.
    112112            Translations improvements.
     113
     114-- 2.13.1 : Bug 1302 fixed - Re-coded double email check on registration.
     115            Bug 1304 fixed - Adding of plugin version in plugin admin panel title.
    113116*/
    114117?>

  • extensions/NBC_UserAdvManager/branches/2.13/language/de_DE/plugin.lang.php

    r4406 r4416  
    77
    88/* Global Configuration Tab */
    9 $lang['Title_Tab1'] = 'UserAdvManager - Allgemeine Einstellungen';
    109$lang['Tab_Global'] = 'Allgemeine Einstellungen';
    1110$lang['UserAdvManager_Mail_Info'] = ' Mail Informationen an den Benutzer';
    … …  
    199198/* ConfirmMail Configuration Tab */
    200199$lang['ConfirmMail_Title'] = 'Erweiterte Einstellungen für die Validierung der Register';
    201 $lang['Title_Tab2'] = 'UserAdvManager - Registrieren Validierung Einstellungen';
    202200$lang['Tab_ConfirmMail'] = 'Register Validierung Einstellungen';
    203201/* UserList Tab */
    … …  
    240238$lang['Err_Userlist_Settings'] = 'Diese Seite ist nur verfügbar, wenn "Benutzer Monitoring" ist im "General Setup" aktiv ist.';
    241239// --------- End: New or revised $lang ---- from version 2.13.0
     240// --------- Starting below: New or revised $lang ---- from version 2.13.1
     241/* Global Configuration Tab */
     242$lang['Title_Tab1'] = 'UserAdvManager 2.13.1 - Allgemeine Einstellungen';
     243/* ConfirmMail Configuration Tab */
     244$lang['Title_Tab2'] = 'UserAdvManager 2.13.1 - Registrieren Validierung Einstellungen';
     245// --------- End: New or revised $lang ---- from version 2.13.1
    242246?>

  • extensions/NBC_UserAdvManager/branches/2.13/language/en_UK/plugin.lang.php

    r4406 r4416  
    77
    88/* Global Configuration Tab */
    9 $lang['Title_Tab1'] = 'UserAdvManager - General Setup';
    109$lang['Tab_Global'] = 'General Setup';
    1110$lang['UserAdvManager_Mail_Info'] = ' Mail information to user:';
    … …  
    199198/* ConfirmMail Configuration Tab */
    200199$lang['ConfirmMail_Title'] = 'Advanced settings for validation of registries';
    201 $lang['Title_Tab2'] = 'UserAdvManager - Register validation settings';
    202200$lang['Tab_ConfirmMail'] = 'Register validation settings';
    203201/* UserList Tab */
    … …  
    240238$lang['Err_Userlist_Settings'] = 'This page is available only if "Users monitoring" is active in the "General Setup" tab.';
    241239// --------- End: New or revised $lang ---- from version 2.13.0
     240// --------- Starting below: New or revised $lang ---- from version 2.13.1
     241/* Global Configuration Tab */
     242$lang['Title_Tab1'] = 'UserAdvManager 2.13.1 - General Setup';
     243/* ConfirmMail Configuration Tab */
     244$lang['Title_Tab2'] = 'UserAdvManager 2.13.1 - Register validation settings';
     245// --------- End: New or revised $lang ---- from version 2.13.1
    242246?>

  • extensions/NBC_UserAdvManager/branches/2.13/language/es_ES/plugin.lang.php

    r4406 r4416  
    77
    88/* Global Configuration Tab */
    9 $lang['Title_Tab1'] = 'UserAdvManager - Configuración general';
    109$lang['Tab_Global'] = 'Configuración general';
    1110$lang['UserAdvManager_Mail_Info'] = ' Información por correo electrónico para el usuario:';
    … …  
    199198/* ConfirmMail Configuration Tab */
    200199$lang['ConfirmMail_Title'] = 'Ajustes avanzados para la validación de usuarios registrados';
    201 $lang['Title_Tab2'] = 'UserAdvManager - Configuración de validación de registro';
    202200$lang['Tab_ConfirmMail'] = 'Configuración de validación de registro';
    203201/* UserList Tab */
    … …  
    240238$lang['Err_Userlist_Settings'] = 'Esta página está disponible sólo si los "usuarios de seguimiento" está activo en la pestaña "General Setup".';
    241239// --------- End: New or revised $lang ---- from version 2.13.0
     240// --------- Starting below: New or revised $lang ---- from version 2.13.1
     241/* Global Configuration Tab */
     242$lang['Title_Tab1'] = 'UserAdvManager 2.13.1 - Configuración general';
     243/* ConfirmMail Configuration Tab */
     244$lang['Title_Tab2'] = 'UserAdvManager 2.13.1 - Configuración de validación de registro';
     245// --------- End: New or revised $lang ---- from version 2.13.1
    242246?>

  • extensions/NBC_UserAdvManager/branches/2.13/language/fr_FR/plugin.lang.php

    r4406 r4416  
    77
    88/* Global Configuration Tab */
    9 $lang['Title_Tab1'] = 'UserAdvManager - Configuration Générale';
    109$lang['Tab_Global'] = 'Configuration Générale';
    1110$lang['UserAdvManager_Mail_Info'] = 'Mail d\'information à l\'utilisateur :';
    … …  
    199198/* ConfirmMail Configuration Tab */
    200199$lang['ConfirmMail_Title'] = 'Configuration avancée de la validation des inscriptions';
    201 $lang['Title_Tab2'] = 'UserAdvManager - Configuration de la validation des inscriptions';
    202200$lang['Tab_ConfirmMail'] = 'Configuration des validations';
    203201/* UserList Tab */
    … …  
    240238$lang['Err_Userlist_Settings'] = 'Cette page n\'est accessible que si le "suivi des utilisateur" est actif dans l\'onglet "Configuration Générale".';
    241239// --------- End: New or revised $lang ---- from version 2.13.0
     240// --------- Starting below: New or revised $lang ---- from version 2.13.1
     241/* Global Configuration Tab */
     242$lang['Title_Tab1'] = 'UserAdvManager 2.13.1 - Configuration Générale';
     243/* ConfirmMail Configuration Tab */
     244$lang['Title_Tab2'] = 'UserAdvManager 2.13.1 - Configuration de la validation des inscriptions';
     245// --------- End: New or revised $lang ---- from version 2.13.1
    242246?>

  • extensions/NBC_UserAdvManager/branches/2.13/language/it_IT/plugin.lang.php

    r4406 r4416  
    77
    88/* Global Configuration Tab */
    9 $lang['Title_Tab1'] = 'UserAdvManager - General Setup';
    109$lang['Tab_Global'] = 'General Setup';
    1110$lang['UserAdvManager_Mail_Info'] = 'Informazioni di posta per l\'utente:';
    … …  
    212211/* ConfirmMail Configuration Tab */;
    213212$lang['ConfirmMail_Title'] = 'Impostazioni avanzate per la convalida degli utenti registrati';
    214 $lang['Title_Tab2'] = 'UserAdvManager - Registrati impostazioni di convalida';
    215213$lang['Tab_ConfirmMail'] = 'Registrati impostazioni di convalida';
    216214/* UserList Tab */
    … …  
    253251/* TODO */$lang['Err_Userlist_Settings'] = 'This page is available only if "Users monitoring" is active in the "General Setup" tab.';
    254252// --------- End: New or revised $lang ---- from version 2.13.0
     253// --------- Starting below: New or revised $lang ---- from version 2.13.1
     254/* Global Configuration Tab */
     255$lang['Title_Tab1'] = 'UserAdvManager 2.13.1 - Configurazione generale';
     256/* ConfirmMail Configuration Tab */
     257$lang['Title_Tab2'] = 'UserAdvManager 2.13.1 - Registrati impostazioni di convalida';
     258// --------- End: New or revised $lang ---- from version 2.13.1
    255259?>

  • extensions/NBC_UserAdvManager/branches/2.13/main.inc.php

    r4406 r4416  
    22/*
    33Plugin Name: NBC UserAdvManager
    4 Version: 2.13.0
     4Version: 2.13.1
    55Description: Renforcer les possibilités de gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
    … …  
    174174  {
    175175    return l10n('reg_err_login5');
     176  }
     177 
     178  if (script_basename() == 'admin' and isset($_GET['page']) and $_GET['page'] == 'user_list') /* not the same email variable if we are on users registration page or on admin's user registration page*/
     179  {
     180  /* Email doblons check */
     181    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
     182    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
     183    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
     184 
     185    if (!preg_match($regex, $_POST['email']))
     186    {
     187      return l10n('reg_err_mail_address');
     188    }
     189   
     190    $query = '
     191SELECT count(*)
     192FROM '.USERS_TABLE.'
     193WHERE upper('.$conf['user_fields']['email'].') = upper(\''.$_POST['email'].'\')
     194;';
     195    list($count) = mysql_fetch_array(pwg_query($query));
     196    if ($count != 0)
     197    {
     198      return l10n('reg_err_mail_address_dbl');
     199    }
     200  }
     201
     202  if (script_basename() == 'register') /* not the same email variable if we are on users registration page or on admin's user registration page*/
     203  {
     204  /* Email doblons check */
     205    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
     206    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
     207    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
     208 
     209    if (!preg_match($regex, $_POST['mail_address']))
     210    {
     211      return l10n('reg_err_mail_address');
     212    }
     213   
     214    $query = '
     215SELECT count(*)
     216FROM '.USERS_TABLE.'
     217WHERE upper('.$conf['user_fields']['email'].') = upper(\''.$_POST['mail_address'].'\')
     218;';
     219    list($count) = mysql_fetch_array(pwg_query($query));
     220    if ($count != 0)
     221    {
     222      return l10n('reg_err_mail_address_dbl');
     223    }
    176224  }
    177225/* ****************************************** */
Note: See TracChangeset for help on using the changeset viewer.