Changeset 10392


Ignore:
Timestamp:
04/15/11 21:43:29 (9 years ago)
Author:
Eric
Message:

r10391 merged from trunk to branch 2.20

Location:
extensions/UserAdvManager/branches/2.20
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.20/admin/UAM_admin.php

    r10360 r10392  
    106106  case 'global': 
    107107 
    108         if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs'])) 
     108        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw'])) 
    109109  { 
    110110 
     
    178178      $_POST['UAM_USRAutoDelText'], 
    179179      $_POST['UAM_USRAutoMail'], 
    180       $_POST['UAM_Stuffs'] 
     180      $_POST['UAM_Stuffs'], 
     181      $_POST['UAM_HidePassw'] 
    181182      ); 
    182183 
     
    446447    'UAM_STUFFS_TRUE'                => $conf_UAM[34]=='true' ?  'checked="checked"' : '' , 
    447448    'UAM_STUFFS_FALSE'               => $conf_UAM[34]=='false' ?  'checked="checked"' : '' , 
     449    'UAM_HIDEPASSW_TRUE'             => $conf_UAM[35]=='true' ?  'checked="checked"' : '' , 
     450    'UAM_HIDEPASSW_FALSE'            => $conf_UAM[35]=='false' ?  'checked="checked"' : '' , 
    448451                'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score, 
    449452    'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error, 
  • extensions/UserAdvManager/branches/2.20/admin/template/global.tpl

    r10360 r10392  
    184184          <fieldset> 
    185185            <ul> 
     186              <li> 
     187                <label class="cluetip" title="{'UAM_HidePasswTitle'|translate}|{'UAM_HidePasswTitle_d'|translate}"> 
     188                  {'UAM_HidePassw'|@translate} 
     189                </label> 
     190              <br><br> 
     191                <input type="radio" value="false" {$UAM_HIDEPASSW_FALSE} name="UAM_HidePassw"> 
     192                  {'UAM_Disable'|@translate} 
     193              <br> 
     194                <input type="radio" value="true" {$UAM_HIDEPASSW_TRUE} name="UAM_HidePassw"> 
     195                  {'UAM_Enable'|@translate} 
     196              <br><br> 
     197              </li> 
     198           
    186199              <li> 
    187200                <label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}"> 
  • extensions/UserAdvManager/branches/2.20/changelog.txt.php

    r10360 r10392  
    242242            Bug 2258 fixed - New feature to backup UAM configuration and personnal settings 
    243243 
     244-- 2.20.4 : Bug 2265 fixed - Add new option to display or not user's password in information email 
    244245*/ 
    245246?> 
  • extensions/UserAdvManager/branches/2.20/include/functions.inc.php

    r10343 r10392  
    858858  if (isset($conf_UAM[0]) and $conf_UAM[0] == 'true') 
    859859  { 
    860     $infos1 = array( 
    861       get_l10n_args('UAM_infos_mail %s', stripslashes($username)), 
    862       get_l10n_args('UAM_User: %s', stripslashes($username)), 
    863       get_l10n_args('UAM_Password: %s', $password), 
    864       get_l10n_args('Email: %s', $email), 
    865       get_l10n_args('', ''), 
    866     ); 
    867   } 
    868  
     860    if (isset($conf_UAM[35]) and $conf_UAM[35] == 'false') // Allow display of clear password in email 
     861    { 
     862      $infos1 = array( 
     863        get_l10n_args('UAM_infos_mail %s', stripslashes($username)), 
     864        get_l10n_args('UAM_User: %s', stripslashes($username)), 
     865        get_l10n_args('UAM_Password: %s', $password), 
     866        get_l10n_args('Email: %s', $email), 
     867        get_l10n_args('', ''), 
     868      ); 
     869    } 
     870    else // Do not allow display of clear password in email 
     871    { 
     872      $infos1 = array( 
     873        get_l10n_args('UAM_infos_mail %s', stripslashes($username)), 
     874        get_l10n_args('UAM_User: %s', stripslashes($username)), 
     875        get_l10n_args('Email: %s', $email), 
     876        get_l10n_args('', ''), 
     877      ); 
     878    } 
     879  } 
    869880 
    870881  if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' and $confirm) 
  • extensions/UserAdvManager/branches/2.20/include/upgradedb.inc.php

    r10145 r10392  
    398398  } 
    399399} 
     400 
     401/* upgrade from 2.20.3 to 2.20.4 */ 
     402/* ***************************** */ 
     403function upgrade_2203_2204() 
     404{ 
     405  global $conf; 
     406 
     407  // Upgrading options 
     408  $query = ' 
     409SELECT value 
     410  FROM '.CONFIG_TABLE.' 
     411WHERE param = "UserAdvManager" 
     412;'; 
     413 
     414  $result = pwg_query($query); 
     415  $conf_UAM = pwg_db_fetch_assoc($result); 
     416     
     417  $Newconf_UAM = unserialize($conf_UAM['value']); 
     418   
     419  $Newconf_UAM[35] = 'false'; 
     420   
     421  $update_conf = serialize($Newconf_UAM); 
     422     
     423  $query = ' 
     424UPDATE '.CONFIG_TABLE.' 
     425SET value="'.addslashes($update_conf).'" 
     426WHERE param="UserAdvManager" 
     427LIMIT 1 
     428;'; 
     429 
     430        pwg_query($query); 
     431} 
    400432?> 
  • extensions/UserAdvManager/branches/2.20/language/de_DE/help/plugin.lang.php

    r10343 r10392  
    279279Die Erholung von dieser Schnittstelle wird nicht unterstützt. Verwenden Sie Tools wie phpMyAdmin.'; 
    280280// --------- End: New or revised $lang ---- from version 2.20.3 
     281 
     282 
     283// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     284$lang['UAM_HidePasswTitle'] = 'Passwort im Klartext in der Informations-E-Mail'; 
     285/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.'; 
     286// --------- End: New or revised $lang ---- from version 2.20.4 
    281287?> 
  • extensions/UserAdvManager/branches/2.20/language/de_DE/plugin.lang.php

    r10343 r10392  
    325325$lang['UAM_Dump_NOK'] = 'Fehler: Backup-Datei kann nicht erstellt werden !'; 
    326326// --------- End: New or revised $lang ---- from version 2.20.3 
     327 
     328 
     329// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     330$lang['UAM_HidePassw'] = 'Passwort im Klartext in der Informations-E-Mail'; 
     331// --------- End: New or revised $lang ---- from version 2.20.4 
    327332?> 
  • extensions/UserAdvManager/branches/2.20/language/en_UK/help/plugin.lang.php

    r10343 r10392  
    279279The recovery from this interface is not supported. Use tools like phpMyAdmin.'; 
    280280// --------- End: New or revised $lang ---- from version 2.20.3 
     281 
     282 
     283// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     284$lang['UAM_HidePasswTitle'] = 'Password in clear text in the information email'; 
     285$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.'; 
     286// --------- End: New or revised $lang ---- from version 2.20.4 
    281287?> 
  • extensions/UserAdvManager/branches/2.20/language/en_UK/plugin.lang.php

    r10343 r10392  
    327327$lang['UAM_Dump_NOK'] = 'Error: Unable to create backup file !'; 
    328328// --------- End: New or revised $lang ---- from version 2.20.3 
     329 
     330 
     331// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     332$lang['UAM_HidePassw'] = 'Password in clear text in the information email'; 
     333// --------- End: New or revised $lang ---- from version 2.20.4 
    329334?> 
  • extensions/UserAdvManager/branches/2.20/language/es_ES/help/plugin.lang.php

    r10343 r10392  
    275275The recovery from this interface is not supported. Use tools like phpMyAdmin.'; 
    276276// --------- End: New or revised $lang ---- from version 2.20.3 
     277 
     278 
     279// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     280$lang['UAM_HidePasswTitle'] = 'Contraseña en texto claro en la información del correo electrónico'; 
     281/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.'; 
     282// --------- End: New or revised $lang ---- from version 2.20.4 
    277283?> 
  • extensions/UserAdvManager/branches/2.20/language/es_ES/plugin.lang.php

    r10343 r10392  
    365365/*TODO*/$lang['UAM_Dump_NOK'] = 'Error: Unable to create backup file !'; 
    366366// --------- End: New or revised $lang ---- from version 2.20.3 
     367 
     368 
     369// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     370$lang['UAM_HidePassw'] = 'Contraseña en texto claro en la información del correo electrónico'; 
     371// --------- End: New or revised $lang ---- from version 2.20.4 
    367372?> 
  • extensions/UserAdvManager/branches/2.20/language/fr_FR/help/plugin.lang.php

    r10343 r10392  
    275275La restauration à partir de cette interface n\'est pas prise en charge. Utilisez des outils comme PhpMyAdmin.'; 
    276276// --------- End: New or revised $lang ---- from version 2.20.3 
     277 
     278 
     279// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     280$lang['UAM_HidePasswTitle'] = 'Mot de passe en clair dans le mail d\'information'; 
     281$lang['UAM_HidePasswTitle_d'] = 'Choisissez ici si vous souhaitez faire afficher le mot de passe choisi par le visiteur dans le mail d\'information. Si vous activez l\'option, le mot de passe apparaitra alors en clair. Si vous la désactivez, le mot de passe n\'apparaitra pas du tout.'; 
     282// --------- End: New or revised $lang ---- from version 2.20.4 
    277283?> 
  • extensions/UserAdvManager/branches/2.20/language/fr_FR/plugin.lang.php

    r10343 r10392  
    326326$lang['UAM_Dump_NOK'] = 'Erreur : Impossible de créer le fichier de sauvegarde !'; 
    327327// --------- End: New or revised $lang ---- from version 2.20.3 
     328 
     329 
     330// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     331$lang['UAM_HidePassw'] = 'Mot de passe en clair dans le mail d\'information'; 
     332// --------- End: New or revised $lang ---- from version 2.20.4 
    328333?> 
  • extensions/UserAdvManager/branches/2.20/language/it_IT/help/plugin.lang.php

    r10343 r10392  
    266266The recovery from this interface is not supported. Use tools like phpMyAdmin.'; 
    267267// --------- End: New or revised $lang ---- from version 2.20.3 
     268 
     269 
     270// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     271$lang['UAM_HidePasswTitle'] = 'Password in chiaro nelle informazioni e-mail'; 
     272/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.'; 
     273// --------- End: New or revised $lang ---- from version 2.20.4 
    268274?> 
  • extensions/UserAdvManager/branches/2.20/language/it_IT/plugin.lang.php

    r10343 r10392  
    324324/*TODO*/$lang['UAM_Dump_NOK'] = 'Error: Unable to create backup file !'; 
    325325// --------- End: New or revised $lang ---- from version 2.20.3 
     326 
     327 
     328// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     329$lang['UAM_HidePassw'] = 'Password in chiaro nelle informazioni e-mail'; 
     330// --------- End: New or revised $lang ---- from version 2.20.4 
    326331?> 
  • extensions/UserAdvManager/branches/2.20/language/lv_LV/help/plugin.lang.php

    r10343 r10392  
    301301The recovery from this interface is not supported. Use tools like phpMyAdmin.'; 
    302302// --------- End: New or revised $lang ---- from version 2.20.3 
     303 
     304 
     305// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     306/*TODO*/$lang['UAM_HidePasswTitle'] = 'Password in clear text in the information email'; 
     307/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.'; 
     308// --------- End: New or revised $lang ---- from version 2.20.4 
    303309?> 
  • extensions/UserAdvManager/branches/2.20/language/lv_LV/plugin.lang.php

    r10343 r10392  
    362362/*TODO*/$lang['UAM_Dump_NOK'] = 'Error: Unable to create backup file !'; 
    363363// --------- End: New or revised $lang ---- from version 2.20.3 
     364 
     365 
     366// --------- Starting below: New or revised $lang ---- from version 2.20.4 
     367/*TODO*/$lang['UAM_HidePassw'] = 'Clear password in information email'; 
     368// --------- End: New or revised $lang ---- from version 2.20.4 
    364369?> 
  • extensions/UserAdvManager/branches/2.20/main.inc.php

    r10343 r10392  
    22/* 
    33Plugin Name: UserAdvManager 
    4 Version: 2.20.3 
     4Version: 2.20.4 
    55Description: Renforcer la gestion des utilisateurs - Enforce users management 
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216 
  • extensions/UserAdvManager/branches/2.20/maintain.inc.php

    r10169 r10392  
    2222Best regards, 
    2323 
    24 The admin of the gallery.','false','false','false','false','false','Sorry [username], your account has been deleted due to a too long time passed since your last visit at [mygallery].','Sorry [username], your account has been deprecated due to a too long time passed since your last visit at [mygallery]. Please, use the following link to revalidate your account.',-1,-1,'Thank you for registering at [mygallery]. Your account has been manually validated by _admin_. You may now log in at _link_to_site_ and make any appropriate changes to your profile. Welcome to _name_of_site_!','false','You have requested a password reset on our gallery. Please, find below your new connection settings.','false','Sorry, your account has been deleted because you have not validated your registration in requested time. Please, try registration with a valid and non blocked email account.','false','false'); 
     24The admin of the gallery.','false','false','false','false','false','Sorry [username], your account has been deleted due to a too long time passed since your last visit at [mygallery].','Sorry [username], your account has been deprecated due to a too long time passed since your last visit at [mygallery]. Please, use the following link to revalidate your account.',-1,-1,'Thank you for registering at [mygallery]. Your account has been manually validated by _admin_. You may now log in at _link_to_site_ and make any appropriate changes to your profile. Welcome to _name_of_site_!','false','You have requested a password reset on our gallery. Please, find below your new connection settings.','false','Sorry, your account has been deleted because you have not validated your registration in requested time. Please, try registration with a valid and non blocked email account.','false','false','false'); 
    2525 
    2626        $query = ' 
     
    238238/* Check for upgrade from 2.16 to 2.20 */ 
    239239/* *********************************** */ 
    240   if (isset($conf['UserAdvManager_Version']) and $conf['UserAdvManager_Version'] == '2.16.0') 
     240  if (isset($conf['UserAdvManager_Version']) and strcmp($conf['UserAdvManager_Version'], '2.20.0') < 0) 
    241241  { 
    242242    /* upgrade from branch 2.16 to 2.20 */ 
    243243    /* ******************************** */ 
    244244    upgrade_216_220(); 
     245  } 
     246 
     247/* Check for upgrade from 2.20.3 to 2.20.4 */ 
     248/* *************************************** */ 
     249  if (isset($conf['UserAdvManager_Version']) and strcmp($conf['UserAdvManager_Version'], '2.20.4') < 0) 
     250  { 
     251    /* upgrade from branch 2.16 to 2.20 */ 
     252    /* ******************************** */ 
     253    upgrade_2203_2204(); 
    245254  } 
    246255 
Note: See TracChangeset for help on using the changeset viewer.