Changeset 25102 for extensions/UserAdvManager/branches/2.51
- Timestamp:
- Oct 23, 2013, 9:57:26 PM (10 years ago)
- Location:
- extensions/UserAdvManager/branches/2.51
- Files:
-
- 4 edited
-
admin/UAM_admin.php (modified) (2 diffs)
-
changelog.txt.php (modified) (1 diff)
-
language/en_UK/plugin.lang.php (modified) (3 diffs)
-
language/fr_FR/plugin.lang.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/branches/2.51/admin/UAM_admin.php
r25093 r25102 433 433 434 434 // Bug fix - We can not use "Guest" status and other are not suitable so we fix NO_CONFIRM_STATUS to "------------" 435 $conf_UAM['NO_CONFIRM_STATUS'] == $status_options[-1];436 437 $template->assign(438 'No_Confirm_Status',439 array(440 'Status_options' => $status_options[-1],441 'Status_selected' => $status_options[-1]442 )443 );435 // $conf_UAM['NO_CONFIRM_STATUS'] == $status_options[-1]; 436 // 437 // $template->assign( 438 // 'No_Confirm_Status', 439 // array( 440 // 'Status_options' => $status_options[-1], 441 // 'Status_selected' => $status_options[-1] 442 // ) 443 // ); 444 444 445 445 // Get unvalidate status values 446 446 // ---------------------------- 447 //foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)448 //{449 //$status_options[$status] = l10n('user_status_'.$status);450 //if (isset($conf_UAM['NO_CONFIRM_STATUS']) and $conf_UAM['NO_CONFIRM_STATUS'] == $status)451 //{452 //$No_Valid_Status = $status;453 //}454 //455 //// Template initialization for unvalidated users status456 //// ----------------------------------------------------457 //$template->assign(458 //'No_Confirm_Status',459 //array(460 //'Status_options' => $status_options,461 //'Status_selected' => $No_Valid_Status462 //)463 //);464 //}465 447 foreach (get_enums(USER_INFOS_TABLE, 'status') as $status) 448 { 449 $status_options[$status] = l10n('user_status_'.$status); 450 if (isset($conf_UAM['NO_CONFIRM_STATUS']) and $conf_UAM['NO_CONFIRM_STATUS'] == $status) 451 { 452 $No_Valid_Status = $status; 453 } 454 455 // Template initialization for unvalidated users status 456 // ---------------------------------------------------- 457 $template->assign( 458 'No_Confirm_Status', 459 array( 460 'Status_options' => $status_options, 461 'Status_selected' => $No_Valid_Status 462 ) 463 ); 464 } 465 466 466 // Get validate status values 467 467 // -------------------------- … … 487 487 488 488 // Bug fix - We can not use "Guest" status and other are not suitable so we fix DOWNGRADE_STATUS to "------------" 489 $conf_UAM['DOWNGRADE_STATUS'] == $status_options[-1];490 491 $template->assign(492 'Downgrade_Status',493 array(494 'Status_options' => $status_options[-1],495 'Status_selected' => $status_options[-1]496 )497 );489 // $conf_UAM['DOWNGRADE_STATUS'] == $status_options[-1]; 490 // 491 // $template->assign( 492 // 'Downgrade_Status', 493 // array( 494 // 'Status_options' => $status_options[-1], 495 // 'Status_selected' => $status_options[-1] 496 // ) 497 // ); 498 498 499 499 // Get downgrade status values 500 500 // --------------------------- 501 //foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)502 //{503 //$status_options[$status] = l10n('user_status_'.$status);504 //if (isset($conf_UAM['DOWNGRADE_STATUS']) and $conf_UAM['DOWNGRADE_STATUS'] == $status)505 //{506 //$Downgrade_Status = $status;507 //}508 //509 //// Template initialization for validated users status510 //// --------------------------------------------------511 //$template->assign(512 //'Downgrade_Status',513 //array(514 //'Status_options' => $status_options,515 //'Status_selected' => $Downgrade_Status516 //)517 //);518 //}501 foreach (get_enums(USER_INFOS_TABLE, 'status') as $status) 502 { 503 $status_options[$status] = l10n('user_status_'.$status); 504 if (isset($conf_UAM['DOWNGRADE_STATUS']) and $conf_UAM['DOWNGRADE_STATUS'] == $status) 505 { 506 $Downgrade_Status = $status; 507 } 508 509 // Template initialization for validated users status 510 // -------------------------------------------------- 511 $template->assign( 512 'Downgrade_Status', 513 array( 514 'Status_options' => $status_options, 515 'Status_selected' => $Downgrade_Status 516 ) 517 ); 518 } 519 519 520 520 -
extensions/UserAdvManager/branches/2.51/changelog.txt.php
r25093 r25102 464 464 Bug 2987 fixed - New registered users have to follow a link on confirmation page before log in 465 465 466 -- 2.51.1 : Bug 2986 rollback - The fix is not working well. A special notice is added in administration panel 466 467 */ 467 468 ?> -
extensions/UserAdvManager/branches/2.51/language/en_UK/plugin.lang.php
r25093 r25102 145 145 // --------- Starting below: New or revised $lang ---- from version 2.16.0 146 146 $lang['UAM_Expired_Group'] = '<b>Group</b> for user\'s registration has expired<br/>'; 147 $lang['UAM_Expired_Status'] = '<b>Status</b> for user\'s registration has expired will ever be "--------"<br/><b style="color: red;">Note :Because useless, this feature could be removed in the future versions</b><br/>';147 $lang['UAM_Expired_Status'] = '<b>Status</b> for user\'s registration has expired<br/><b style="color: red;">Warning : Do not user "Guest" status. Because useless, this feature could be removed in the future versions</b><br/>'; 148 148 $lang['UAM_GTAuto'] = 'Automatic management of ghosts users'; 149 149 $lang['UAM_GTAutoDel'] = 'Automatic deletion of accounts'; … … 194 194 $lang['UAM_Confirm_grpstat_notice'] = 'Caution: It is advisable to use either the group or the statutes confirmation and not both simultaneously. The privacy level can be used in conjunction with a group or status assignment.'; 195 195 $lang['UAM_Confirm_Group'] = 'Groups<br/>(leave ------- to not affect group)'; 196 $lang['UAM_Confirm_Status'] = 'Statutes <b style="color: red;"> Note :Because useless, this feature could be removed in the future versions</b><br/>(leave ------- to keep the Piwigo\'s default)';196 $lang['UAM_Confirm_Status'] = 'Statutes <b style="color: red;">Warning : Do not use "Guest" status. Because useless, this feature could be removed in the future versions</b><br/>(leave ------- to keep the Piwigo\'s default)'; 197 197 $lang['UAM_Confirm_Level'] = 'Privacy level<br/>(leave ------- to keep the Piwigo\'s default)'; 198 198 $lang['UAM_GTAutoGp'] = 'Automatic change of group / status / privacy level'; … … 257 257 $lang['UAM_No_Confirm_Group'] = 'Group for users who have not confirmed their registration<br/>'; 258 258 $lang['UAM_Validated_Group'] = 'Group for users who have confirmed their registration<br/>'; 259 $lang['UAM_No_Confirm_Status'] = 'Status for users who have not confirmed their registration will ever be "------------"<br/>';259 $lang['UAM_No_Confirm_Status'] = 'Status for users who have not confirmed their registration<br/>'; 260 260 $lang['UAM_Validated_Status'] = 'Status for users who have confirmed their registration<br/>'; 261 261 $lang['UAM_No_Valid_Level'] = 'Privacy level for users who have not confirmed their registration<br/>'; -
extensions/UserAdvManager/branches/2.51/language/fr_FR/plugin.lang.php
r25093 r25102 151 151 // --------- Starting below: New or revised $lang ---- from version 2.16.0 152 152 $lang['UAM_Expired_Group'] = '<b>Groupe</b> pour les utilisateurs dont l\'inscription aura expirée<br/>'; 153 $lang['UAM_Expired_Status'] = '<b>Statut</b> pour les utilisateurs dont l\'inscription aura expirée - Sera obligatoirement "--------"<br/><b style="color: red;">Note :Pour cause de désuétude, cette fonction est vouée à disparaitre dans le prochaines versions</b><br/>';153 $lang['UAM_Expired_Status'] = '<b>Statut</b> pour les utilisateurs dont l\'inscription aura expirée<br/><b style="color: red;">Important : N\'utilisez pas le status "Invité". Pour cause de désuétude, cette fonction est vouée à disparaitre dans le prochaines versions</b><br/>'; 154 154 $lang['UAM_GTAuto'] = 'Gestion automatique des utilisateurs fantomes'; 155 155 $lang['UAM_GTAutoDel'] = 'Suppressions automatiques des comptes'; … … 201 201 $lang['UAM_Confirm_grpstat_notice'] = 'Attention : Il est conseillé d\'affecter soit les groupes, soit les statuts et pas les deux simultanément. Le niveau de confidentialité peut être utilisé conjointement avec une affectation de groupe ou de statut.'; 202 202 $lang['UAM_Confirm_Group'] = 'Groupes<br/>(------- pour ne pas affecter de groupe)'; 203 $lang['UAM_Confirm_Status'] = 'Statuts <b style="color: red;"> Note :Pour cause de désuétude, cette fonction est vouée à disparaitre dans le prochaines versions</b><br/>(------- pour conserver la valeur par défaut de Piwigo)';203 $lang['UAM_Confirm_Status'] = 'Statuts <b style="color: red;">Important : N\'utilisez pas le status "Invité". Pour cause de désuétude, cette fonction est vouée à disparaitre dans le prochaines versions</b><br/>(------- pour conserver la valeur par défaut de Piwigo)'; 204 204 $lang['UAM_Confirm_Level'] = 'Niveau de confidentialité<br/>(------- pour conserver la valeur par défaut de Piwigo)'; 205 205 $lang['UAM_GTAutoGp'] = 'Changement automatique de groupe / statut / niveau de confidentialité'; … … 302 302 $lang['UAM_No_Confirm_Group'] = 'Pour les utilisateurs n\'ayant pas confirmé leur inscription<br/>'; 303 303 $lang['UAM_Validated_Group'] = 'Pour les utilisateurs ayant confirmé leur inscription<br/>'; 304 $lang['UAM_No_Confirm_Status'] = 'Pour les utilisateurs n\'ayant pas confirmé leur inscription sera toujours "----------"<br/>';304 $lang['UAM_No_Confirm_Status'] = 'Pour les utilisateurs n\'ayant pas confirmé leur inscription<br/>'; 305 305 $lang['UAM_Validated_Status'] = 'Pour les utilisateurs ayant confirmé leur inscription.<br/>'; 306 306 $lang['UAM_ConfirmMail_Remail'] = 'Mail de rappel aux inscrits non confirmés';
Note: See TracChangeset
for help on using the changeset viewer.
