Changeset 3826 for extensions/NBC_UserAdvManager/trunk
- Timestamp:
- Sep 5, 2009, 11:37:48 PM (15 years ago)
- Location:
- extensions/NBC_UserAdvManager/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php
r3742 r3826 329 329 { 330 330 global $conf, $page; 331 332 $conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array(); 331 332 /* Get ConfirmMail configuration */ 333 $conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array(); 334 335 /* Get UserAdvManager configuration */ 336 $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array(); 333 337 334 338 $users = array(); 335 339 336 /* search users depending on filters and order */ 337 //TODO:Adding condition in request [if user in USER_CONFIRM_MAIL_TABLE] 340 /* search users depending expiration date */ 338 341 $query = ' 339 342 SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id, … … 344 347 ui.enabled_high, 345 348 ui.level, 346 ui.registration_date 349 ui.registration_date, 350 ug.group_id 347 351 FROM '.USERS_TABLE.' AS u 348 INNER JOIN '.USER_INFOS_TABLE.' AS ui 349 ON u.'.$conf['user_fields']['id'].' = ui.user_id 350 LEFT JOIN '.USER_GROUP_TABLE.' AS ug 351 ON u.'.$conf['user_fields']['id'].' = ug.user_id 352 WHERE u.'.$conf['user_fields']['id'].' > 0 353 AND TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= '.$conf_nbc_UserAdvManager_ConfirmMail[1].' 354 ORDER BY id ASC 352 INNER JOIN '.USER_INFOS_TABLE.' AS ui 353 ON u.'.$conf['user_fields']['id'].' = ui.user_id 354 INNER JOIN '.USER_GROUP_TABLE.' AS ug 355 ON u.'.$conf['user_fields']['id'].' = ug.user_id 356 WHERE u.'.$conf['user_fields']['id'].' >= 0 357 AND ug.group_id = "'.$conf_nbc_UserAdvManager[3].'" 358 AND TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) <= "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'" 359 ORDER BY id ASC 355 360 ;'; 356 361 -
extensions/NBC_UserAdvManager/trunk/admin/confirmmail.tpl
r3742 r3826 10 10 <legend>{'ConfirmMail_Title'|@translate}</legend> 11 11 <ul> 12 <li><label>{'UserAdvManager_ConfirmMail_Info'|@translate}</label><br />13 <input type="radio" value="true" {$UserAdvManager_CONFIRMMAIL_TIMEOUT_TRUE} name="UserAdvManager_ConfirmMail_TimeOut"/> {'UserAdvManager_ConfirmMail_TimeOut_true'|@translate}<br />14 <input type="radio" value="false" {$UserAdvManager_CONFIRMMAIL_TIMEOUT_FALSE} name="UserAdvManager_ConfirmMail_TimeOut"/> {'UserAdvManager_ConfirmMail_TimeOut_false'|@translate}<br />12 <li><label>{'UserAdvManager_ConfirmMail_Info'|@translate}</label><br> 13 <input type="radio" value="true" {$UserAdvManager_CONFIRMMAIL_TIMEOUT_TRUE} name="UserAdvManager_ConfirmMail_TimeOut"/> {'UserAdvManager_ConfirmMail_TimeOut_true'|@translate}<br> 14 <input type="radio" value="false" {$UserAdvManager_CONFIRMMAIL_TIMEOUT_FALSE} name="UserAdvManager_ConfirmMail_TimeOut"/> {'UserAdvManager_ConfirmMail_TimeOut_false'|@translate}<br> 15 15 </li> 16 <br />17 <li><label>{'UserAdvManager_ConfirmMail_Delay_Info'|@translate}</label><input type="text" name="UserAdvManager_ConfirmMail_Delay" value="{$UserAdvManager_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"/><br />16 <br> 17 <li><label>{'UserAdvManager_ConfirmMail_Delay_Info'|@translate}</label><input type="text" name="UserAdvManager_ConfirmMail_Delay" value="{$UserAdvManager_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"/><br> 18 18 </li> 19 <!--TODO:Adding new option [Auto_Deletion : True | False]--> 20 <!--TODO:Adding new option [Resend_new_validation_key : True | False]--> 21 <br/> 19 <br> 20 <li><label>{'UserAdvManager_ConfirmMail_AutoDel'|@translate}</label><br> 21 <input type="radio" value="true" {$UserAdvManager_CONFIRMMAIL_AUTODEL_TRUE} name="UserAdvManager_ConfirmMail_AutoDel"/> {'UserAdvManager_ConfirmMail_AutoDel_true'|@translate}<br> 22 <input type="radio" value="false" {$UserAdvManager_CONFIRMMAIL_AUTODEL_FALSE} name="UserAdvManager_ConfirmMail_AutoDel"/> {'UserAdvManager_ConfirmMail_AutoDel_false'|@translate}<br> 23 </li> 24 <br> 25 <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt'|@translate}</label><br> 26 <textarea name="UserAdvManager_ConfirmMail_ReMail_Txt" id="UserAdvManager_ConfirmMail_ReMail_Txt" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT}</textarea> 27 </li> 28 <br> 22 29 </ul> 23 <div align="center"><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} /></div> 30 <p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} /></p> 31 <br><hr><br> 24 32 <ul> 25 <br/> 33 <li><label>{'UserAdvManager_ConfirmMail_User_List'|@translate}</label><br> 34 </li> 35 <br> 26 36 <table class="table2" width="97%"> 27 37 <thead> … … 32 42 <td>{'Email address'|@translate}</td> 33 43 <td>{'Groups'|@translate}</td> 34 < td>{'UserAdvManager_Indiv_Suppr'|@translate}</td>44 <!--<td>{'UserAdvManager_Indiv_Suppr'|@translate}</td>--> 35 45 </tr> 36 46 </thead> … … 47 57 <td>{$data}</td> 48 58 {/foreach} 49 <td style="text-align:center;">50 <!-- TODO:Changing ACTION to Single_Deletion-->51 < a href="{$user.U_ACTION}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}" /></a>52 < /td>59 <!--Unaffected column - Can be used in the future --> 60 <!--<td style="text-align:center;">--> 61 <!--<a href="{$user.U_ACTION}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}" /></a>--> 62 <!--</td>--> 53 63 </tr> 54 64 {/foreach} … … 56 66 <br/> 57 67 </ul> 58 <div align="center"><input class="submit" type="submit" value="{'audit'|@translate}" name="audit" /> <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} /></div> 68 69 <p> 70 {'target'|@translate} 71 <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label> 72 <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label> 73 </p> 74 75 <p> 76 <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset" /> 77 <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} /> 78 </p> 59 79 </fieldset> 60 80 </form> -
extensions/NBC_UserAdvManager/trunk/include/functions_UserAdvManager.inc.php
r3742 r3826 1 1 <?php 2 2 include_once (NBC_UserAdvManager_PATH.'include/constants.php'); 3 include_once (NBC_UserAdvManager_PATH.'include/functions_UserAdvManager.inc.php');4 3 load_language('plugin.lang', NBC_UserAdvManager_PATH); 5 4 … … 64 63 'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 65 64 )); 66 } 67 65 66 /* ********************** */ 67 /* Email sending debugger */ 68 /* This is only to trace */ 69 /* the send of emails for */ 70 /* debugging */ 71 /* ********************** */ 72 MailLog($email,$subject); 73 /* ********************** */ 74 75 } 76 77 /* Email sending debugger function */ 78 function MailLog ($to, $subject) 79 { 80 $fo=fopen (NBC_UserAdvManager_PATH.'admin/maillog.txt','a') ; 81 fwrite($fo,"======================\n") ; 82 fwrite($fo,'le ' . date('D, d M Y H:i:s') . "\r\n"); 83 fwrite($fo,$to . "\n" . $subject . "\r\n") ; 84 fclose($fo) ; 85 //return mail ($to,$subject) ; 86 } 68 87 69 88 -
extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php
r3742 r3826 71 71 $lang['UserAdvManager_no_update_pwd'] = '[mise à jour du profil sans changement du mot de passe]'; 72 72 73 $lang['ConfirmMail_Title'] = 'Configuration avancée de la confirmation par mail';73 $lang['ConfirmMail_Title'] = 'Configuration et gestion avancée de la confirmation par mail'; 74 74 $lang['Err_ConfirmMail_Settings'] = 'Cette page n\'est accessible que si "Confirmation de l\'adresse email" est actif dans l\'onglet "Configuration Générale".'; 75 75 $lang['Title_Tab2'] = 'UserAdvManager - Configuration de ConfirmMail'; … … 82 82 $lang['UserAdvManager_ConfirmMail_TimeOut'] = 'Délai d\activation :'; 83 83 $lang['UserAdvManager_ConfirmMail_Delay_Info'] = 'Saisissez ici le nombre de jours avant expiration de la validation d\'inscription : '; 84 $lang['UserAdvManager_ConfirmMail_AutoDel'] = 'Suppression automatique des comptes non validés après le délai d\'expiration : '; 85 $lang['UserAdvManager_ConfirmMail_AutoDel_true'] = 'Activer la suppression automatique - <blink><b><u>ATTENTION !</u></b></blink> La suppression est aveugle et sans notification.'; 86 $lang['UserAdvManager_ConfirmMail_AutoDel_false'] = 'Désactiver la suppression automatique.'; 87 $lang['UserAdvManager_ConfirmMail_ReMail_Txt'] = 'Contenu personnalisé du message de relance.<br>Si laissé vide, le contenu standard, identique à celui envoyé lors d\'une inscription, est utilisé.'; 88 $lang['UserAdvManager_ConfirmMail_User_List'] = 'Lorsque la limitation du délai d\'inscription est activée, vous trouverez ci-dessous la liste des utilisateurs en attente de validation d\'inscription <b><u>et qui sont encore</u></b> dans les délais pour la valider.<br><br>Dans cette vue, vous pouvez :<br><br> 89 - Supprimer manuellement les comptes avant qu\'ils n\'atteignent la date d\'expiration (purge manuelle)<br> 90 - Générer l\'email de relance sans génération d\'une nouvelle clef (rappel pour le visiteur qu\'il doit valider son inscription - Cette fonction ne réinitialise pas la date d\'inscription du visiteur ciblé et le délai d\'expiration est toujours d\'actualité)<br> 91 - Générer l\'email de relance avec génération d\'une nouvelle clef (rappel pour le visiteur qu\'il doit valider son inscription - Cette fonction réinitialise également la date d\'inscription du visiteur ciblé ce qui équivaut à prolonger le délai de validation)<br>'; 84 92 85 93 $lang['UserAdvManager_Indiv_Suppr'] = 'Suppression individuelle'; -
extensions/NBC_UserAdvManager/trunk/main.inc.php
r3775 r3826 304 304 $errors[] = l10n('maxheight_error'); 305 305 } 306 // periods must be integer values, they represents number of days307 /* Commented to fix compatibility problem with Dynamic Recent Period Plugin */308 /* This don't impact the plugin functionnalities */309 /*if (!preg_match($int_pattern, $_POST['recent_period'])310 or $_POST['recent_period'] <= 0)311 {312 $errors[] = l10n('periods_error') ;313 }*/314 306 315 307 if (isset($_POST['mail_address'])) … … 409 401 } 410 402 411 add_event_handler('loc_begin_tpl_parse', 'ChangeRegisterProfilePage');412 413 function ChangeRegisterProfilePage()414 {415 global $conf, $template;416 417 $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();418 419 /* creation OU mise a jour de user */420 // if (in_array(script_basename(), array('register', 'profile')))421 // {422 //if (isset($conf_UserAdvManager[1]) and $conf_UserAdvManager[1] == 'true' )423 //{424 // $template->set_filenames( array('register'=>'register.tpl') );425 426 // $template->loadfile('register');427 428 // $template->uncompiled_code['register'] = str_replace('{lang:Mail address}', '* {lang:Mail address}', $template->uncompiled_code['register']);429 //}430 // }431 }432 433 403 add_event_handler('user_comment_check', 'UserAdvManager_CheckEmptyCommentAuthor', 50, 2); 434 404
Note: See TracChangeset
for help on using the changeset viewer.