Changeset 6787 for extensions/NBC_UserAdvManager
- Timestamp:
- Aug 21, 2010, 10:51:00 PM (14 years ago)
- Location:
- extensions/NBC_UserAdvManager/branches/2.15
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/NBC_UserAdvManager/branches/2.15/ConfirmMail.php
r6776 r6787 8 8 include_once (UAM_PATH.'include/functions.inc.php'); 9 9 10 // +-----------------------------------------------------------------------+11 // | Check Access and exit when user status is not ok |12 // +-----------------------------------------------------------------------+13 //check_status(ACCESS_NONE);14 load_language('plugin.lang', UAM_PATH);15 16 10 $title= l10n('confirm_mail_page_title'); 17 11 $page['body_id'] = 'theAboutPage'; … … 22 16 23 17 24 if (isset($_GET['key']) )18 if (isset($_GET['key']) and isset($_GET['userid'])) 25 19 { 26 20 27 global $conf; 21 global $user, $lang, $conf, $errors; 22 23 $key = $_GET['key']; 24 $userid = $_GET['userid']; 25 $redirect = false; 28 26 29 27 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 28 $conf_UAM = unserialize($conf['UserAdvManager']); 30 29 31 if (VerifyConfirmMail($ _GET['key']))30 if (VerifyConfirmMail($key)) 32 31 { 33 32 $status = true; 34 33 34 log_user($userid, false); 35 36 /* We have to get the user's language in database */ 37 $query = ' 38 SELECT '.USER_INFOS_TABLE.'.language 39 FROM '.USER_INFOS_TABLE.','.USER_CONFIRM_MAIL_TABLE.' 40 WHERE (('.USER_INFOS_TABLE.'.user_id ='.$userid.') AND ('.USER_INFOS_TABLE.'.user_id = '.USER_CONFIRM_MAIL_TABLE.'.user_id)) 41 ;'; 42 $data = pwg_db_fetch_assoc(pwg_query($query)); 43 44 /* Check if user is already registered (profile changing) - If not (new registration), language is set to current gallery language */ 45 if (empty($data)) 46 { 47 /* And switch gallery to this language before using personalized and multilangual contents */ 48 $language = pwg_get_session_var('lang_switch', $user['language']); 49 switch_lang_to($language); 50 } 51 else 52 { 53 /* And switch gallery to this language before using personalized and multilangual contents */ 54 switch_lang_to($data['language']); 55 load_language('plugin.lang', UAM_PATH); 56 } 57 58 if (function_exists('get_user_language_desc')) 59 { 60 $custom_text = get_user_language_desc($conf_UAM_ConfirmMail[5]); 61 } 62 else $custom_text = l10n($conf_UAM_ConfirmMail[5]); 63 64 if (isset($conf_UAM[21]) and $conf_UAM[21] == 'true') 65 { 66 $user_idsOK = array(); 67 if (!check_consult($userid, $user_idsOK)) 68 { 69 $redirect = true; 70 } 71 } 72 35 73 $template->assign( 36 74 array( 75 'REDIRECT' => $redirect, 37 76 'STATUS' => $status, 38 'CONFIRM_MAIL_MESSAGE' => $c onf_UAM_ConfirmMail[5],77 'CONFIRM_MAIL_MESSAGE' => $custom_text, 39 78 ) 40 79 ); … … 43 82 { 44 83 $status = false; 84 if (function_exists('get_user_language_desc')) 85 { 86 $custom_text = get_user_language_desc($conf_UAM_ConfirmMail[6]); 87 } 88 else $custom_text = l10n($conf_UAM_ConfirmMail[6]); 89 45 90 $template->assign( 46 91 array( 92 'REDIRECT' => $redirect, 47 93 'STATUS' => $status, 48 'CONFIRM_MAIL_MESSAGE' => $c onf_UAM_ConfirmMail[6],94 'CONFIRM_MAIL_MESSAGE' => $custom_text, 49 95 ) 50 96 ); … … 60 106 61 107 if ( isset($conf['gallery_url']) ) 62 108 { 63 109 $template->assign( 64 110 array( -
extensions/NBC_UserAdvManager/branches/2.15/admin/UAM_admin.php
r6776 r6787 370 370 while($row = pwg_db_fetch_assoc($result)) 371 371 { 372 $msg_error1 .= (($msg_error1 <> '') ? '<br />' : '') . l10n('Err_audit_no_casse').stripslashes($row['username']);372 $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_no_casse').stripslashes($row['username']); 373 373 } 374 374 } … … 389 389 { 390 390 if (!ValidateUsername(stripslashes($row['username']))) 391 $msg_error2 .= (($msg_error2 <> '') ? '<br />' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);391 $msg_error2 .= (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']); 392 392 } 393 393 } … … 413 413 if (preg_match($pattern, $row['mail_address'])) 414 414 { 415 $msg_error3 .= (($msg_error3 <> '') ? '<br />' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';415 $msg_error3 .= (($msg_error3 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')'; 416 416 } 417 417 } … … 420 420 421 421 if ($msg_error1 <> '') 422 $errors[] = $msg_error1.'<br /><br/>';422 $errors[] = $msg_error1.'<br><br>'; 423 423 424 424 if ($msg_error2 <> '') 425 $errors[] = $msg_error2.'<br /><br/>';425 $errors[] = $msg_error2.'<br><br>'; 426 426 427 427 if ($msg_error3 <> '') 428 $errors[] = $msg_error3.'<br /><br/>';428 $errors[] = $msg_error3.'<br><br>'; 429 429 430 430 if ($msg_error1 <> '' or $msg_error2 <> '' or $msg_error3 <> '') -
extensions/NBC_UserAdvManager/branches/2.15/admin/template/ghosttracker.tpl
r6776 r6787 19 19 {ldelim} 20 20 $("#sorting") 21 .tablesorter({ldelim}sortList:[[ 3,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})21 .tablesorter({ldelim}sortList:[[4,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim}) 22 22 .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim}); 23 23 {rdelim} … … 47 47 <th> </th> 48 48 <th>{'Username'|@translate}</th> 49 <th>{'Profile'|@translate}</th> 49 50 <th>{'Email address'|@translate}</th> 50 51 <th>{'LastVisit_Date'|@translate}</th> … … 57 58 <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td> 58 59 <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td> 60 <td style="text-align:center;"><a href="./admin.php?page=profile&user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td> 59 61 <td>{$user.EMAIL}</td> 60 62 {if $user.REMINDER == l10n('Reminder_Sent_NOK')} -
extensions/NBC_UserAdvManager/branches/2.15/admin/template/global.tpl
r6776 r6787 132 132 {if $UAM_ERROR_REPORTS4} 133 133 <div id="uam_leftmargin"> 134 <textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>134 <textarea class="uam_textfields" name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea> 135 135 </div> 136 136 <br><br> 137 137 {else} 138 138 <div id="uam_leftmargin"> 139 <textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>139 <textarea class="uam_textfields" name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea> 140 140 </div> 141 141 <br><br> … … 143 143 {else} 144 144 <div id="uam_leftmargin"> 145 <textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>145 <textarea class="uam_textfields" name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea> 146 146 </div> 147 147 <br><br> … … 185 185 </label> 186 186 <br><br> 187 <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>187 <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea> 188 188 <br><br> 189 189 </li> … … 194 194 </label> 195 195 <br><br> 196 <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>196 <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea> 197 197 <br><br> 198 198 </li> … … 240 240 </label> 241 241 <br><br> 242 <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea>242 <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea> 243 243 <br><br> 244 244 </li> … … 249 249 </label> 250 250 <br><br> 251 <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea>251 <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea> 252 252 <br><br> 253 253 </li> … … 266 266 </label> 267 267 <br><br> 268 <textarea name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea>268 <textarea class="uam_textfields" name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea> 269 269 <br><br> 270 270 </li> … … 280 280 </label> 281 281 <br><br> 282 <textarea name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea>282 <textarea class="uam_textfields" name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea> 283 283 <br><br> 284 284 </li> … … 294 294 </label> 295 295 <br><br> 296 <textarea name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea>296 <textarea class="uam_textfields" name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea> 297 297 <br><br> 298 298 </li> … … 303 303 </label> 304 304 <br><br> 305 <textarea name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea>305 <textarea class="uam_textfields" name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea> 306 306 <br><br> 307 307 </li> … … 403 403 </label> 404 404 <br><br> 405 <textarea name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea>405 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea> 406 406 <br><br> 407 407 </li> … … 412 412 </label> 413 413 <br><br> 414 <textarea name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" readonly{$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea>414 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" readonly{$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea> 415 415 <br><br> 416 416 </li> … … 430 430 </label> 431 431 <br><br> 432 <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>432 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br> 433 433 </li> 434 434 {else} … … 438 438 </label> 439 439 <br><br> 440 <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea>440 <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea> 441 441 <br><br> 442 442 </li> … … 473 473 {if $UAM_GHOSTRACKER_TRUE} 474 474 <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br> 475 <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>475 <textarea class="uam_textfields" name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br> 476 476 </li> 477 477 {else} 478 478 <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br> 479 <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>479 <textarea class="uam_textfields" name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" readonly {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br> 480 480 </li> 481 481 {/if} -
extensions/NBC_UserAdvManager/branches/2.15/admin/template/uam.css
r6776 r6787 1 label.cluetip 2 { 3 font-weight:bold; 4 } 5 6 legend.cluetip 7 { 8 font-weight:bold; 9 } 10 1 /* UAM instructions */ 11 2 #uam_leftmargin 12 3 { … … 18 9 text-align:center; 19 10 text-decoration: underline; 11 font-weight:bold; 12 } 13 14 textarea.uam_textfields 15 { 16 width: 70%; 17 } 18 19 /* jQuery cluetip instructions */ 20 label.cluetip 21 { 22 font-weight:bold; 23 } 24 25 legend.cluetip 26 { 20 27 font-weight:bold; 21 28 } … … 61 68 } 62 69 70 /* jQuery tablesorter instructions */ 63 71 tr.throw 64 72 { -
extensions/NBC_UserAdvManager/branches/2.15/admin/template/userlist.tpl
r6776 r6787 20 20 {ldelim} 21 21 $("#sorting") 22 .tablesorter({ldelim}sortList:[[3, 0]]{rdelim})22 .tablesorter({ldelim}sortList:[[3,1]]{rdelim}) 23 23 .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim}); 24 24 {rdelim} … … 39 39 <tr class="throw"> 40 40 <th>{'Username'|@translate}</th> 41 <th>{'Profile'|@translate}</th> 41 42 <th>{'Email address'|@translate}</th> 42 43 <th>{'LastVisit_Date'|@translate}</th> … … 48 49 <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}"> 49 50 <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td> 51 <td style="text-align:center;"><a href="./admin.php?page=profile&user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td> 50 52 <td>{$user.EMAIL}</td> 51 53 <td style="text-align:center;">{$user.LASTVISIT}</td> -
extensions/NBC_UserAdvManager/branches/2.15/admin/template/usermanager.tpl
r6776 r6787 19 19 {ldelim} 20 20 $("#sorting") 21 .tablesorter({ldelim}sortList:[[ 5,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})21 .tablesorter({ldelim}sortList:[[6,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim}) 22 22 .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim}); 23 23 {rdelim} … … 36 36 <tr class="throw"> 37 37 <th> </td> 38 <th> {'Username'|@translate} </th> 39 <th> {'User status'|@translate} </th> 40 <th> {'Email address'|@translate} </th> 41 <th> {'Groups'|@translate} </th> 42 <th> {'Registration_Date'|@translate} </th> 38 <th>{'Username'|@translate} </th> 39 <th>{'Profile'|@translate} </th> 40 <th>{'User status'|@translate} </th> 41 <th>{'Email address'|@translate} </th> 42 <th>{'Groups'|@translate} </th> 43 <th>{'Registration_Date'|@translate} </th> 43 44 {if $CONFIRM_LOCAL == ""} 44 <th> {'Reminder'|@translate} </th>45 <th>{'Reminder'|@translate} </th> 45 46 {/if} 46 47 </tr> … … 51 52 <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td> 52 53 <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td> 54 <td style="text-align:center;"><a href="./admin.php?page=profile&user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td> 53 55 <td>{$user.STATUS}</td> 54 56 <td>{$user.EMAIL}</td> -
extensions/NBC_UserAdvManager/branches/2.15/changelog.txt.php
r6776 r6787 185 185 Bug 1790 fixed - Validation tracking tab is set when correct options are set 186 186 Bug 1795 fixed - Fixes rules using email information and/or email of validation 187 188 -- 2.15.5 : Bug 1693 fixed - Multi-languages are available for ConfirmMail customization (using Extended Description plugin) 189 Bug 1727 fixed - The redirection does not appli to admins, webmaster and generic users. 190 Bug 1807 fixed - Textareas are resized according the screen resolution 191 Bug 1808 fixed - The Tracking users table is ordered by default on "LastVisit" field (last in at top) 192 Bug 1809 fixed - Addition of a direct link to user's profile in all UAM tables. The link gives a new window 193 Bug 1810 partially fixed - Auto login is not performed after visitors have validated their registration but the "home" button changes his link to redirect to identification page when the redirection option is set. Note: The redirection to profile.php doesn't work because I was unable to use the log_user() function on ConfirmMail page. This feature is still under investigation to perform the best way. 187 194 */ 188 195 ?> -
extensions/NBC_UserAdvManager/branches/2.15/include/functions.inc.php
r6776 r6787 387 387 } 388 388 389 return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID ;389 return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id; 390 390 } 391 391 } … … 458 458 pwg_query($query); 459 459 460 return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID ;460 return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id; 461 461 } 462 462 } … … 505 505 $tab = array(); 506 506 507 $query = "507 $query = ' 508 508 SELECT value 509 FROM ".CONFIG_TABLE."510 WHERE param = 'UserAdvManager_Redir'511 ; ";509 FROM '.CONFIG_TABLE.' 510 WHERE param = "UserAdvManager_Redir" 511 ;'; 512 512 513 513 $tab = pwg_db_fetch_row(pwg_query($query)); … … 527 527 528 528 /* Function called from ConfirmMail.php to verify validation key used by user according time limit */ 529 /* Return true is key validation is OK else return false */ 529 530 function VerifyConfirmMail($id) 530 531 { -
extensions/NBC_UserAdvManager/branches/2.15/main.inc.php
r6776 r6787 2 2 /* 3 3 Plugin Name: UserAdvManager 4 Version: 2.15. 44 Version: 2.15.5 5 5 Description: Renforcer la gestion des utilisateurs - Enforce users management 6 6 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216 … … 13 13 /* 14 14 ***** TODO List ***** 15 ++ No validation needed for admins users comments (new trigger needed in comments.php ?) 16 17 ++ No single email check for admins (new trigger needed in functions_user.inc.php ?) 18 19 ++ Password control and enforcement 20 ?? Can not be the same as username -> Could password score control be sufficient ? 21 22 ++ Security : Blocking brut-force attacks ! 23 -> Way to do that : Count the number of failed attempts to connect and lock the targetted account after x attempts. Where x will be settable by admin. 24 To unlock the locked account : 25 -> A new table in admin's plugin panel which would display the locked accounts. 26 -> Sending an email to account owner to inform him his account is blocked due to multiple failed connexions attempts. This email could have a link with a security key to unlock the account. 27 -> Both of above solutions ? 28 29 ++ Opportunity to copy a registered user for new user creation 30 ++ new copied user will (or not) belong to the same groups 31 ++ new copied user will (or not) get the same status (visitor, admin, webmaster, guest (??)) 32 ++ new copied user will (or not) get the same properties 33 ++ new copied user will (or not) get the same language 34 ... and so on 15 See project bugtracker: http://piwigo.org/bugs/my_view_page.php 35 16 */ 36 17 … … 416 397 417 398 // RedirectToProfile - Thx to LucMorizur 418 // redirects a visitor ( not generic (forbidden) neither admin) to his399 // redirects a visitor (except for admins, webmasters and generic statuses) to his 419 400 // profile.php page 420 401 // … … 427 408 428 409 $conf_UAM = unserialize($conf['UserAdvManager']); 429 430 if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true')) 431 { 432 $user_idsOK = array(); 433 if (!check_consult($user['id'], $user_idsOK)) 434 redirect(PHPWG_ROOT_PATH.'profile.php'); 410 411 $query =' 412 SELECT user_id, status 413 FROM '.USER_INFOS_TABLE.' 414 WHERE user_id = '.$user['id'].' 415 ;'; 416 $data = pwg_db_fetch_assoc(pwg_query($query)); 417 418 if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic") 419 { 420 if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true')) 421 { 422 $user_idsOK = array(); 423 if (!check_consult($user['id'], $user_idsOK)) 424 redirect(PHPWG_ROOT_PATH.'profile.php'); 425 } 435 426 } 436 427 } -
extensions/NBC_UserAdvManager/branches/2.15/template/ConfirmMail.tpl
r5634 r6787 5 5 <ul class="categoryActions"> 6 6 <li> 7 {if $REDIRECT} 8 <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}"> 9 <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"> 10 </a> 11 {else} 7 12 {if isset($GALLERY_URL)} 8 13 <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> … … 14 19 </a> 15 20 {/if} 21 {/if} 16 22 </li> 17 23 </ul>
Note: See TracChangeset
for help on using the changeset viewer.