Changeset 3872


Ignore:
Timestamp:
Sep 19, 2009, 1:25:21 AM (15 years ago)
Author:
Eric
Message:

Bug fixed on plugin install and upgrade
Language files correction

Location:
extensions/NBC_UserAdvManager/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php

    r3858 r3872  
    342342                'UserAdvManager_CONFIRMMAIL_TIMEOUT_FALSE'      => $conf_nbc_UserAdvManager_ConfirmMail[0]=='false' ?  'checked="checked"' : '' ,
    343343                'UserAdvManager_CONFIRMMAIL_DELAY'                                      => $conf_nbc_UserAdvManager_ConfirmMail[1],
     344    'UserAdvManager_CONFIRMMAIL_REMAIL_TRUE'            => $conf_nbc_UserAdvManager_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
     345    'UserAdvManager_CONFIRMMAIL_REMAIL_FALSE'           => $conf_nbc_UserAdvManager_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
    344346    'UserAdvManager_CONFIRMMAIL_REMAIL_TXT1'            => $conf_nbc_UserAdvManager_ConfirmMail[2],
    345347    'UserAdvManager_CONFIRMMAIL_REMAIL_TXT2'            => $conf_nbc_UserAdvManager_ConfirmMail[4],
    346     'UserAdvManager_CONFIRMMAIL_REMAIL_TRUE'            => $conf_nbc_UserAdvManager_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
    347     'UserAdvManager_CONFIRMMAIL_REMAIL_FALSE'           => $conf_nbc_UserAdvManager_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
    348348        )
    349349          );           

  • extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r3858 r3872  
    5555$lang['UserAdvManager_ConfirmMail_Remail_true'] = 'Enable email reminder';
    5656$lang['UserAdvManager_ConfirmMail_Remail_false'] = 'Disable email reminder';
    57 $lang['UserAdvManager_ConfirmMail_ReMail_Txt1'] = 'Custom content of the recall message with regeneration of validation key.<br>If left blank, the recall mail will include only the validation link. It is therefore strongly advised to take a little explanatory text. (NB: The text pre-filled with the installation of the plugin is given as an example)<br><br>(!!! <b style="text-decoration: blink underline;">WARNING !</b> Use the multi language tags from Extended Description plugin if this plugin is activated !!!)';
    58 $lang['UserAdvManager_ConfirmMail_ReMail_Txt2'] = 'Custom content of the recall message without regeneration of validation key.<br>If left blank, the recall mail will include only the validation link. It is therefore strongly advised to take a little explanatory text. (NB: The text pre-filled with the installation of the plugin is given as an example)<br><br>(!!! <b style="text-decoration: blink underline;">WARNING !</b> Use the multi language tags from Extended Description plugin if this plugin is activated !!!)';
     57$lang['UserAdvManager_ConfirmMail_ReMail_Txt1'] = 'Custom content of the recall message with regeneration of validation key.<br>If left blank, the recall mail will include only the validation link. It is therefore strongly advised to take a little explanatory text. (NB: The text pre-filled with the installation of the plugin is given as an example)<br><br>(!!! <b style="text-decoration: blink underline;">WARNING !</b> Text modification is available <b>ONLY</b> if email reminder is enabled. Use the multi language tags from Extended Description plugin if this plugin is activated !!!)';
     58$lang['UserAdvManager_ConfirmMail_ReMail_Txt2'] = 'Custom content of the recall message without regeneration of validation key.<br>If left blank, the recall mail will include only the validation link. It is therefore strongly advised to take a little explanatory text. (NB: The text pre-filled with the installation of the plugin is given as an example)<br><br>(!!! <b style="text-decoration: blink underline;">WARNING !</b> Text modification is available <b>ONLY</b> if email reminder is enabled. Use the multi language tags from Extended Description plugin if this plugin is activated !!!)';
    5959
    6060

  • extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r3858 r3872  
    5555$lang['UserAdvManager_ConfirmMail_Remail_true'] = 'Activer le rappel par mail';
    5656$lang['UserAdvManager_ConfirmMail_Remail_false'] = 'Désactiver le rappel par mail';
    57 $lang['UserAdvManager_ConfirmMail_ReMail_Txt1'] = 'Contenu personnalisé du message de rappel avec regénération de clé de validation.<br>Si laissé vide, le mail de rappel ne comportera que le lien de validation. Il est donc vivement conseillé de saisir un petit texte explicatif. (NB : Le texte pré renseigné à l\'installation du plugin est donné en exemple)<br><br>(!!! <b style="text-decoration: blink underline;">ATTENTION !</b> Utilisez la méthode multi language du plugin Extended Description si celui-ci est activé !!!)';
    58 $lang['UserAdvManager_ConfirmMail_ReMail_Txt2'] = 'Contenu personnalisé du message de rappel sans regénération de clé de validation.<br>Si laissé vide, le mail de rappel sera vide. Il est donc vivement conseillé de saisir un petit texte explicatif. (NB : Le texte pré renseigné à l\'installation du plugin est donné en exemple)<br><br>(!!! <b style="text-decoration: blink underline;">ATTENTION !</b> Utilisez la méthode multi language du plugin Extended Description si celui-ci est activé !!!)';
     57$lang['UserAdvManager_ConfirmMail_ReMail_Txt1'] = 'Contenu personnalisé du message de rappel avec regénération de clé de validation.<br>Si laissé vide, le mail de rappel ne comportera que le lien de validation. Il est donc vivement conseillé de saisir un petit texte explicatif. (NB : Le texte pré renseigné à l\'installation du plugin est donné en exemple)<br><br>(!!! <b style="text-decoration: blink underline;">ATTENTION !</b> La modification du texte n\'est possible <b>QUE</b> si le rappel par email est activé. Utilisez la méthode multi language du plugin Extended Description si celui-ci est activé !!!)';
     58$lang['UserAdvManager_ConfirmMail_ReMail_Txt2'] = 'Contenu personnalisé du message de rappel sans regénération de clé de validation.<br>Si laissé vide, le mail de rappel sera vide. Il est donc vivement conseillé de saisir un petit texte explicatif. (NB : Le texte pré renseigné à l\'installation du plugin est donné en exemple)<br><br>(!!! <b style="text-decoration: blink underline;">ATTENTION !</b> La modification du texte n\'est possible <b>QUE</b> si le rappel par email est activé. Utilisez la méthode multi language du plugin Extended Description si celui-ci est activé !!!)';
    5959
    6060

  • extensions/NBC_UserAdvManager/trunk/main.inc.php

    r3858 r3872  
    22/*
    33Plugin Name: NBC UserAdvManager
    4 Version: 2.11.0
     4Version: 2.11.1
    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
    … …  
    5252-- 2.11.0 : New tabsheet menu to manage ConfirMail functions (setting a timeout without validation, Cleanup expired user's accounts, Force confirmation, Renew validation key, list unvalidated users,...)
    5353                                                Beautify plugin's main admin panel
     54                                               
     55-- 2.11.1 : Bug fixed with install and upgrade functions
     56                                                Language files correction
    5457
    5558*/

  • extensions/NBC_UserAdvManager/trunk/maintain.inc.php

    r3845 r3872  
    88function plugin_install()
    99{
     10        global $conf;
     11       
    1012  $q = '
    1113    INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
    … …  
    1618  $q = '
    1719    INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
    18     VALUES ("nbc_UserAdvManager_ConfirmMail","false;5;false;Hello.<br>This 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.<br><br>Note: After this period, your account will be permanently deleted.;Hello.<br>This 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.<br><br>Note: After this period, your account will be permanently deleted.","Parametres nbc_UserAdvManager - ConfirmMail;")
     20    VALUES ("nbc_UserAdvManager_ConfirmMail","true;5;Hello.
     21
     22This is a reminder message because you registered on our gallery but you do not validate your registration and your
     23
     24validation key has expired. To still allow you to access to our gallery, your validation period has been reset. You
     25
     26have again 5 days to validate your registration.
     27
     28Note: After this period, your account will be permanently deleted.;true;Hello.
     29
     30This is a reminder message because you registered on our gallery but you do not validate your registration and your
     31
     32validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by
     33
     34clicking on the link in the message you should have received when you registered.
     35
     36Note: After this period, your account will be permanently deleted.","Parametres nbc_UserAdvManager - ConfirmMail")
    1937  ;';
    2038  pwg_query($q);
    … …  
    3351}
    3452
    35 
     53function plugin_activate()
     54{
     55          global $conf;
     56       
     57/* Check for upgrade */
     58          $query = '
     59    SELECT *, COUNT (*)
     60                FROM '.CONFIG_TABLE.'
     61    WHERE param = "nbc_UserAdvManager_ConfirmMail"
     62  ;';
     63  list($count) = mysql_fetch_row(pwg_query($query));
     64 
     65  /* upgrade from branch 2.10 */
     66        if ($count == 0)
     67        {
     68                upgrade_UserAdvManager();
     69        }
     70}
    3671
    3772function plugin_uninstall()
    … …  
    5388  pwg_query( $q );
    5489}
     90
     91function upgrade_UserAdvManager()
     92{
     93        global $conf;
     94         
     95  $q = '
     96    INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
     97    VALUES ("nbc_UserAdvManager_ConfirmMail","true;5;Hello.
     98
     99This is a reminder message because you registered on our gallery but you do not validate your registration and your
     100
     101validation key has expired. To still allow you to access to our gallery, your validation period has been reset. You
     102
     103have again 5 days to validate your registration.
     104
     105Note: After this period, your account will be permanently deleted.;true;Hello.
     106
     107This is a reminder message because you registered on our gallery but you do not validate your registration and your
     108
     109validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by
     110
     111clicking on the link in the message you should have received when you registered.
     112
     113Note: After this period, your account will be permanently deleted.","Parametres nbc_UserAdvManager - ConfirmMail")
     114  ;';
     115  pwg_query($q);
     116}
    55117?>
Note: See TracChangeset for help on using the changeset viewer.