Changeset 18158
- Timestamp:
- Sep 22, 2012, 5:28:48 PM (12 years ago)
- Location:
- extensions/UserAdvManager/trunk
- Files:
-
- 4 edited
-
admin/template/global.tpl (modified) (12 diffs)
-
include/functions.inc.php (modified) (1 diff)
-
language/en_UK/help.lang.php (modified) (1 diff)
-
language/fr_FR/help.lang.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/trunk/admin/template/global.tpl
r14729 r18158 231 231 <fieldset> 232 232 <ul> 233 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>234 233 <li> 235 <div class="uam_new">236 234 <label class="cluetip" title="{'UAM_AdminValidationMail_Subject'|translate}|{'UAM_AdminValidationMail_Subject_d'|translate}"> 237 235 {'UAM_AdminValidationMail_Subject'|@translate} … … 240 238 <textarea class="uam_textfields" name="UAM_AdminValidationMail_Subject" id="UAM_AdminValidationMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_SUBJECT}</textarea> 241 239 <br><br> 242 </div>243 240 </li> 244 241 … … 256 253 257 254 <ul> 258 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>259 255 <li> 260 <div class="uam_new">261 256 <label class="cluetip" title="{'UAM_ConfirmMail_Subject'|translate}|{'UAM_ConfirmMail_Subject_d'|translate}"> 262 257 {'UAM_ConfirmMail_Subject'|@translate} … … 265 260 <textarea class="uam_textfields" name="UAM_ConfirmMail_Subject" id="UAM_ConfirmMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_SUBJECT}</textarea> 266 261 <br><br> 267 </div>268 262 </li> 269 263 … … 485 479 486 480 <ul> 487 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>488 481 <li> 489 <div class="uam_new">490 482 <label class="cluetip" title="{'UAM_ConfirmMail_ReMail_Subject'|translate}|{'UAM_ConfirmMail_ReMail_Subject_d'|translate}"> 491 483 {'UAM_ConfirmMail_ReMail_Subject'|@translate} … … 494 486 <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 487 <br><br> 496 </div>497 488 </li> 498 489 … … 632 623 <fieldset> 633 624 <ul> 634 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>635 625 <li> 636 <div class="uam_new">637 626 <label class="cluetip" title="{'UAM_GTReminder_Subject'|translate}|{'UAM_GTReminder_Subject_d'|translate}"> 638 627 {'UAM_GTReminder_Subject'|@translate} … … 641 630 <textarea class="uam_textfields" name="UAM_GTReminder_Subject" id="UAM_GTReminder_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTREMINDER_SUBJECT}</textarea> 642 631 <br><br> 643 </div>644 632 </li> 645 633 … … 746 734 {'UAM_Enable'|@translate} 747 735 <br><br> 748 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>749 736 <li> 750 <div class="uam_new">751 737 <label class="cluetip" title="{'UAM_GTAutomail_Subject'|translate}|{'UAM_GTAutomail_Subject_d'|translate}"> 752 738 {'UAM_GTAutomail_Subject'|@translate} … … 755 741 <textarea class="uam_textfields" name="UAM_GTAutoMail_Subject" id="UAM_GTAutoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAIL_SUBJECT}</textarea> 756 742 <br><br> 757 </div>758 743 </li> 759 744 … … 823 808 </li> 824 809 825 <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>826 810 <li> 827 <div class="uam_new">828 811 <label class="cluetip" title="{'UAM_MailInfo_Subject'|translate}|{'UAM_MailInfo_Subject_d'|translate}"> 829 812 {'UAM_MailInfo_Subject'|@translate} … … 832 815 <textarea class="uam_textfields" name="UAM_InfoMail_Subject" id="UAM_InfoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_INFOMAIL_SUBJECT}</textarea> 833 816 <br><br> 834 </div>835 817 </li> 836 818 -
extensions/UserAdvManager/trunk/include/functions.inc.php
r18152 r18158 2367 2367 for ($i = 0 ; $i < count($conf_CharExclusion) ; $i++) 2368 2368 { 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2369 //Detect meta-characters (# ! ^ $ ( ) [ ] { } ? + * . \ -) for special pattern 2370 if ($conf_CharExclusion[$i] == "#" 2371 or $conf_CharExclusion[$i] == "$" 2372 or $conf_CharExclusion[$i] == "!" 2373 or $conf_CharExclusion[$i] == "^" 2374 or $conf_CharExclusion[$i] == "*" 2375 or $conf_CharExclusion[$i] == "?" 2376 or $conf_CharExclusion[$i] == "+" 2377 or $conf_CharExclusion[$i] == "." 2378 or $conf_CharExclusion[$i] == "\\" 2379 or $conf_CharExclusion[$i] == "|" 2380 or $conf_CharExclusion[$i] == "[" 2381 or $conf_CharExclusion[$i] == "]" 2382 or $conf_CharExclusion[$i] == "(" 2383 or $conf_CharExclusion[$i] == ")" 2384 or $conf_CharExclusion[$i] == "{" 2385 or $conf_CharExclusion[$i] == "}" 2386 or $conf_CharExclusion[$i] == "-") 2387 { 2388 $pattern = '/[][^$.\*+?(){}#|-]/i'; 2389 } 2390 else 2391 { 2392 $pattern = '/'.$conf_CharExclusion[$i].'/i'; 2393 } 2394 2394 2395 2395 if (preg_match($pattern, $login)) -
extensions/UserAdvManager/trunk/language/en_UK/help.lang.php
r14729 r18158 219 219 <br><br> 220 220 <b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.'; 221 $lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br> 222 In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the "Tracking confirmations" tab.<br><br> 223 In second case, <b><u>there is no confirmation key send by email!</u></b>. Visitors have to wait until an administrator confirm them himself in "confirmation tracking" tab. It\s recommanded to activate the Piwigo\'s option "Email admins when a new user registers" (see in Piwigo\'s configuration options) and to use the "Information email to user" to warn new registers to wait on their account activation. 221 $lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or administrators to manually activate the registration. 222 <br><br> 223 In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the "Tracking confirmations" tab. 224 <br><br> 225 In second case, the validation link is send to the gallery administrators. Visitors have to wait until an administrator confirm them himself by using the validation link or in "confirmation tracking" tab. 224 226 <br> 225 227 <b style="color: red;">NB: Options "Deadline for confirmation of registration limited" and "Remind unconfirmed users " have to be set to off when admin\'s manual confirmation is enabled.</b> -
extensions/UserAdvManager/trunk/language/fr_FR/help.lang.php
r14729 r18158 249 249 Dans le premier cas, le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet "Suivi des confirmations"), et une partie personnalisable par un texte d\'accueil. 250 250 <br><br> 251 Dans le second cas, <b><u>il n\'y a pas d\'envoi de clé de confirmation par email</u></b>. Les visiteurs doivent patienter que l\'administrateur valide lui même leur inscription via l\'onglet "Suivi des confirmations". Il est conseillé d\'activer la notification des administrateurs lors des inscriptions (voir la configuration des options de Piwigo) et d\'utiliser la fonction "Email d\'information à l\'utilisateur" pour avertir les nouveaux inscrits de la nécessité de patienter avant activation de leur compte.251 Dans le second cas, l\'email avec lien de validation est envoyé aux administrateurs de la galerie. Les visiteurs doivent patienter qu\'un administrateur valide lui même leur inscription soit par ce lien, soit par l\'onglet "Suivi des confirmations". 252 252 <br> 253 253 <b style="color: red;">NB: Les options "Limitation du délai de confirmation d\'inscription" et "Mail de rappel aux inscrits non confirmés" doivent être désactivées lorsque la confirmation manuelle est active.</b>
Note: See TracChangeset
for help on using the changeset viewer.
