Ignore:
Timestamp:
Sep 19, 2009, 11:02:21 PM (15 years ago)
Author:
Eric
Message:

V2.11.2 merged from trunk

Bug fixed : Bad query on unvalidated users display
Bug fixed : Sql syntax error on plugin install / update
Language files corrections

Location:
extensions/NBC_UserAdvManager/branches/2.11
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.11/admin/UserAdvManager_admin.php

    r3873 r3882  
    384384  $conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array();
    385385       
    386   if (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2]=='true' and isset($conf_nbc_UserAdvManager_ConfirmMail[0]) and $conf_nbc_UserAdvManager_ConfirmMail[0]=='true' )
     386  if (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2]=='true' and isset($conf_nbc_UserAdvManager[3]) and $conf_nbc_UserAdvManager[3] <> '-1' and isset($conf_nbc_UserAdvManager_ConfirmMail[0]) and $conf_nbc_UserAdvManager_ConfirmMail[0]=='true')
    387387  {
    388388// +-----------------------------------------------------------------------+

  • extensions/NBC_UserAdvManager/branches/2.11/include/functions_UserAdvManager.inc.php

    r3859 r3882  
    635635        WHERE u.'.$conf['user_fields']['id'].' >= 0
    636636        AND ug.group_id = "'.$conf_nbc_UserAdvManager[3].'"
    637       AND TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'"
     637      AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'"
     638                                OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'")
    638639                ORDER BY id ASC
    639640        ;';

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

    r3873 r3882  
    108108$lang['invalid_pwd'] = 'Invalid username or password !';
    109109$lang['Err_ConfirmMail_Settings'] = 'This page will be available only if "Email address confirmation" is activated in tab "Global Configuration".';
    110 $lang['Err_UserManager_Settings'] = 'This page is available only if "Enable limiting the registration deadline" is active in the "ConfirmMail Settings" tab.';
     110$lang['Err_UserManager_Settings'] = 'This page is available only if "Enable limiting the registration deadline" is active in the "ConfirmMail Settings" tab and an unvalidated users group is set in "Global Configuration" tab.';
    111111$lang['No_validation_for_Guest'] = 'The "Guest" account is not subject to validation';
    112112$lang['No_validation_for_default_user'] = 'The default account is not subject to validation';

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

    r3873 r3882  
    108108$lang['invalid_pwd'] = 'Nom utilisateur ou Mot de passe invalide !';
    109109$lang['Err_ConfirmMail_Settings'] = 'Cette page n\'est accessible que si "Confirmation de l\'adresse email" est actif dans l\'onglet "Configuration Générale".';
    110 $lang['Err_UserManager_Settings'] = 'Cette page n\'est accessible que si "Délai de validation d\'inscription" est actif dans l\'onglet "Configuration de ConfirmMail".';
     110$lang['Err_UserManager_Settings'] = 'Cette page n\'est accessible que si "Délai de validation d\'inscription" est actif dans l\'onglet "Configuration de ConfirmMail" et si un groupe de visiteurs non validés est configuré dans l\'onglet "Configuration Générale".';
    111111$lang['No_validation_for_Guest'] = 'Le compte Guest n\'est pas soumis à validation';
    112112$lang['No_validation_for_default_user'] = 'Le compte par défaut n\'est pas soumis à validation';

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

    r3873 r3882  
    22/*
    33Plugin Name: NBC UserAdvManager
    4 Version: 2.11.1
     4Version: 2.11.2
    55Description: Permet de renforcer les possibilités de gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
    … …  
    5555-- 2.11.1 : Bug fixed with install and upgrade functions
    5656                                                Language files correction
     57
     58-- 2.11.2 : Bug fixed on bad query for unvalidated users display in unvalidated users list
     59                                                Bug fixed : Sql syntax error on plugin activation
    5760
    5861*/

  • extensions/NBC_UserAdvManager/branches/2.11/maintain.inc.php

    r3873 r3882  
    1818  $q = '
    1919    INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
    20     VALUES ("nbc_UserAdvManager_ConfirmMail","true;5;Hello.
     20    VALUES ("nbc_UserAdvManager_ConfirmMail","false;5;Hello.
     21               
     22This is a reminder message because you registered on our gallery but you do not validate your registration and your validation key has expired. To still allow you to access to our gallery, your validation period has been reset. You have again 5 days to validate your registration.
    2123
    22 This is a reminder message because you registered on our gallery but you do not validate your registration and your
     24Note: After this period, your account will be permanently deleted.;false;Hello.
    2325
    24 validation key has expired. To still allow you to access to our gallery, your validation period has been reset. You
    25 
    26 have again 5 days to validate your registration.
    27 
    28 Note: After this period, your account will be permanently deleted.;true;Hello.
    29 
    30 This is a reminder message because you registered on our gallery but you do not validate your registration and your
    31 
    32 validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by
    33 
    34 clicking on the link in the message you should have received when you registered.
     26This is a reminder message because you registered on our gallery but you do not validate your registration and your validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by clicking on the link in the message you should have received when you registered.
    3527
    3628Note: After this period, your account will be permanently deleted.","Parametres nbc_UserAdvManager - ConfirmMail")
    … …  
    5749/* Check for upgrade */
    5850          $query = '
    59     SELECT *, COUNT (*)
     51    SELECT *
    6052                FROM '.CONFIG_TABLE.'
    6153    WHERE param = "nbc_UserAdvManager_ConfirmMail"
    6254  ;';
    63   list($count) = mysql_fetch_row(pwg_query($query));
     55  $count = mysql_num_rows(pwg_query($query));
    6456 
    6557  /* upgrade from branch 2.10 */
    … …  
    8476  }
    8577
     78  if (isset($conf['nbc_UserAdvManager_ConfirmMail']))
     79  {
     80    $q = '
     81      DELETE FROM '.CONFIG_TABLE.'
     82      WHERE param="nbc_UserAdvManager_ConfirmMail"
     83    ;';
     84
     85    pwg_query($q);
     86  }
    8687
    8788  $q = 'DROP TABLE '.USER_CONFIRM_MAIL_TABLE.';';
    … …  
    9596  $q = '
    9697    INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
    97     VALUES ("nbc_UserAdvManager_ConfirmMail","true;5;Hello.
     98    VALUES ("nbc_UserAdvManager_ConfirmMail","false;5;Hello.
     99               
     100This is a reminder message because you registered on our gallery but you do not validate your registration and your validation key has expired. To still allow you to access to our gallery, your validation period has been reset. You have again 5 days to validate your registration.
    98101
    99 This is a reminder message because you registered on our gallery but you do not validate your registration and your
     102Note: After this period, your account will be permanently deleted.;false;Hello.
    100103
    101 validation key has expired. To still allow you to access to our gallery, your validation period has been reset. You
    102 
    103 have again 5 days to validate your registration.
    104 
    105 Note: After this period, your account will be permanently deleted.;true;Hello.
    106 
    107 This is a reminder message because you registered on our gallery but you do not validate your registration and your
    108 
    109 validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by
    110 
    111 clicking on the link in the message you should have received when you registered.
     104This is a reminder message because you registered on our gallery but you do not validate your registration and your validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by clicking on the link in the message you should have received when you registered.
    112105
    113106Note: After this period, your account will be permanently deleted.","Parametres nbc_UserAdvManager - ConfirmMail")
Note: See TracChangeset for help on using the changeset viewer.