Changeset 14730
- Timestamp:
- May 3, 2012, 9:55:00 PM (12 years ago)
- Location:
- extensions/UserAdvManager/branches/2.40
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/branches/2.40/ConfirmMail.php
r14371 r14730 77 77 $replacements[] = $conf['gallery_title']; 78 78 $patterns[] = '#\[myurl\]#i'; 79 $replacements[] = $conf['gallery_url'];80 79 $replacements[] = get_gallery_home_url(); 80 81 81 if (function_exists('get_user_language_desc')) 82 82 { … … 87 87 88 88 $redirect = true; 89 $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons90 91 $template->assign(92 array(93 'UAM_PATH' => $Path_UAM,94 'REDIRECT' => $redirect,95 'STATUS' => $status,96 'CONFIRM_MAIL_MESSAGE' => $custom_text,97 )98 );99 89 } 100 90 else … … 112 102 $replacements[] = $conf['gallery_title']; 113 103 $patterns[] = '#\[myurl\]#i'; 114 $replacements[] = $conf['gallery_url'];104 $replacements[] = get_gallery_home_url(); 115 105 116 106 if (function_exists('get_user_language_desc')) … … 120 110 else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[6])); 121 111 } 122 123 $template->assign(124 array(125 'REDIRECT' => $redirect,126 'GALLERY_URL' => make_index_url(),127 'STATUS' => $status,128 'CONFIRM_MAIL_MESSAGE' => $custom_text,129 )130 );131 112 } 113 114 $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons 115 116 $template->assign( 117 array( 118 'UAM_PATH' => $Path_UAM, 119 'REDIRECT' => $redirect, 120 'STATUS' => $status, 121 'CONFIRM_MAIL_MESSAGE' => $custom_text, 122 ) 123 ); 132 124 } 133 125 -
extensions/UserAdvManager/branches/2.40/GT_del_account.php
r14371 r14730 28 28 $replacements[] = $conf['gallery_title']; 29 29 $patterns[] = '#\[myurl\]#i'; 30 $replacements[] = $conf['gallery_url'];30 $replacements[] = get_gallery_home_url(); 31 31 32 32 if (function_exists('get_user_language_desc')) … … 42 42 array( 43 43 'UAM_PATH' => $Path_UAM, 44 'GALLERY_URL' => make_index_url(),45 44 'CUSTOM_REDIR_MSG' => $custom_text, 46 45 ) -
extensions/UserAdvManager/branches/2.40/USR_del_account.php
r12271 r14730 28 28 $replacements[] = $conf['gallery_title']; 29 29 $patterns[] = '#\[myurl\]#i'; 30 $replacements[] = $conf['gallery_url'];30 $replacements[] = get_gallery_home_url(); 31 31 32 32 if (function_exists('get_user_language_desc')) … … 39 39 $template->assign( 40 40 array( 41 'GALLERY_URL' => make_index_url(),42 41 'CUSTOM_REDIR_MSG' => $custom_text, 43 42 ) -
extensions/UserAdvManager/branches/2.40/admin/UAM_admin.php
r13107 r14730 113 113 { 114 114 115 // Render free textfields116 // ----------------------- 115 // Render email contents fields 116 // ---------------------------- 117 117 $_POST['UAM_MailInfo_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_MailInfo_Text']))); 118 118 … … 120 120 121 121 $_POST['UAM_GhostTracker_ReminderText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GhostTracker_ReminderText']))); 122 122 123 123 $_POST['UAM_GTAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText']))); 124 124 … … 133 133 $_POST['UAM_CustomRejectConnexion_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomRejectConnexion_Text']))); 134 134 135 // Render email subjects fields 136 // --------------------------- 137 $_POST['UAM_ConfirmMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Subject']))); 138 139 $_POST['UAM_ConfirmMail_Remail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Remail_Subject']))); 140 141 $_POST['UAM_InfoMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_InfoMail_Subject']))); 142 143 $_POST['UAM_GTAutoMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoMail_Subject']))); 144 145 $_POST['UAM_GTReminder_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTReminder_Subject']))); 146 147 $_POST['UAM_AdminValidationMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_AdminValidationMail_Subject']))); 148 149 150 // Check if emails are mandatory for registrations (needed for email exclusion option) 151 // ----------------------------------------------------------------------------------- 152 if ($conf['obligatory_user_mail_address']) 153 { 135 154 // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them 136 155 // -------------------------------------------------------------------------------------- … … 140 159 $UAM_Exclusionlist_Error = true; 141 160 } 161 } 162 elseif (!$conf['obligatory_user_mail_address']) 163 { 164 $_POST['UAM_MailExclusion_List'] = ''; 165 } 142 166 143 167 // Consistency check between ConfirmMail and AutoMail - We cannot use GTAutoMail if ConfirmMail is disabled … … 205 229 $_POST['UAM_RejectConnexion'], 206 230 $_POST['UAM_CustomRejectConnexion_Text'], 231 $_POST['UAM_ConfirmMail_Subject'], 232 $_POST['UAM_ConfirmMail_Remail_Subject'], 233 $_POST['UAM_InfoMail_Subject'], 234 $_POST['UAM_GTAutoMail_Subject'], 235 $_POST['UAM_GTReminder_Subject'], 236 $_POST['UAM_AdminValidationMail_Subject'], 207 237 ); 208 238 … … 541 571 $template->assign( 542 572 array( 543 'nb_para' => $nb_para, 544 'nb_para2' => $nb_para2, 545 'UAM_VERSION' => $version, 546 'UAM_PATH' => UAM_PATH, 547 'UAM_DUMP_DOWNLOAD' => $dump_download, 548 'UAM_THEME' => $UAM_theme, 549 'UAM_MAIL_INFO_TRUE' => $conf_UAM[0]=='true' ? 'checked="checked"' : '' , 550 'UAM_MAIL_INFO_FALSE' => $conf_UAM[0]=='false' ? 'checked="checked"' : '' , 551 'UAM_MAILINFO_TEXT' => $conf_UAM[8], 552 'UAM_USERNAME_CHAR_TRUE' => $conf_UAM[5]=='true' ? 'checked="checked"' : '' , 553 'UAM_USERNAME_CHAR_FALSE' => $conf_UAM[5]=='false' ? 'checked="checked"' : '' , 554 'UAM_USERNAME_CHAR_LIST' => $conf_UAM[6], 555 'UAM_CONFIRM_MAIL_TRUE' => $conf_UAM[1]=='true' ? 'checked="checked"' : '' , 556 'UAM_CONFIRM_MAIL_FALSE' => $conf_UAM[1]=='false' ? 'checked="checked"' : '' , 557 'UAM_CONFIRM_MAIL_LOCAL' => $conf_UAM[1]=='local' ? 'checked="checked"' : '' , 558 'UAM_CONFIRMMAIL_TEXT' => $conf_UAM[9], 559 'UAM_No_Confirm_Group' => $conf_UAM[2], 560 'UAM_Validated_Group' => $conf_UAM[3], 561 'UAM_No_Confirm_Status' => $conf_UAM[7], 562 'UAM_Validated_Status' => $conf_UAM[4], 563 'UAM_MAILEXCLUSION_TRUE' => $conf_UAM[10]=='true' ? 'checked="checked"' : '' , 564 'UAM_MAILEXCLUSION_FALSE' => $conf_UAM[10]=='false' ? 'checked="checked"' : '' , 565 'UAM_MAILEXCLUSION_LIST' => $conf_UAM[11], 566 'UAM_PASSWORDENF_TRUE' => $conf_UAM[12]=='true' ? 'checked="checked"' : '' , 567 'UAM_PASSWORDENF_FALSE' => $conf_UAM[12]=='false' ? 'checked="checked"' : '' , 568 'UAM_PASSWORD_SCORE' => $conf_UAM[13], 569 'UAM_ADMINPASSWENF_TRUE' => $conf_UAM[14]=='true' ? 'checked="checked"' : '' , 570 'UAM_ADMINPASSWENF_FALSE' => $conf_UAM[14]=='false' ? 'checked="checked"' : '' , 571 'UAM_GHOSTRACKER_TRUE' => $conf_UAM[15]=='true' ? 'checked="checked"' : '' , 572 'UAM_GHOSTRACKER_FALSE' => $conf_UAM[15]=='false' ? 'checked="checked"' : '' , 573 'UAM_GHOSTRACKER_DAYLIMIT' => $conf_UAM[16], 574 'UAM_GHOSTRACKER_REMINDERTEXT' => $conf_UAM[17], 575 'UAM_ADDLASTVISIT_TRUE' => $conf_UAM[18]=='true' ? 'checked="checked"' : '' , 576 'UAM_ADDLASTVISIT_FALSE' => $conf_UAM[18]=='false' ? 'checked="checked"' : '' , 577 'UAM_ADMINCONFMAIL_TRUE' => $conf_UAM[19]=='true' ? 'checked="checked"' : '' , 578 'UAM_ADMINCONFMAIL_FALSE' => $conf_UAM[19]=='false' ? 'checked="checked"' : '' , 579 'UAM_REDIRTOPROFILE_TRUE' => $conf_UAM[20]=='true' ? 'checked="checked"' : '' , 580 'UAM_REDIRTOPROFILE_FALSE' => $conf_UAM[20]=='false' ? 'checked="checked"' : '' , 581 'UAM_GTAUTO_TRUE' => $conf_UAM[21]=='true' ? 'checked="checked"' : '' , 582 'UAM_GTAUTO_FALSE' => $conf_UAM[21]=='false' ? 'checked="checked"' : '' , 583 'UAM_GTAUTOMAIL_TRUE' => $conf_UAM[22]=='true' ? 'checked="checked"' : '' , 584 'UAM_GTAUTOMAIL_FALSE' => $conf_UAM[22]=='false' ? 'checked="checked"' : '' , 585 'UAM_GTAUTODEL_TEXT' => $conf_UAM[23], 586 'UAM_GTAUTOMAILTEXT' => $conf_UAM[24], 587 'UAM_Downgrade_Group' => $conf_UAM[25], 588 'UAM_Downgrade_Status' => $conf_UAM[26], 589 'UAM_ADMINVALIDATIONMAIL_TEXT' => $conf_UAM[27], 590 'UAM_CUSTOMPASSWRETR_TRUE' => $conf_UAM[28]=='true' ? 'checked="checked"' : '' , 591 'UAM_CUSTOMPASSWRETR_FALSE' => $conf_UAM[28]=='false' ? 'checked="checked"' : '' , 592 'UAM_CUSTOMPASSWRETR_TEXT' => $conf_UAM[29], 593 'UAM_USRAUTO_TRUE' => $conf_UAM[30]=='true' ? 'checked="checked"' : '' , 594 'UAM_USRAUTO_FALSE' => $conf_UAM[30]=='false' ? 'checked="checked"' : '' , 595 'UAM_USRAUTODEL_TEXT' => $conf_UAM[31], 596 'UAM_USRAUTOMAIL_TRUE' => $conf_UAM[32]=='true' ? 'checked="checked"' : '' , 597 'UAM_USRAUTOMAIL_FALSE' => $conf_UAM[32]=='false' ? 'checked="checked"' : '' , 598 'UAM_STUFFS_TRUE' => $conf_UAM[33]=='true' ? 'checked="checked"' : '' , 599 'UAM_STUFFS_FALSE' => $conf_UAM[33]=='false' ? 'checked="checked"' : '' , 600 'UAM_HIDEPASSW_TRUE' => $conf_UAM[34]=='true' ? 'checked="checked"' : '' , 601 'UAM_HIDEPASSW_FALSE' => $conf_UAM[34]=='false' ? 'checked="checked"' : '' , 602 'UAM_NO_VALID_LEVEL' => $conf_UAM[35], 603 'UAM_VALID_LEVEL' => $conf_UAM[36], 604 'UAM_DOWNGRADE_LEVEL' => $conf_UAM[37], 605 'UAM_PWDRESET_TRUE' => $conf_UAM[38]=='true' ? 'checked="checked"' : '' , 606 'UAM_PWDRESET_FALSE' => $conf_UAM[38]=='false' ? 'checked="checked"' : '' , 607 'UAM_REJECTCONNECT_TRUE' => $conf_UAM[39]=='true' ? 'checked="checked"' : '' , 608 'UAM_REJECTCONNECT_FALSE' => $conf_UAM[39]=='false' ? 'checked="checked"' : '' , 609 'UAM_REJECTCONNECT_TEXT' => $conf_UAM[40], 610 'UAM_PASSWORD_TEST_SCORE' => $UAM_Password_Test_Score, 611 'UAM_ERROR_REPORTS1' => $UAM_Exclusionlist_Error, 612 'UAM_ERROR_REPORTS2' => $UAM_Illegal_Flag_Error1, 613 'UAM_ERROR_REPORTS3' => $UAM_Illegal_Flag_Error2, 614 'UAM_ERROR_REPORTS4' => $UAM_Illegal_Flag_Error3, 615 'UAM_EMAIL_MANDATORY' => $UAM_Email_Mandatory_Check, 616 'UAM_CONFIRMMAIL_TIMEOUT_TRUE' => $conf_UAM_ConfirmMail[0]=='true' ? 'checked="checked"' : '' , 617 'UAM_CONFIRMMAIL_TIMEOUT_FALSE' => $conf_UAM_ConfirmMail[0]=='false' ? 'checked="checked"' : '' , 618 'UAM_CONFIRMMAIL_DELAY' => $conf_UAM_ConfirmMail[1], 619 'UAM_CONFIRMMAIL_REMAIL_TRUE' => $conf_UAM_ConfirmMail[3]=='true' ? 'checked="checked"' : '', 620 'UAM_CONFIRMMAIL_REMAIL_FALSE' => $conf_UAM_ConfirmMail[3]=='false' ? 'checked="checked"' : '', 621 'UAM_CONFIRMMAIL_REMAIL_TXT1' => $conf_UAM_ConfirmMail[2], 622 'UAM_CONFIRMMAIL_REMAIL_TXT2' => $conf_UAM_ConfirmMail[4], 623 'UAM_CONFIRMMAIL_CUSTOM_TXT1' => $conf_UAM_ConfirmMail[5], 624 'UAM_CONFIRMMAIL_CUSTOM_TXT2' => $conf_UAM_ConfirmMail[6], 573 'nb_para' => $nb_para, 574 'nb_para2' => $nb_para2, 575 'UAM_VERSION' => $version, 576 'UAM_PATH' => UAM_PATH, 577 'UAM_DUMP_DOWNLOAD' => $dump_download, 578 'UAM_THEME' => $UAM_theme, 579 'UAM_MAIL_INFO_TRUE' => $conf_UAM[0]=='true' ? 'checked="checked"' : '' , 580 'UAM_MAIL_INFO_FALSE' => $conf_UAM[0]=='false' ? 'checked="checked"' : '' , 581 'UAM_MAILINFO_TEXT' => $conf_UAM[8], 582 'UAM_USERNAME_CHAR_TRUE' => $conf_UAM[5]=='true' ? 'checked="checked"' : '' , 583 'UAM_USERNAME_CHAR_FALSE' => $conf_UAM[5]=='false' ? 'checked="checked"' : '' , 584 'UAM_USERNAME_CHAR_LIST' => $conf_UAM[6], 585 'UAM_CONFIRM_MAIL_TRUE' => $conf_UAM[1]=='true' ? 'checked="checked"' : '' , 586 'UAM_CONFIRM_MAIL_FALSE' => $conf_UAM[1]=='false' ? 'checked="checked"' : '' , 587 'UAM_CONFIRM_MAIL_LOCAL' => $conf_UAM[1]=='local' ? 'checked="checked"' : '' , 588 'UAM_CONFIRMMAIL_TEXT' => $conf_UAM[9], 589 'UAM_No_Confirm_Group' => $conf_UAM[2], 590 'UAM_Validated_Group' => $conf_UAM[3], 591 'UAM_No_Confirm_Status' => $conf_UAM[7], 592 'UAM_Validated_Status' => $conf_UAM[4], 593 'UAM_MAILEXCLUSION_TRUE' => $conf_UAM[10]=='true' ? 'checked="checked"' : '' , 594 'UAM_MAILEXCLUSION_FALSE' => $conf_UAM[10]=='false' ? 'checked="checked"' : '' , 595 'UAM_MAILEXCLUSION_LIST' => $conf_UAM[11], 596 'UAM_PASSWORDENF_TRUE' => $conf_UAM[12]=='true' ? 'checked="checked"' : '' , 597 'UAM_PASSWORDENF_FALSE' => $conf_UAM[12]=='false' ? 'checked="checked"' : '' , 598 'UAM_PASSWORD_SCORE' => $conf_UAM[13], 599 'UAM_ADMINPASSWENF_TRUE' => $conf_UAM[14]=='true' ? 'checked="checked"' : '' , 600 'UAM_ADMINPASSWENF_FALSE' => $conf_UAM[14]=='false' ? 'checked="checked"' : '' , 601 'UAM_GHOSTRACKER_TRUE' => $conf_UAM[15]=='true' ? 'checked="checked"' : '' , 602 'UAM_GHOSTRACKER_FALSE' => $conf_UAM[15]=='false' ? 'checked="checked"' : '' , 603 'UAM_GHOSTRACKER_DAYLIMIT' => $conf_UAM[16], 604 'UAM_GHOSTRACKER_REMINDERTEXT' => $conf_UAM[17], 605 'UAM_ADDLASTVISIT_TRUE' => $conf_UAM[18]=='true' ? 'checked="checked"' : '' , 606 'UAM_ADDLASTVISIT_FALSE' => $conf_UAM[18]=='false' ? 'checked="checked"' : '' , 607 'UAM_ADMINCONFMAIL_TRUE' => $conf_UAM[19]=='true' ? 'checked="checked"' : '' , 608 'UAM_ADMINCONFMAIL_FALSE' => $conf_UAM[19]=='false' ? 'checked="checked"' : '' , 609 'UAM_REDIRTOPROFILE_TRUE' => $conf_UAM[20]=='true' ? 'checked="checked"' : '' , 610 'UAM_REDIRTOPROFILE_FALSE' => $conf_UAM[20]=='false' ? 'checked="checked"' : '' , 611 'UAM_GTAUTO_TRUE' => $conf_UAM[21]=='true' ? 'checked="checked"' : '' , 612 'UAM_GTAUTO_FALSE' => $conf_UAM[21]=='false' ? 'checked="checked"' : '' , 613 'UAM_GTAUTOMAIL_TRUE' => $conf_UAM[22]=='true' ? 'checked="checked"' : '' , 614 'UAM_GTAUTOMAIL_FALSE' => $conf_UAM[22]=='false' ? 'checked="checked"' : '' , 615 'UAM_GTAUTODEL_TEXT' => $conf_UAM[23], 616 'UAM_GTAUTOMAILTEXT' => $conf_UAM[24], 617 'UAM_Downgrade_Group' => $conf_UAM[25], 618 'UAM_Downgrade_Status' => $conf_UAM[26], 619 'UAM_ADMINVALIDATIONMAIL_TEXT' => $conf_UAM[27], 620 'UAM_CUSTOMPASSWRETR_TRUE' => $conf_UAM[28]=='true' ? 'checked="checked"' : '' , 621 'UAM_CUSTOMPASSWRETR_FALSE' => $conf_UAM[28]=='false' ? 'checked="checked"' : '' , 622 'UAM_CUSTOMPASSWRETR_TEXT' => $conf_UAM[29], 623 'UAM_USRAUTO_TRUE' => $conf_UAM[30]=='true' ? 'checked="checked"' : '' , 624 'UAM_USRAUTO_FALSE' => $conf_UAM[30]=='false' ? 'checked="checked"' : '' , 625 'UAM_USRAUTODEL_TEXT' => $conf_UAM[31], 626 'UAM_USRAUTOMAIL_TRUE' => $conf_UAM[32]=='true' ? 'checked="checked"' : '' , 627 'UAM_USRAUTOMAIL_FALSE' => $conf_UAM[32]=='false' ? 'checked="checked"' : '' , 628 'UAM_STUFFS_TRUE' => $conf_UAM[33]=='true' ? 'checked="checked"' : '' , 629 'UAM_STUFFS_FALSE' => $conf_UAM[33]=='false' ? 'checked="checked"' : '' , 630 'UAM_HIDEPASSW_TRUE' => $conf_UAM[34]=='true' ? 'checked="checked"' : '' , 631 'UAM_HIDEPASSW_FALSE' => $conf_UAM[34]=='false' ? 'checked="checked"' : '' , 632 'UAM_NO_VALID_LEVEL' => $conf_UAM[35], 633 'UAM_VALID_LEVEL' => $conf_UAM[36], 634 'UAM_DOWNGRADE_LEVEL' => $conf_UAM[37], 635 'UAM_PWDRESET_TRUE' => $conf_UAM[38]=='true' ? 'checked="checked"' : '' , 636 'UAM_PWDRESET_FALSE' => $conf_UAM[38]=='false' ? 'checked="checked"' : '' , 637 'UAM_REJECTCONNECT_TRUE' => $conf_UAM[39]=='true' ? 'checked="checked"' : '' , 638 'UAM_REJECTCONNECT_FALSE' => $conf_UAM[39]=='false' ? 'checked="checked"' : '' , 639 'UAM_REJECTCONNECT_TEXT' => $conf_UAM[40], 640 'UAM_CONFIRMMAIL_SUBJECT' => $conf_UAM[41], 641 'UAM_CONFIRMMAIL_REMAIL_SUBJECT' => $conf_UAM[42], 642 'UAM_INFOMAIL_SUBJECT' => $conf_UAM[43], 643 'UAM_GTAUTOMAIL_SUBJECT' => $conf_UAM[44], 644 'UAM_GTREMINDER_SUBJECT' => $conf_UAM[45], 645 'UAM_ADMINVALIDATIONMAIL_SUBJECT' => $conf_UAM[46], 646 'UAM_PASSWORD_TEST_SCORE' => $UAM_Password_Test_Score, 647 'UAM_ERROR_REPORTS1' => $UAM_Exclusionlist_Error, 648 'UAM_ERROR_REPORTS2' => $UAM_Illegal_Flag_Error1, 649 'UAM_ERROR_REPORTS3' => $UAM_Illegal_Flag_Error2, 650 'UAM_ERROR_REPORTS4' => $UAM_Illegal_Flag_Error3, 651 'UAM_EMAIL_MANDATORY' => $UAM_Email_Mandatory_Check, 652 'UAM_CONFIRMMAIL_TIMEOUT_TRUE' => $conf_UAM_ConfirmMail[0]=='true' ? 'checked="checked"' : '' , 653 'UAM_CONFIRMMAIL_TIMEOUT_FALSE' => $conf_UAM_ConfirmMail[0]=='false' ? 'checked="checked"' : '' , 654 'UAM_CONFIRMMAIL_DELAY' => $conf_UAM_ConfirmMail[1], 655 'UAM_CONFIRMMAIL_REMAIL_TRUE' => $conf_UAM_ConfirmMail[3]=='true' ? 'checked="checked"' : '', 656 'UAM_CONFIRMMAIL_REMAIL_FALSE' => $conf_UAM_ConfirmMail[3]=='false' ? 'checked="checked"' : '', 657 'UAM_CONFIRMMAIL_REMAIL_TXT1' => $conf_UAM_ConfirmMail[2], 658 'UAM_CONFIRMMAIL_REMAIL_TXT2' => $conf_UAM_ConfirmMail[4], 659 'UAM_CONFIRMMAIL_CUSTOM_TXT1' => $conf_UAM_ConfirmMail[5], 660 'UAM_CONFIRMMAIL_CUSTOM_TXT2' => $conf_UAM_ConfirmMail[6], 625 661 ) 626 662 ); -
extensions/UserAdvManager/branches/2.40/admin/template/global.tpl
r13107 r14730 231 231 <fieldset> 232 232 <ul> 233 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p> 233 234 <li> 234 <label class="cluetip" title="{'UAM_AdminValidationMail_Text'|translate}|{'UAM_AdminValidationMail_d'|translate}"> 235 {'UAM_AdminValidationMail_Text'|@translate} 235 <div class="uam_new"> 236 <label class="cluetip" title="{'UAM_AdminValidationMail_Subject'|translate}|{'UAM_AdminValidationMail_Subject_d'|translate}"> 237 {'UAM_AdminValidationMail_Subject'|@translate} 236 238 </label> 237 239 <br><br> 238 <textarea class="uam_textfields" name="UAM_AdminValidationMail_Text" id="UAM_AdminValidationMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_TEXT}</textarea> 239 <br><br> 240 <textarea class="uam_textfields" name="UAM_AdminValidationMail_Subject" id="UAM_AdminValidationMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_SUBJECT}</textarea> 241 <br><br> 242 </div> 240 243 </li> 244 245 <ul> 246 <li> 247 <label class="cluetip" title="{'UAM_AdminValidationMail_Text'|translate}|{'UAM_AdminValidationMail_d'|translate}"> 248 {'UAM_AdminValidationMail_Text'|@translate} 249 </label> 250 <br><br> 251 <textarea class="uam_textfields" name="UAM_AdminValidationMail_Text" id="UAM_AdminValidationMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_TEXT}</textarea> 252 <br><br> 253 </li> 254 </ul> 241 255 </ul> 242 256 243 257 <ul> 258 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p> 244 259 <li> 245 <label class="cluetip" title="{'UAM_ConfirmMail_Text'|translate}|{'UAM_confirmtxtTitle_d'|translate}"> 246 {'UAM_ConfirmMail_Text'|@translate} 260 <div class="uam_new"> 261 <label class="cluetip" title="{'UAM_ConfirmMail_Subject'|translate}|{'UAM_ConfirmMail_Subject_d'|translate}"> 262 {'UAM_ConfirmMail_Subject'|@translate} 247 263 </label> 248 264 <br><br> 249 {if $UAM_ERROR_REPORTS2} 250 <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea> 251 {else} 252 <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea> 253 {/if} 254 <br><br> 265 <textarea class="uam_textfields" name="UAM_ConfirmMail_Subject" id="UAM_ConfirmMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_SUBJECT}</textarea> 266 <br><br> 267 </div> 255 268 </li> 269 270 <ul> 271 <li> 272 <label class="cluetip" title="{'UAM_ConfirmMail_Text'|translate}|{'UAM_confirmtxtTitle_d'|translate}"> 273 {'UAM_ConfirmMail_Text'|@translate} 274 </label> 275 <br><br> 276 {if $UAM_ERROR_REPORTS2} 277 <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea> 278 {else} 279 <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea> 280 {/if} 281 <br><br> 282 </li> 283 </ul> 256 284 <!-- 257 285 {* if 'FCK_PATH'|@defined *} … … 261 289 {* /if *} 262 290 --> 263 291 <br><hr><br> 264 292 <li> 265 293 <label class="cluetip" title="{'UAM_confirmmail_custom_Txt1'|translate}|{'UAM_confirmmail_custom1_d'|translate}"> … … 293 321 294 322 <fieldset> 295 <div class="uam_new">296 323 <ul> 297 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>298 324 <li> 299 325 <label class="cluetip" title="{'UAM_RejectConnexion'|translate}|{'UAM_RejectConnexion_d'|translate}"> … … 328 354 {/if} 329 355 </ul> 330 </div> 331 332 <br> 356 357 <br><hr><br> 333 358 334 359 <ul> … … 460 485 461 486 <ul> 487 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p> 462 488 <li> 463 <label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}"> 464 {'UAM_ConfirmMail_ReMail_Txt1'|@translate} 489 <div class="uam_new"> 490 <label class="cluetip" title="{'UAM_ConfirmMail_ReMail_Subject'|translate}|{'UAM_ConfirmMail_ReMail_Subject_d'|translate}"> 491 {'UAM_ConfirmMail_ReMail_Subject'|@translate} 465 492 </label> 466 493 <br><br> 467 {if $UAM_ERROR_REPORTS3} 494 <textarea class="uam_textfields" name="UAM_ConfirmMail_Remail_Subject" id="UAM_ConfirmMail_Remail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_SUBJECT}</textarea> 495 <br><br> 496 </div> 497 </li> 498 499 <ul> 500 <li> 501 <label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}"> 502 {'UAM_ConfirmMail_ReMail_Txt1'|@translate} 503 </label> 504 <br><br> 505 {if $UAM_ERROR_REPORTS3} 468 506 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea> 469 {else}507 {else} 470 508 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea> 471 {/if}472 <br><br>473 </li>509 {/if} 510 <br><br> 511 </li> 474 512 <!-- 475 513 {* if 'FCK_PATH'|@defined *} … … 480 518 --> 481 519 482 <li>483 <label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">484 {'UAM_ConfirmMail_ReMail_Txt2'|@translate}485 </label>486 <br><br>487 {if $UAM_ERROR_REPORTS4}520 <li> 521 <label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}"> 522 {'UAM_ConfirmMail_ReMail_Txt2'|@translate} 523 </label> 524 <br><br> 525 {if $UAM_ERROR_REPORTS4} 488 526 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea> 489 {else}527 {else} 490 528 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea> 491 {/if}492 <br>493 </li>529 {/if} 530 <br> 531 </li> 494 532 <!-- 495 533 {* if 'FCK_PATH'|@defined *} … … 499 537 {* /if *} 500 538 --> 539 540 </ul> 501 541 </ul> 502 542 </ul> … … 590 630 </li> 591 631 592 <fieldset> 632 <fieldset> 593 633 <ul> 634 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p> 594 635 <li> 595 <label class="cluetip" title="{'UAM_GhostTracker_ReminderText'|translate}|{'UAM_gttextTitle_d'|translate}"> 596 {'UAM_GhostTracker_ReminderText'|@translate} 636 <div class="uam_new"> 637 <label class="cluetip" title="{'UAM_GTReminder_Subject'|translate}|{'UAM_GTReminder_Subject_d'|translate}"> 638 {'UAM_GTReminder_Subject'|@translate} 597 639 </label> 598 640 <br><br> 599 <textarea class="uam_textfields" name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea> 600 <br><br> 641 <textarea class="uam_textfields" name="UAM_GTReminder_Subject" id="UAM_GTReminder_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTREMINDER_SUBJECT}</textarea> 642 <br><br> 643 </div> 601 644 </li> 645 646 <ul> 647 <li> 648 <label class="cluetip" title="{'UAM_GhostTracker_ReminderText'|translate}|{'UAM_gttextTitle_d'|translate}"> 649 {'UAM_GhostTracker_ReminderText'|@translate} 650 </label> 651 <br><br> 652 <textarea class="uam_textfields" name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea> 653 <br><br> 654 </li> 655 </ul> 602 656 <!-- 603 657 {* if 'FCK_PATH'|@defined *} … … 691 745 <input type="radio" value="true" {$UAM_GTAUTOMAIL_TRUE} name="UAM_GTAutoMail"> 692 746 {'UAM_Enable'|@translate} 693 <br><br><br>694 <textarea class="uam_textfields" name="UAM_GTAutoMailText" id="UAM_GTAutoMailText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAILTEXT}</textarea>695 747 <br><br> 748 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p> 749 <li> 750 <div class="uam_new"> 751 <label class="cluetip" title="{'UAM_GTAutomail_Subject'|translate}|{'UAM_GTAutomail_Subject_d'|translate}"> 752 {'UAM_GTAutomail_Subject'|@translate} 753 </label> 754 <br><br> 755 <textarea class="uam_textfields" name="UAM_GTAutoMail_Subject" id="UAM_GTAutoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAIL_SUBJECT}</textarea> 756 <br><br> 757 </div> 758 </li> 759 760 <ul> 761 <li> 762 <label class="cluetip" title="{'UAM_GTAutomail_Text'|translate}|{'UAM_GTAutomail_Text_d'|translate}"> 763 {'UAM_GTAutomail_Text'|@translate} 764 </label> 765 <br><br> 766 <textarea class="uam_textfields" name="UAM_GTAutoMailText" id="UAM_GTAutoMailText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAILTEXT}</textarea> 767 <br><br> 768 </li> 769 </ul> 696 770 </li> 697 771 </ul> … … 748 822 <br><br> 749 823 </li> 750 824 825 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p> 751 826 <li> 752 <label class="cluetip" title="{'UAM_MailInfo_Text'|translate}|{'UAM_infotxtTitle_d'|translate}"> 753 {'UAM_MailInfo_Text'|@translate} 827 <div class="uam_new"> 828 <label class="cluetip" title="{'UAM_MailInfo_Subject'|translate}|{'UAM_MailInfo_Subject_d'|translate}"> 829 {'UAM_MailInfo_Subject'|@translate} 754 830 </label> 755 831 <br><br> 756 <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea> 757 <br><br> 832 <textarea class="uam_textfields" name="UAM_InfoMail_Subject" id="UAM_InfoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_INFOMAIL_SUBJECT}</textarea> 833 <br><br> 834 </div> 758 835 </li> 836 837 <ul> 838 <li> 839 <label class="cluetip" title="{'UAM_MailInfo_Text'|translate}|{'UAM_infotxtTitle_d'|translate}"> 840 {'UAM_MailInfo_Text'|@translate} 841 </label> 842 <br><br> 843 <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea> 844 <br><br> 845 </li> 846 </ul> 759 847 <!-- 760 848 {* if 'FCK_PATH'|@defined *} -
extensions/UserAdvManager/branches/2.40/changelog.txt.php
r14371 r14730 300 300 Bug 2571 fixed - Piwigo 2.4 compliance : Information email removed on user registration because already managed by Piwigo 301 301 Bug 2572 fixed - Adding a local home icon on ConfirmMail, rejected and del_account pages 302 Bug 2591 fixed - Exclu dingAdult_Content generic users from users tracking list302 Bug 2591 fixed - Exclusion of Adult_Content generic users from users tracking list 303 303 Bug 2603 fixed - Php notice when user changes his email in his profile if confirmation by email is set 304 304 Bug 2619 fixed - Confirmation email when registered user changes his email was not sent and user not demoted 305 305 Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved 306 Bug 2621 fixed - Display of ConfirmMail, rejected and del_account pages have been improved for IE8 and IE9 render 307 Bug 2622 fixed - Display of ConfirmMail, rejected and del_account pages have been improved for Stripped theme 308 Bug 2623 fixed - Ability to customize email subjects (confirmation, information and ghostTracker email) 309 Bug 2628 fixed - Php notice when email is not mandatory for registration 310 Bug 2631 fixed - Piwigo 2.4 compliance : $conf['gallery_url'] replaced by get_gallery_home_url() for [myurl] tag 306 311 */ 307 312 ?> -
extensions/UserAdvManager/branches/2.40/include/functions.inc.php
r14366 r14730 856 856 { 857 857 // Management of Extension flags ([mygallery], [myurl]) 858 //$patterns[] = '#\[username\]#i';859 //$replacements[] = stripslashes($row['username']);860 858 $patterns[] = '#\[mygallery\]#i'; 861 859 $replacements[] = $conf['gallery_title']; 862 860 $patterns[] = '#\[myurl\]#i'; 863 $replacements[] = $conf['gallery_url'];861 $replacements[] = get_gallery_home_url(); 864 862 865 863 $infos = preg_replace($patterns, $replacements, $conf_UAM[29])."\n"."\n".$infos; … … 885 883 $infos1_perso = ""; 886 884 $infos2_perso = ""; 885 $subject = ""; 887 886 888 887 // We have to get the user's language in database … … 916 915 { 917 916 case 1: // Confirmation email on user registration - Without information email (already managed by Piwigo) 918 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Add of %s', stripslashes($username))); 917 if (isset($conf_UAM[41]) and $conf_UAM[41] <> '') 918 { 919 // Management of Extension flags ([username], [mygallery]) 920 // ------------------------------------------------------- 921 $patterns[] = '#\[username\]#i'; 922 $replacements[] = $username; 923 $patterns[] = '#\[mygallery\]#i'; 924 $replacements[] = $conf['gallery_title']; 925 926 if (function_exists('get_user_language_desc')) 927 { 928 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[41]))."\n\n"; 929 } 930 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[41]))."\n\n"; 931 } 919 932 920 933 break; 921 934 922 935 case 2: // Confirmation email on user profile update - With information email if checked 923 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Update of %s', stripslashes($username))); 936 if (isset($conf_UAM[41]) and $conf_UAM[41] <> '') 937 { 938 // Management of Extension flags ([username], [mygallery]) 939 // ------------------------------------------------------- 940 $patterns[] = '#\[username\]#i'; 941 $replacements[] = $username; 942 $patterns[] = '#\[mygallery\]#i'; 943 $replacements[] = $conf['gallery_title']; 944 945 if (function_exists('get_user_language_desc')) 946 { 947 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[41]))."\n\n"; 948 } 949 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[41]))."\n\n"; 950 } 951 924 952 $password = $password <> '' ? $password : l10n('UAM_empty_pwd'); 925 953 … … 933 961 $replacements[] = $conf['gallery_title']; 934 962 $patterns[] = '#\[myurl\]#i'; 935 $replacements[] = $conf['gallery_url'];963 $replacements[] = get_gallery_home_url(); 936 964 937 965 if (function_exists('get_user_language_desc')) … … 968 996 969 997 case 3: // Only information email send to user if checked 970 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Update of %s', stripslashes($username))); 998 if (isset($conf_UAM[43]) and $conf_UAM[43] <> '') 999 { 1000 // Management of Extension flags ([username], [mygallery]) 1001 // ------------------------------------------------------- 1002 $patterns[] = '#\[username\]#i'; 1003 $replacements[] = $username; 1004 $patterns[] = '#\[mygallery\]#i'; 1005 $replacements[] = $conf['gallery_title']; 1006 1007 if (function_exists('get_user_language_desc')) 1008 { 1009 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[43]))."\n\n"; 1010 } 1011 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[43]))."\n\n"; 1012 } 1013 971 1014 $password = $password <> '' ? $password : l10n('UAM_no_update_pwd'); 972 1015 … … 980 1023 $replacements[] = $conf['gallery_title']; 981 1024 $patterns[] = '#\[myurl\]#i'; 982 $replacements[] = $conf['gallery_url'];1025 $replacements[] = get_gallery_home_url(); 983 1026 984 1027 if (function_exists('get_user_language_desc')) … … 1032 1075 $replacements[] = $conf['gallery_title']; 1033 1076 $patterns[] = '#\[myurl\]#i'; 1034 $replacements[] = $conf['gallery_url'];1077 $replacements[] = get_gallery_home_url(); 1035 1078 1036 1079 if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'true') // [Kdays] replacement only if related option is active … … 1070 1113 { 1071 1114 global $conf; 1115 1116 $subject = ""; 1072 1117 1073 1118 $conf_UAM = unserialize($conf['UserAdvManager']); … … 1096 1141 { 1097 1142 case 1: //Generating email content for remind with a new key 1098 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Reminder_with_key_of_%s', $username)); 1143 if (isset($conf_UAM[42]) and $conf_UAM[42] <> '') 1144 { 1145 // Management of Extension flags ([username], [mygallery]) 1146 // ------------------------------------------------------- 1147 $patterns[] = '#\[username\]#i'; 1148 $replacements[] = $username; 1149 $patterns[] = '#\[mygallery\]#i'; 1150 $replacements[] = $conf['gallery_title']; 1151 1152 if (function_exists('get_user_language_desc')) 1153 { 1154 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[42]))."\n\n"; 1155 } 1156 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[42]))."\n\n"; 1157 } 1099 1158 1100 1159 if (isset($conf_UAM_ConfirmMail[2]) and $conf_UAM_ConfirmMail[2] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and $confirm) … … 1107 1166 $replacements[] = $conf['gallery_title']; 1108 1167 $patterns[] = '#\[myurl\]#i'; 1109 $replacements[] = $conf['gallery_url'];1168 $replacements[] = get_gallery_home_url(); 1110 1169 1111 1170 if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'true') // [Kdays] replacement only if related option is active … … 1140 1199 1141 1200 case 2: //Generating email content for remind without a new key 1142 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Reminder_without_key_of_%s',$username)); 1201 if (isset($conf_UAM[42]) and $conf_UAM[42] <> '') 1202 { 1203 // Management of Extension flags ([username], [mygallery]) 1204 // ------------------------------------------------------- 1205 $patterns[] = '#\[username\]#i'; 1206 $replacements[] = $username; 1207 $patterns[] = '#\[mygallery\]#i'; 1208 $replacements[] = $conf['gallery_title']; 1209 1210 if (function_exists('get_user_language_desc')) 1211 { 1212 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[42]))."\n\n"; 1213 } 1214 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[42]))."\n\n"; 1215 } 1143 1216 1144 1217 if (isset($conf_UAM_ConfirmMail[4]) and $conf_UAM_ConfirmMail[4] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and !$confirm) … … 1151 1224 $replacements[] = $conf['gallery_title']; 1152 1225 $patterns[] = '#\[myurl\]#i'; 1153 $replacements[] = $conf['gallery_url'];1226 $replacements[] = get_gallery_home_url(); 1154 1227 1155 1228 if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'true') // [Kdays] replacement only if related option is active … … 1200 1273 1201 1274 $conf_UAM = unserialize($conf['UserAdvManager']); 1275 $subject = ""; 1202 1276 1203 1277 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php'); 1204 1205 $infos1_perso = "";1206 1278 1207 1279 // We have to get the user's language in database … … 1220 1292 1221 1293 load_language('plugin.lang', UAM_PATH); 1222 1223 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Ghost_reminder_of_%s', $username)); 1294 1295 if (isset($conf_UAM[45]) and $conf_UAM[45] <> '') 1296 { 1297 // Management of Extension flags ([username], [mygallery]) 1298 // ------------------------------------------------------- 1299 $patterns[] = '#\[username\]#i'; 1300 $replacements[] = $username; 1301 $patterns[] = '#\[mygallery\]#i'; 1302 $replacements[] = $conf['gallery_title']; 1303 1304 if (function_exists('get_user_language_desc')) 1305 { 1306 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[45]))."\n\n"; 1307 } 1308 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[45]))."\n\n"; 1309 } 1224 1310 1225 1311 if (isset($conf_UAM[17]) and $conf_UAM[17] <> '' and isset($conf_UAM[15]) and $conf_UAM[15] == 'true') … … 1232 1318 $replacements[] = $conf['gallery_title']; 1233 1319 $patterns[] = '#\[myurl\]#i'; 1234 $replacements[] = $conf['gallery_url'];1320 $replacements[] = get_gallery_home_url(); 1235 1321 $patterns[] = '#\[days\]#i'; 1236 1322 $replacements[] = $conf_UAM[16]; … … 1274 1360 1275 1361 $custom_txt = ""; 1362 $subject = ""; 1276 1363 1277 1364 // We have to get the user's language in database … … 1302 1389 } 1303 1390 1304 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Demotion of %s', stripslashes($username))); 1391 if (isset($conf_UAM[44]) and $conf_UAM[44] <> '') 1392 { 1393 // Management of Extension flags ([username], [mygallery]) 1394 // ------------------------------------------------------- 1395 $patterns[] = '#\[username\]#i'; 1396 $replacements[] = $username; 1397 $patterns[] = '#\[mygallery\]#i'; 1398 $replacements[] = $conf['gallery_title']; 1399 1400 if (function_exists('get_user_language_desc')) 1401 { 1402 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[44]))."\n\n"; 1403 } 1404 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[44]))."\n\n"; 1405 } 1305 1406 1306 1407 if (isset($conf_UAM[24]) and $conf_UAM[24] <> '') … … 1313 1414 $replacements[] = $conf['gallery_title']; 1314 1415 $patterns[] = '#\[myurl\]#i'; 1315 $replacements[] = $conf['gallery_url'];1416 $replacements[] = get_gallery_home_url(); 1316 1417 1317 1418 if (function_exists('get_user_language_desc')) … … 1364 1465 1365 1466 $custom_txt = ""; 1467 $subject = ""; 1366 1468 1367 1469 // We have to get the user's language in database … … 1401 1503 $result = pwg_db_fetch_assoc(pwg_query($query)); 1402 1504 1403 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Validation of %s', stripslashes($result['username']))); 1505 if (isset($conf_UAM[46]) and $conf_UAM[46] <> '') 1506 { 1507 // Management of Extension flags ([username], [mygallery]) 1508 // ------------------------------------------------------- 1509 $patterns[] = '#\[username\]#i'; 1510 $replacements[] = $username; 1511 $patterns[] = '#\[mygallery\]#i'; 1512 $replacements[] = $conf['gallery_title']; 1513 1514 if (function_exists('get_user_language_desc')) 1515 { 1516 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n"; 1517 } 1518 else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n"; 1519 } 1404 1520 1405 1521 if (isset($conf_UAM[27]) and $conf_UAM[27] <> '') … … 1412 1528 $replacements[] = $conf['gallery_title']; 1413 1529 $patterns[] = '#\[myurl\]#i'; 1414 $replacements[] = $conf['gallery_url'];1530 $replacements[] = get_gallery_home_url(); 1415 1531 1416 1532 if (function_exists('get_user_language_desc')) -
extensions/UserAdvManager/branches/2.40/include/upgradedb.inc.php
r12661 r14730 27 27 /* *************************************** */ 28 28 function UAM_version_update() 29 { 29 { 30 30 // Get current plugin version 31 31 // -------------------------- … … 589 589 conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf)); 590 590 } 591 592 593 /* upgrade from 2.30.x to 2.40.0 */ 594 /* ***************************** */ 595 function upgrade_2300_2400() 596 { 597 global $conf; 598 599 load_language('plugin.lang', UAM_PATH); 600 601 // Upgrading options 602 // ----------------- 603 $query = ' 604 SELECT value 605 FROM '.CONFIG_TABLE.' 606 WHERE param = "UserAdvManager" 607 ;'; 608 609 $result = pwg_query($query); 610 $conf_UAM = pwg_db_fetch_assoc($result); 611 612 $Newconf_UAM = unserialize($conf_UAM['value']); 613 614 $Newconf_UAM[41] = l10n('UAM_Default_ConfirmMail_Subject'); // UAM_CONFIRMMAIL_SUBJECT 615 $Newconf_UAM[42] = l10n('UAM_Default_ConfirmMail_Remail_Subject'); // UAM_CONFIRMMAIL_REMAIL_SUBJECT 616 $Newconf_UAM[43] = l10n('UAM_Default_InfoMail_Subject'); // UAM_INFOMAIL_SUBJECT 617 $Newconf_UAM[44] = l10n('UAM_Default_GTAutoMail_Subject'); // UAM_GTAUTOMAIL_SUBJECT 618 $Newconf_UAM[45] = l10n('UAM_Default_GTReminder_Subject'); // UAM_GTREMINDER_SUBJECT 619 $Newconf_UAM[46] = l10n('UAM_Default_AdminValidationMail_Subject');// UAM_ADMINVALIDATIONMAIL_SUBJECT 620 621 $update_conf = serialize($Newconf_UAM); 622 623 conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf)); 624 } 591 625 ?> -
extensions/UserAdvManager/branches/2.40/language/de_DE/plugin.lang.php
r13825 r14730 337 337 338 338 Dies ist eine Erinnerung, weil eine sehr lange Zeit vergangen, seit Ihrem letzten Besuch auf unserer Galerie [mygallery]. Wenn Sie nicht mehr tun wollen Ihren Zugang Konto verwenden, informieren Sie uns bitte durch eine Beantwortung dieser E-Mail. Ihr Konto wird gel'; 339 $lang['UAM_Default_InfoMail_Txt'] = 'Hallo [username]! Wir danken Ihnen, auf [mygallery] haben registrieren lassen.340 341 Bitte, finden Sie unten Ihre Verbindung Informationen.';339 $lang['UAM_Default_InfoMail_Txt'] = 'Hallo [username]! 340 341 Sie haben wesentliche Veränderungen in Ihrem Profil auf der Galerie [mygallery]. Bitte, finden Sie die neuen Einstellungen:'; 342 342 $lang['UAM_Default_PwdRequest_Txt'] = 'Sie haben ein Passwort-Reset auf unserer Galerie anzubieten. Bitte unten Ihre neue Verbindung Einstellungen zu finden.'; 343 343 $lang['UAM_Default_RejectConnexion_Txt'] = 'Leider müssen Sie nicht Ihre Anmeldung bestätigt noch haben, so können Sie nicht schließen Sie die Galerie jetzt. Bitte überprüfen Sie Ihre E-Mail-Box. Sie sollten eine E-Mail durch die Galerie geschickt, mit einem Link zu Ihrer Bestätigung durchzuführen. Wenn nicht, wenden Sie sich bitte an den Webmaster.'; -
extensions/UserAdvManager/branches/2.40/language/en_UK/help.lang.php
r14366 r14730 153 153 $lang['UAM_GTAutoGpTitle_d'] = 'The automatic change of group, status or privacy level is like a demotion of the accounts involved and working on the same principle as the group, status or privacy level of confirmation (see "Setting confirmations of registration"). Therefore be to define a group, status and / or level demoting access to the gallery. If this has already been defined with the use of registration confirmation function, you can use the same group / status / level.<br><br> 154 154 <b style="color: red;">Important note :</b> If a ghost user still has not heard from after the time limit and despite the automatic notification by email (if enabled), he\'s automatically deleted from the database.'; 155 $lang['UAM_GTAutoMailTitle_d'] = 'When an account is expired (group / status / privacy level change demoting the visitor), an email information can be sent to clarify the reasons for this change and the means to recover the initial access to the gallery.156 <br>To do this, a link to reconfirmation of registration is attached to the email (automatic generation of a new confirmation key).<b style="color: red;">If the user has already been notified, his account is automatically destroyed.</b>157 <br><br>158 Enter the custom text that also explain the reasons for the demotion, to accompany the confirmation link. The custom text is not mandatory but strongly recommended. In fact, your visitors will not appreciate receiving an email containing only a single link without further explanation. ;-)159 <br><br>160 Further customize the content with special inserted tags:<br>161 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br>162 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br>163 - <b style="color: red;">[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options.164 <br><br>165 To use multiple languages, you can use the Extended description plugin\'s tags if it is active.166 <br><br>167 <b style="color: red;">Warning: The use of this function is intimately associated with the confirmation of registration by the user (confirmation by mail) and can not be activated without this option.</b>';168 155 $lang['UAM_GT_MainTitle_d'] = ' 169 - Automatic or manu el management of ghost users<br>156 - Automatic or manual management of ghost users<br> 170 157 - E-mailing<br> 171 158 ... … … 306 293 $lang['UAM_Tracking registered users_d'] = 'This activates a table in the "Tracking registered users" tab where are listed registered users on the gallery with the date of their last visit and time spent (in days) since their last visit. Monitoring is purely informative for the administrator of the gallery.'; 307 294 // --------- End: New or revised $lang ---- from version 2.30.3 295 296 297 // --------- Starting below: New or revised $lang ---- from version 2.40 298 $lang['UAM_AdminValidationMail_Subject_d'] = 'When an administrator or Webmaster of the gallery manually confirm registration pending, a notification email is automatically sent to the user. Enter here your customized manual validation email subject.<br> 299 By default, the field has a generic text in English but you can change it and use the translation tags [lang =?] of the Extended Description plugin if installed. 300 <br><br> 301 The following additional customizations tags are available without using the Extended Description plugin:<br> 302 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 303 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 304 '; 305 $lang['UAM_ConfirmMail_Subject_d'] = 'Enter here your customized registration confirmation email subject.<br> 306 By default, the field has a generic text in English but you can change it and use the translation tags [lang =?] of the Extended Description plugin if installed. 307 <br><br> 308 The following additional customizations tags are available without using the Extended Description plugin:<br> 309 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 310 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 311 '; 312 $lang['UAM_ConfirmMail_ReMail_Subject_d'] = 'Enter here your customized registration confirmation reminder email subject (with or without new key generation).<br> 313 By default, the field has a generic text in English but you can change it and use the translation tags [lang =?] of the Extended Description plugin if installed. 314 <br><br> 315 The following additional customizations tags are available without using the Extended Description plugin:<br> 316 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 317 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 318 '; 319 $lang['UAM_GTReminder_Subject_d'] = 'Enter here your customized manual Ghost Tracker reminder email subject.<br> 320 By default, the field has a generic text in English but you can change it and use the translation tags [lang =?] of the Extended Description plugin if installed. 321 <br><br> 322 The following additional customizations tags are available without using the Extended Description plugin:<br> 323 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 324 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 325 '; 326 $lang['UAM_GTAutomail_Subject_d'] = 'Enter here your customized automatic Ghost Tracker demotion email subject.<br> 327 By default, the field has a generic text in English but you can change it and use the translation tags [lang =?] of the Extended Description plugin if installed. 328 <br><br> 329 The following additional customizations tags are available without using the Extended Description plugin:<br> 330 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 331 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 332 '; 333 $lang['UAM_GTAutoMailTitle_d'] = 'When an account is expired (group / status / privacy level change demoting the visitor), an email information can be sent to clarify the reasons for this change and the means to recover the initial access to the gallery. 334 <br>To do this, a link to reconfirmation of registration is attached to the email (automatic generation of a new confirmation key).<b style="color: red;">If the user has already been notified, his account is automatically destroyed.</b> 335 <br><br> 336 <b style="color: red;">Warning: The use of this function is intimately associated with the confirmation of registration by the user (confirmation by mail) and can not be activated without this option.</b>'; 337 $lang['UAM_GTAutomail_Text_d'] = 'Enter the custom text that also explain the reasons for the demotion, to accompany the confirmation link. The custom text is not mandatory but strongly recommended. In fact, your visitors will not appreciate receiving an email containing only a single link without further explanation. ;-) 338 <br><br> 339 Further customize the content with special inserted tags:<br> 340 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 341 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 342 - <b style="color: red;">[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options. 343 <br><br> 344 To use multiple languages, you can use the Extended description plugin\'s tags if it is active.'; 345 $lang['UAM_MailInfo_Subject_d'] = 'Enter here your customized information email subject.<br> 346 By default, the field has a generic text in English but you can change it and use the translation tags [lang =?] of the Extended Description plugin if installed. 347 <br><br> 348 The following additional customizations tags are available without using the Extended Description plugin:<br> 349 - <b style="color: red;">[username]</b> to automatically insert the name of the destination user of the email.<br> 350 - <b style="color: red;">[mygallery]</b> to insert the title of your gallery.<br> 351 '; 352 // --------- End: New or revised $lang ---- from version 2.40 308 353 ?> -
extensions/UserAdvManager/branches/2.40/language/en_UK/plugin.lang.php
r13825 r14730 235 235 $lang['UAM %d users pwdreseted'] = 'Password renewal required for %d users'; 236 236 $lang['UAM_Error_Using_illegal_Kdays'] = 'Using the [Kdays] tag is allowed only if the deadline for registration confirmation limited is active. Refer to the text field in red to correct the problem.'; 237 $lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].238 239 Please, find find below your connexion information.';237 $lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]! 238 239 You made significant changes in your profile on the gallery [mygallery]. Please, find below your new settings:'; 240 240 $lang['UAM_Default_ConfirmMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery]. 241 241 … … 403 403 $lang['UAM_Tracking confirmations'] = 'Tracking confirmations'; 404 404 // --------- End: New or revised $lang ---- from version 2.30.3 405 406 407 // --------- Starting below: New or revised $lang ---- from version 2.40 408 $lang['UAM_AdminValidationMail_Subject'] = 'Customize manual validation email subject'; 409 $lang['UAM_ConfirmMail_Subject'] = 'Customize registration confirmation email subject'; 410 $lang['UAM_ConfirmMail_ReMail_Subject'] = 'Customize registration confirmation reminder email subject'; 411 $lang['UAM_GTReminder_Subject'] = 'Customize manual Ghost Tracker reminder email subject'; 412 $lang['UAM_GTAutomail_Subject'] = 'Customize automatic Ghost Tracker demotion email subject'; 413 $lang['UAM_GTAutomail_Text'] = 'Customize demotion email text'; 414 $lang['UAM_MailInfo_Subject'] = 'Customize information email subject'; 415 $lang['UAM_Default_ConfirmMail_Subject'] = '[username] registration confirmation on [mygallery]'; 416 $lang['UAM_Default_ConfirmMail_Remail_Subject'] = 'Reminder - [username] registration confirmation on [mygallery]'; 417 $lang['UAM_Default_InfoMail_Subject'] = '[username] - Your registration information on [mygallery]'; 418 $lang['UAM_Default_GTAutoMail_Subject'] = '[username] - Your account has been demoted on [mygallery]'; 419 $lang['UAM_Default_GTReminder_Subject'] = '[username] - A long time passed since your last visit on [mygallery]'; 420 $lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - Registration validated on [mygallery]'; 421 // --------- End: New or revised $lang ---- from version 2.40 405 422 ?> -
extensions/UserAdvManager/branches/2.40/language/fr_FR/help.lang.php
r14366 r14730 185 185 $lang['UAM_GTAutoGpTitle_d'] = 'Le changement automatique de groupe, de statut ou de niveau de confidentialité équivaut à une rétrogradation des comptes concernés et fonctionne sur le même principe que le groupe, le statut ou le niveau de confidentialité à la confirmation (voir "Paramétrage des confirmations d\'inscriptions"). Il conviendra donc de définir un groupe ou un statut et/ou un niveau de confidentialité rétrogradant l\'accès à la galerie. Si cela a déjà été défini avec l\'utilisation de la fonction Confirmation d\'inscription, on peut utiliser ces mêmes groupes / statuts / niveaux.<br><br> 186 186 <b style="color: red;">Point important :</b> Si un utilisateur fantôme n\'a toujours pas donné signe de vie après le délai imparti et malgré la notification automatique par mail (si activée), il est automatiquement supprimé de la base de données.'; 187 $lang['UAM_GTAutoMailTitle_d'] = 'Lorsqu\'un compte est expiré (changement de groupe, de statut ou de niveau de confidentialité rétrogradant le visiteur), un email d\'information peut être envoyé pour préciser les raisons de ce changement et le moyen de recouvrer l\'accès initial à la galerie.188 <br>Pour ce faire, un lien de reconfirmation de l\'inscription est joint à l\'email (génération automatique d\'une nouvelle clé de confirmation).<b style="color: red;">Si l\'utilisateur a déjà été notifié, son compte est automatiquement détruit.</b>189 <br><br>190 Saisissez aussi le texte personnalisé qui expliquera les raisons de la rétrogradation et qui accompagnera le lien de confirmation. Le texte personnalisé n\'est pas obligatoire mais vivement conseillé. En effet, vos visiteurs inscrits n\'apprécieront que moyennement de recevoir un email ne contenant qu\'un simple lien sans plus d\'explications. ;-)191 <br><br>192 Personnalisez encore plus le contenu avec les balises d\'insertion spéciales :<br>193 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br>194 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br>195 - <b style="color: red;">[myurl]</b> pour insérer l\'URL de votre galerie si renseigné dans les options de configuration de Piwigo.196 <br><br>197 Pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.198 <br><br>199 <b style="color: red;">Attention : L\'emploi de cette fonction est intimement lié à l\'option de confirmation d\'inscription par l\'utilisateur (confirmation par mail) et ne peut pas être activée sans cette option.</b>';200 187 $lang['UAM_GT_MainTitle_d'] = ' 201 188 - Gestion automatique ou manuelle des visiteurs fantômes<br> … … 302 289 $lang['UAM_Tracking registered users_d'] = 'Cette option active, dans l\'onglet "Suivi des utilisateurs inscrits", un tableau recensant les utilisateurs inscrits, la date de leur dernière visite et le nombre de jours écoulés depuis leur dernière visite. Il s\'agit d\'un suivi purement informatif pour l\'administrateur de la galerie.'; 303 290 // --------- End: New or revised $lang ---- from version 2.30.3 291 292 293 // --------- Starting below: New or revised $lang ---- from version 2.40 294 $lang['UAM_AdminValidationMail_Subject_d'] = 'Lorsqu\'un administrateur ou un webmestre de la galerie valide manuellement une inscription en attente, un email de notification est automatiquement envoyé à l\'utilisateur concerné. Saisissez ici un sujet personnalisé pour l\'email de validation manuelle.<br> 295 Par défaut, le champ comporte un texte générique en français mais vous pouvez le changer et utiliser les balises de traduction [lang=??] du plugin Extended Description s\'il est installé. 296 <br><br> 297 De plus les balises de personnalisations suivantes sont utilisables sans l\'aide du plugin Extended Description:<br> 298 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 299 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 300 '; 301 $lang['UAM_ConfirmMail_Subject_d'] = 'Saisissez ici un sujet personnalisé pour l\'email de confirmation d\'inscription.<br> 302 Par défaut, le champ comporte un texte générique en français mais vous pouvez le changer et utiliser les balises de traduction [lang=??] du plugin Extended Description s\'il est installé. 303 <br><br> 304 De plus les balises de personnalisations suivantes sont utilisables sans l\'aide du plugin Extended Description:<br> 305 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 306 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 307 '; 308 $lang['UAM_ConfirmMail_ReMail_Subject_d'] = 'Saisissez ici un sujet personnalisé pour l\'email de rappel de confirmation d\'inscription (avec ou sans renouvellement de clé).<br> 309 Par défaut, le champ comporte un texte générique en français mais vous pouvez le changer et utiliser les balises de traduction [lang=??] du plugin Extended Description s\'il est installé. 310 <br><br> 311 De plus les balises de personnalisations suivantes sont utilisables sans l\'aide du plugin Extended Description:<br> 312 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 313 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 314 '; 315 $lang['UAM_GTReminder_Subject_d'] = 'Saisissez ici un sujet personnalisé pour l\'email de rappel du Ghost Tracker.<br> 316 Par défaut, le champ comporte un texte générique en français mais vous pouvez le changer et utiliser les balises de traduction [lang=??] du plugin Extended Description s\'il est installé. 317 <br><br> 318 De plus les balises de personnalisations suivantes sont utilisables sans l\'aide du plugin Extended Description:<br> 319 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 320 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 321 '; 322 $lang['UAM_GTAutomail_Subject_d'] = 'Saisissez ici un sujet personnalisé pour l\'email de rétrogradation automatique du Ghost Tracker.<br> 323 Par défaut, le champ comporte un texte générique en français mais vous pouvez le changer et utiliser les balises de traduction [lang=??] du plugin Extended Description s\'il est installé. 324 <br><br> 325 De plus les balises de personnalisations suivantes sont utilisables sans l\'aide du plugin Extended Description:<br> 326 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 327 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 328 '; 329 $lang['UAM_GTAutoMailTitle_d'] = 'Lorsqu\'un compte est expiré (changement de groupe, de statut ou de niveau de confidentialité rétrogradant le visiteur), un email d\'information peut être envoyé pour préciser les raisons de ce changement et le moyen de recouvrer l\'accès initial à la galerie. 330 <br>Pour ce faire, un lien de reconfirmation de l\'inscription est joint à l\'email (génération automatique d\'une nouvelle clé de confirmation). <b style="color: red;">Si l\'utilisateur a déjà été notifié, son compte est automatiquement détruit.</b> 331 <br><br> 332 <b style="color: red;">Attention : L\'emploi de cette fonction est intimement lié à l\'option de confirmation d\'inscription par l\'utilisateur (confirmation par mail) et ne peut pas être activée sans cette option.</b>'; 333 $lang['UAM_GTAutomail_Text_d'] = 'Saisissez ici le texte personnalisé qui expliquera les raisons de la rétrogradation et qui accompagnera le lien de confirmation. Le texte personnalisé n\'est pas obligatoire mais vivement conseillé. En effet, vos visiteurs inscrits n\'apprécieront que moyennement de recevoir un email ne contenant qu\'un simple lien sans plus d\'explications. ;-) 334 <br><br> 335 Personnalisez encore plus le contenu avec les balises d\'insertion spéciales :<br> 336 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 337 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 338 - <b style="color: red;">[myurl]</b> pour insérer l\'URL de votre galerie si renseigné dans les options de configuration de Piwigo. 339 <br><br> 340 Pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.'; 341 $lang['UAM_MailInfo_Subject_d'] = 'Saisissez ici un sujet personnalisé pour l\'email d\'information.<br> 342 Par défaut, le champ comporte un texte générique en français mais vous pouvez le changer et utiliser les balises de traduction [lang=??] du plugin Extended Description s\'il est installé. 343 <br><br> 344 De plus les balises de personnalisations suivantes sont utilisables sans l\'aide du plugin Extended Description:<br> 345 - <b style="color: red;">[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email.<br> 346 - <b style="color: red;">[mygallery]</b> pour insérer le titre de votre galerie.<br> 347 '; 348 // --------- End: New or revised $lang ---- from version 2.40 304 349 ?> -
extensions/UserAdvManager/branches/2.40/language/fr_FR/plugin.lang.php
r13825 r14730 248 248 $lang['UAM %d users pwdreseted'] = 'Renouvellement de mot de passe demandé pour %d utilisateurs'; 249 249 $lang['UAM_Error_Using_illegal_Kdays'] = 'L\'utilisation de la balise [Kdays] n\'est autorisée que si la limitation du délai de confirmation d\'inscription est active. Reportez vous au champ de texte en rouge pour corriger le problème.'; 250 $lang['UAM_Default_InfoMail_Txt'] = 'Bonjour [username] et merci de vous être inscrit sur la galerie [mygallery].251 252 Vous trouverez ci-dessous vos informations de connexion sur la galerie.';250 $lang['UAM_Default_InfoMail_Txt'] = 'Bonjour [username]! 251 252 Vous avez effectué des modifications importantes de profil sur la galerie [mygallery]. Voici vos nouveaux paramètres :'; 253 253 $lang['UAM_Default_GhstReminder_Txt'] = 'Bonjour [username]. 254 254 … … 408 408 $lang['UAM_Tracking confirmations'] = 'Suivi des confirmations'; 409 409 // --------- End: New or revised $lang ---- from version 2.30.3 410 411 412 // --------- Starting below: New or revised $lang ---- from version 2.40 413 $lang['UAM_AdminValidationMail_Subject'] = 'Personnaliser le sujet de l\'email de validation manuelle'; 414 $lang['UAM_ConfirmMail_Subject'] = 'Personnaliser le sujet de l\'email de confirmation d\'inscription'; 415 $lang['UAM_ConfirmMail_ReMail_Subject'] = 'Personnaliser le sujet de l\'email de rappel de la confirmation d\'inscription'; 416 $lang['UAM_GTReminder_Subject'] = 'Personnaliser le sujet de l\'email de rappel manuel du Ghost Tracker'; 417 $lang['UAM_GTAutomail_Subject'] = 'Personnaliser le sujet de l\'email de rétrogradation automatique du Ghost Tracker'; 418 $lang['UAM_GTAutomail_Text'] = 'Texte de rétrogradation personnalisé'; 419 $lang['UAM_MailInfo_Subject'] = 'Personnaliser le sujet de l\'email d\'information'; 420 $lang['UAM_Default_ConfirmMail_Subject'] = 'Confirmation d\'inscription de [username] sur [mygallery]'; 421 $lang['UAM_Default_ConfirmMail_Remail_Subject'] = 'Rappel - Confirmation d\'inscription de [username] sur [mygallery]'; 422 $lang['UAM_Default_InfoMail_Subject'] = '[username] - Vos paramètres d\'inscription sur [mygallery]'; 423 $lang['UAM_Default_GTAutoMail_Subject'] = '[username] - Rétrogradation de votre compte sur [mygallery]'; 424 $lang['UAM_Default_GTReminder_Subject'] = '[username] - Votre dernière visite sur [mygallery] remonte à longtemps'; 425 $lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - Inscription validée sur [mygallery]'; 426 // --------- End: New or revised $lang ---- from version 2.40 410 427 ?> -
extensions/UserAdvManager/branches/2.40/language/it_IT/plugin.lang.php
r13825 r14730 352 352 Distinti saluti, 353 353 l\'amministratore della galleria [mygallery] - [myurl]'; 354 $lang['UAM_Default_InfoMail_Txt'] = 'Ciao [username]! Grazie per esserti registrato su [mygallery] 355 Qui sotto trovi le informazioni per la connessione'; 354 $lang['UAM_Default_InfoMail_Txt'] = 'Ciao [username]! 355 356 Sono state apportate modifiche significative nel tuo profilo sul gallery [mygallery]. Per favore, di seguito troverete le nuove impostazioni:'; 356 357 $lang['UAM_Default_PwdRequest_Txt'] = 'Hai richiesto il rinnovo della password. Qui sotto trovi i nuovi dati di connessione'; 357 358 $lang['UAM_Default_RejectConnexion_Txt'] = 'Siamo spiacenti, non hai ancora confermato la registrazione, perciò non ti puoi connettere ora alla galleria. Controlla la tua casella mail. Dovresti trovare un email inviata dalla galleria, contenente un link per eseguire la conferma. Se non la trovi, contatta il webmaster.'; -
extensions/UserAdvManager/branches/2.40/maintain.inc.php
r12661 r14730 25 25 // Default global parameters for UserAdvManager conf 26 26 // ------------------------------------------------- 27 $defaultUAM[0] = 'false'; // UAM_MAIL_INFO_TRUE/FALSE 28 $defaultUAM[1] = 'false'; // UAM_CONFIRM_MAIL_TRUE/FALSE 29 $defaultUAM[2] = '-1'; // UAM_No_Confirm_Group 30 $defaultUAM[3] = '-1'; // UAM_Validated_Group 31 $defaultUAM[4] = '-1'; // UAM_Validated_Status 32 $defaultUAM[5] = 'false'; // UAM_USERNAME_CHAR_TRUE 33 $defaultUAM[6] = ''; // UAM_USERNAME_CHAR_LIST 34 $defaultUAM[7] = '-1'; // UAM_No_Confirm_Status 35 $defaultUAM[8] = l10n('UAM_Default_InfoMail_Txt'); // UAM_MAILINFO_TEXT 36 $defaultUAM[9] = l10n('UAM_Default_ConfirmMail_Txt'); // UAM_CONFIRMMAIL_TEXT 37 $defaultUAM[10] = 'false'; // UAM_MAILEXCLUSION_TRUE/FALSE 38 $defaultUAM[11] = ''; // UAM_MAILEXCLUSION_LIST 39 $defaultUAM[12] = 'false'; // UAM_PASSWORDENF_TRUE/FALSE 40 $defaultUAM[13] = '100'; // UAM_PASSWORD_SCORE 41 $defaultUAM[14] = 'false'; // UAM_ADMINPASSWENF_TRUE/FALSE 42 $defaultUAM[15] = 'false'; // UAM_GHOSTRACKER_TRUE/FALSE 43 $defaultUAM[16] = '10'; // UAM_GHOSTRACKER_DAYLIMIT 44 $defaultUAM[17] = l10n('UAM_Default_GhstReminder_Txt'); // UAM_GHOSTRACKER_REMINDERTEXT 45 $defaultUAM[18] = 'false'; // UAM_ADDLASTVISIT_TRUE/FALSE 46 $defaultUAM[19] = 'false'; // UAM_ADMINCONFMAIL_TRUE/FALSE 47 $defaultUAM[20] = 'false'; // UAM_REDIRTOPROFILE_TRUE/FALSE 48 $defaultUAM[21] = 'false'; // UAM_GTAUTO_TRUE/FALSE 49 $defaultUAM[22] = 'false'; // UAM_GTAUTOMAIL_TRUE/FALSE 50 $defaultUAM[23] = l10n('UAM_Default_GhstDeletion_Txt'); // UAM_GTAUTODEL_TEXT 51 $defaultUAM[24] = l10n('UAM_Default_GhstDemotion_Txt'); // UAM_GTAUTOMAILTEXT 52 $defaultUAM[25] = '-1'; // UAM_Downgrade_Group 53 $defaultUAM[26] = '-1'; // UAM_Downgrade_Status 54 $defaultUAM[27] = l10n('UAM_Default_AdminValidation_Txt'); // UAM_ADMINVALIDATIONMAIL_TEXT 55 $defaultUAM[28] = 'false'; // UAM_CUSTOMPASSWRETR_TRUE/FALSE 56 $defaultUAM[29] = l10n('UAM_Default_PwdRequest_Txt'); // UAM_CUSTOMPASSWRETR_TEXT 57 $defaultUAM[30] = 'false'; // UAM_USRAUTO_TRUE/FALSE 58 $defaultUAM[31] = l10n('UAM_Default_ValidationTimeout_Txt');// UAM_USRAUTODEL_TEXT 59 $defaultUAM[32] = 'false'; // UAM_USRAUTOMAIL_TRUE/FALSE 60 $defaultUAM[33] = 'false'; // UAM_STUFFS_TRUE/FALSE 61 $defaultUAM[34] = 'false'; // UAM_HIDEPASSW_TRUE/FALSE 62 $defaultUAM[35] = '-1'; // UAM_NO_VALID_LEVEL 63 $defaultUAM[36] = '-1'; // UAM_VALID_LEVEL 64 $defaultUAM[37] = '-1'; // UAM_DOWNGRADE_LEVEL 65 $defaultUAM[38] = 'false'; // UAM_PWDRESET_TRUE/FALSE 66 $defaultUAM[39] = 'false'; // UAM_REJECTCONNECT_TRUE/FALSE 67 $defaultUAM[40] = l10n('UAM_Default_RejectConnexion_Txt'); // UAM_REJECTCONNECT_TEXT 27 $defaultUAM[0] = 'false'; // UAM_MAIL_INFO_TRUE/FALSE 28 $defaultUAM[1] = 'false'; // UAM_CONFIRM_MAIL_TRUE/FALSE 29 $defaultUAM[2] = '-1'; // UAM_No_Confirm_Group 30 $defaultUAM[3] = '-1'; // UAM_Validated_Group 31 $defaultUAM[4] = '-1'; // UAM_Validated_Status 32 $defaultUAM[5] = 'false'; // UAM_USERNAME_CHAR_TRUE 33 $defaultUAM[6] = ''; // UAM_USERNAME_CHAR_LIST 34 $defaultUAM[7] = '-1'; // UAM_No_Confirm_Status 35 $defaultUAM[8] = l10n('UAM_Default_InfoMail_Txt'); // UAM_MAILINFO_TEXT 36 $defaultUAM[9] = l10n('UAM_Default_ConfirmMail_Txt'); // UAM_CONFIRMMAIL_TEXT 37 $defaultUAM[10] = 'false'; // UAM_MAILEXCLUSION_TRUE/FALSE 38 $defaultUAM[11] = ''; // UAM_MAILEXCLUSION_LIST 39 $defaultUAM[12] = 'false'; // UAM_PASSWORDENF_TRUE/FALSE 40 $defaultUAM[13] = '100'; // UAM_PASSWORD_SCORE 41 $defaultUAM[14] = 'false'; // UAM_ADMINPASSWENF_TRUE/FALSE 42 $defaultUAM[15] = 'false'; // UAM_GHOSTRACKER_TRUE/FALSE 43 $defaultUAM[16] = '10'; // UAM_GHOSTRACKER_DAYLIMIT 44 $defaultUAM[17] = l10n('UAM_Default_GhstReminder_Txt'); // UAM_GHOSTRACKER_REMINDERTEXT 45 $defaultUAM[18] = 'false'; // UAM_ADDLASTVISIT_TRUE/FALSE 46 $defaultUAM[19] = 'false'; // UAM_ADMINCONFMAIL_TRUE/FALSE 47 $defaultUAM[20] = 'false'; // UAM_REDIRTOPROFILE_TRUE/FALSE 48 $defaultUAM[21] = 'false'; // UAM_GTAUTO_TRUE/FALSE 49 $defaultUAM[22] = 'false'; // UAM_GTAUTOMAIL_TRUE/FALSE 50 $defaultUAM[23] = l10n('UAM_Default_GhstDeletion_Txt'); // UAM_GTAUTODEL_TEXT 51 $defaultUAM[24] = l10n('UAM_Default_GhstDemotion_Txt'); // UAM_GTAUTOMAILTEXT 52 $defaultUAM[25] = '-1'; // UAM_Downgrade_Group 53 $defaultUAM[26] = '-1'; // UAM_Downgrade_Status 54 $defaultUAM[27] = l10n('UAM_Default_AdminValidation_Txt'); // UAM_ADMINVALIDATIONMAIL_TEXT 55 $defaultUAM[28] = 'false'; // UAM_CUSTOMPASSWRETR_TRUE/FALSE 56 $defaultUAM[29] = l10n('UAM_Default_PwdRequest_Txt'); // UAM_CUSTOMPASSWRETR_TEXT 57 $defaultUAM[30] = 'false'; // UAM_USRAUTO_TRUE/FALSE 58 $defaultUAM[31] = l10n('UAM_Default_ValidationTimeout_Txt'); // UAM_USRAUTODEL_TEXT 59 $defaultUAM[32] = 'false'; // UAM_USRAUTOMAIL_TRUE/FALSE 60 $defaultUAM[33] = 'false'; // UAM_STUFFS_TRUE/FALSE 61 $defaultUAM[34] = 'false'; // UAM_HIDEPASSW_TRUE/FALSE 62 $defaultUAM[35] = '-1'; // UAM_NO_VALID_LEVEL 63 $defaultUAM[36] = '-1'; // UAM_VALID_LEVEL 64 $defaultUAM[37] = '-1'; // UAM_DOWNGRADE_LEVEL 65 $defaultUAM[38] = 'false'; // UAM_PWDRESET_TRUE/FALSE 66 $defaultUAM[39] = 'false'; // UAM_REJECTCONNECT_TRUE/FALSE 67 $defaultUAM[40] = l10n('UAM_Default_RejectConnexion_Txt'); // UAM_REJECTCONNECT_TEXT 68 $defaultUAM[41] = l10n('UAM_Default_ConfirmMail_Subject'); // UAM_CONFIRMMAIL_SUBJECT 69 $defaultUAM[42] = l10n('UAM_Default_ConfirmMail_Remail_Subject'); // UAM_CONFIRMMAIL_REMAIL_SUBJECT 70 $defaultUAM[43] = l10n('UAM_Default_InfoMail_Subject'); // UAM_INFOMAIL_SUBJECT 71 $defaultUAM[44] = l10n('UAM_Default_GTAutoMail_Subject'); // UAM_GTAUTOMAIL_SUBJECT 72 $defaultUAM[45] = l10n('UAM_Default_GTReminder_Subject'); // UAM_GTREMINDER_SUBJECT 73 $defaultUAM[46] = l10n('UAM_Default_AdminValidationMail_Subject');// UAM_ADMINVALIDATIONMAIL_SUBJECT 68 74 69 75 // Default specific parameters for UserAdvManager ConfirmMail conf … … 366 372 upgrade_2300_2302(); 367 373 } 374 375 if (version_compare($conf['UserAdvManager_Version'], '2.40.0') < 0) 376 { 377 /* upgrade from version 2.30.x to 2.40.0 */ 378 /* ************************************* */ 379 upgrade_2300_2400(); 380 } 368 381 } 369 382 -
extensions/UserAdvManager/branches/2.40/rejected.php
r14371 r14730 28 28 $replacements[] = $conf['gallery_title']; 29 29 $patterns[] = '#\[myurl\]#i'; 30 $replacements[] = $conf['gallery_url'];30 $replacements[] = get_gallery_home_url(); 31 31 32 32 if (function_exists('get_user_language_desc')) … … 42 42 array( 43 43 'UAM_PATH' => $Path_UAM, 44 'GALLERY_URL' => make_index_url(),45 44 'CUSTOM_REJECT_MSG' => $custom_text, 46 45 ) -
extensions/UserAdvManager/branches/2.40/template/ConfirmMail.tpl
r14371 r14730 1 1 {html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head} 2 2 3 {if $themeconf.name|strstr:"stripped"} 3 4 <div class="titrePage"> 4 5 <ul class="categoryActions"> … … 9 10 </a> 10 11 {else} 11 <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 12 <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 13 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 14 </a> 15 {/if} 16 </li> 17 </ul> 18 <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2> 19 </div> 20 {else} 21 <div class="titrePage"> 22 <ul class="categoryActions"> 23 <li> 24 {if $REDIRECT} 25 <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}"> 26 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 27 </a> 28 {else} 29 <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 12 30 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 13 31 </a> … … 17 35 <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2> 18 36 </div> 37 {/if} 19 38 20 39 <ul> -
extensions/UserAdvManager/branches/2.40/template/del_account.tpl
r14371 r14730 1 1 {html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head} 2 2 3 {if $themeconf.name|strstr:"stripped"} 3 4 <div class="titrePage"> 4 5 <ul class="categoryActions"> 5 6 <li> 6 <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 7 <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 8 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 9 </a> 10 </li> 11 </ul> 12 <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2> 13 </div> 14 {else} 15 <div class="titrePage"> 16 <ul class="categoryActions"> 17 <li> 18 <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 7 19 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 8 20 </a> … … 11 23 <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2> 12 24 </div> 25 {/if} 13 26 14 27 <ul> -
extensions/UserAdvManager/branches/2.40/template/rejected.tpl
r14371 r14730 1 1 {html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head} 2 2 3 {if $themeconf.name|strstr:"stripped"} 3 4 <div class="titrePage"> 4 5 <ul class="categoryActions"> 5 6 <li> 6 <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 7 <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 8 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 9 </a> 10 </li> 11 </ul> 12 <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2> 13 </div> 14 {else} 15 <div class="titrePage"> 16 <ul class="categoryActions"> 17 <li> 18 <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 7 19 <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 8 20 </a> … … 11 23 <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2> 12 24 </div> 13 25 {/if} 14 26 <ul> 15 27 <div class="errors">{$CUSTOM_REJECT_MSG}</div>
Note: See TracChangeset
for help on using the changeset viewer.