Menu
▾
▴
[mxbb-commits] mx_profilecp/profilcp functions_profile.php, 1.11, 1.12 profilcp_activate.php, 1.6, 1.7 profilcp_board_config.php, 1.4, 1.5 profilcp_buddy.php, 1.7, 1.8 profilcp_email.php, 1.8, 1.9 profilcp_home.php, 1.4, 1.5 profilcp_home_buddy.php, 1.5, 1.6 profilcp_home_privmsgs.php, 1.4, 1.5 profilcp_home_wtopics.php, 1.4, 1.5 profilcp_privmsg.php, 1.8, 1.9 profilcp_privmsg_popup.php, 1.6, 1.7 profilcp_profil_avatar.php, 1.6, 1.7 profilcp_profil_groups.php, 1.4, 1.5 profilcp_profil_signature.php, 1.5, 1.6 profilcp_public_groups.php, 1.5, 1.6 profilcp_register.php, 1.8, 1.9 profilcp_sendpassword.php, 1.5, 1.6 uacp.php, 1.7, 1.8
Update of /cvsroot/mxbb/mx_profilecp/profilcp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29066/profilcp Modified Files: functions_profile.php profilcp_activate.php profilcp_board_config.php profilcp_buddy.php profilcp_email.php profilcp_home.php profilcp_home_buddy.php profilcp_home_privmsgs.php profilcp_home_wtopics.php profilcp_privmsg.php profilcp_privmsg_popup.php profilcp_profil_avatar.php profilcp_profil_groups.php profilcp_profil_signature.php profilcp_public_groups.php profilcp_register.php profilcp_sendpassword.php uacp.php Log Message: for 2.9.x Index: profilcp_activate.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_activate.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** profilcp_activate.php 5 Apr 2006 23:04:42 -0000 1.6 --- profilcp_activate.php 9 Sep 2007 20:33:05 -0000 1.7 *************** *** 8,12 **** * */ ! if ( !empty($setmodules) ) return; --- 8,12 ---- * */ ! if ( !empty($setmodules) ) return; *************** *** 17,21 **** } ! $sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey FROM " . USERS_TABLE . " WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]); --- 17,21 ---- } ! $sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey FROM " . USERS_TABLE . " WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]); *************** *** 30,34 **** { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') ); --- 30,34 ---- { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="10;url=' . mx_append_sid("index.$phpEx") . '">') ); *************** *** 41,50 **** mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } ! $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ''; $sql = "UPDATE " . USERS_TABLE . " ! SET user_active = 1, user_actkey = ''" . $sql_update_pass . " ! WHERE user_id = " . $row['user_id']; if ( !($result = $db->sql_query($sql)) ) { --- 41,50 ---- mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } ! $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ''; $sql = "UPDATE " . USERS_TABLE . " ! SET user_active = 1, user_actkey = ''" . $sql_update_pass . " ! WHERE user_id = " . $row['user_id']; if ( !($result = $db->sql_query($sql)) ) { *************** *** 68,72 **** $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'USERNAME' => $row['username'], 'PASSWORD' => $password_confirm, --- 68,72 ---- $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'USERNAME' => $row['username'], 'PASSWORD' => $password_confirm, *************** *** 77,83 **** $template->assign_vars(array( ! // original 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') ! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid( this_profile_mxurl() ) . '">') ! ); --- 77,83 ---- $template->assign_vars(array( ! // original 'META' => '<meta http-equiv="refresh" content="10;url=' . mx_append_sid("index.$phpEx") . '">') ! 'META' => '<meta http-equiv="refresh" content="10;url=' . mx_append_sid( this_profile_mxurl() ) . '">') ! ); *************** *** 87,95 **** { $template->assign_vars(array( ! // original 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') ! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid( this_profile_mxurl() ) . '">') ); ! $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; mx_message_die(GENERAL_MESSAGE, $message); } --- 87,95 ---- { $template->assign_vars(array( ! // original 'META' => '<meta http-equiv="refresh" content="10;url=' . mx_append_sid("index.$phpEx") . '">') ! 'META' => '<meta http-equiv="refresh" content="10;url=' . mx_append_sid( this_profile_mxurl() ) . '">') ); ! $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; mx_message_die(GENERAL_MESSAGE, $message); } Index: profilcp_home_privmsgs.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_privmsgs.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_home_privmsgs.php 5 Apr 2006 23:04:42 -0000 1.4 --- profilcp_home_privmsgs.php 9 Sep 2007 20:33:06 -0000 1.5 *************** *** 47,55 **** { $user_id = $userdata['user_id']; ! $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.* ! FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u ! WHERE pm.privmsgs_to_userid = $view_user_id AND (pm.privmsgs_from_userid = $user_id OR $user_id=$view_user_id) ! AND u.user_id = pm.privmsgs_from_userid AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) ORDER BY pm.privmsgs_date DESC"; --- 47,55 ---- { $user_id = $userdata['user_id']; ! $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.* ! FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u ! WHERE pm.privmsgs_to_userid = $view_user_id AND (pm.privmsgs_from_userid = $user_id OR $user_id=$view_user_id) ! AND u.user_id = pm.privmsgs_from_userid AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) ORDER BY pm.privmsgs_date DESC"; *************** *** 115,124 **** $template->assign_block_vars('new_pm', array( 'TITLE' => $privmsgs_rowset[$i]['privmsgs_subject'], ! 'U_TITLE' => append_sid(this_profile_mxurl("mode=privmsg&folder=inbox&privmsg_mode=read&" . POST_POST_URL . "=" . $privmsgs_rowset[$i]['privmsgs_id'])), 'CLASS' => ( $class ) ? 'row1' : 'row2', 'CLASS_NAME' => get_user_level_class( $privmsgs_rowset[$i]['user_level'], 'name', $privmsgs_rowset[$i] ), 'USERNAME' => $privmsgs_rowset[$i]['username'], ! 'U_AUTHOR' => append_sid(this_profile_mxurl("mode=viewprofile&" . POST_USERS_URL . "=" . $privmsgs_rowset[$i]['user_id'] )), ! 'DATE' => create_date( $board_config['default_dateformat'], $privmsgs_rowset[$i]['privmsgs_date'], $board_config['board_timezone'] ), ) ); --- 115,124 ---- $template->assign_block_vars('new_pm', array( 'TITLE' => $privmsgs_rowset[$i]['privmsgs_subject'], ! 'U_TITLE' => mx_append_sid(this_profile_mxurl("mode=privmsg&folder=inbox&privmsg_mode=read&" . POST_POST_URL . "=" . $privmsgs_rowset[$i]['privmsgs_id'])), 'CLASS' => ( $class ) ? 'row1' : 'row2', 'CLASS_NAME' => get_user_level_class( $privmsgs_rowset[$i]['user_level'], 'name', $privmsgs_rowset[$i] ), 'USERNAME' => $privmsgs_rowset[$i]['username'], ! 'U_AUTHOR' => mx_append_sid(this_profile_mxurl("mode=viewprofile&" . POST_USERS_URL . "=" . $privmsgs_rowset[$i]['user_id'] )), ! 'DATE' => phpBB2::create_date( $board_config['default_dateformat'], $privmsgs_rowset[$i]['privmsgs_date'], $board_config['board_timezone'] ), ) ); *************** *** 167,172 **** // send the pagination sentence to display $template->assign_block_vars('right_part.box.pagination', array( ! 'PAGINATION' => generate_pagination(this_profile_mxurl("$w_pagination"), $privmsgs_total, $privmsgs_page_size, $privmsgs_start, true, 'privmsgs_start'), ! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $privmsgs_start / $privmsgs_page_size ) + 1 ), ceil( $privmsgs_total / $privmsgs_page_size )), ) ); --- 167,172 ---- // send the pagination sentence to display $template->assign_block_vars('right_part.box.pagination', array( ! 'PAGINATION' => phpBB2::generate_pagination(this_profile_mxurl("$w_pagination"), $privmsgs_total, $privmsgs_page_size, $privmsgs_start, true, 'privmsgs_start'), ! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $privmsgs_start / $privmsgs_page_size ) + 1 ), ceil( $privmsgs_total / $privmsgs_page_size )), ) ); Index: profilcp_home.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_home.php 5 Apr 2006 23:04:42 -0000 1.4 --- profilcp_home.php 9 Sep 2007 20:33:06 -0000 1.5 *************** *** 64,68 **** $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => append_sid( this_profile_mxurl() ), ) ); --- 64,68 ---- $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => mx_append_sid( this_profile_mxurl() ), ) ); Index: profilcp_sendpassword.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_sendpassword.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** profilcp_sendpassword.php 5 Apr 2006 23:04:42 -0000 1.5 --- profilcp_sendpassword.php 9 Sep 2007 20:33:06 -0000 1.6 *************** *** 8,12 **** * */ ! if ( !empty($setmodules) ) return; --- 8,12 ---- * */ ! if ( !empty($setmodules) ) return; *************** *** 28,34 **** $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : ''; ! $sql = "SELECT user_id, username, user_email, user_active, user_lang ! FROM " . USERS_TABLE . " ! WHERE user_email = '" . str_replace("\'", "''", $email) . "' AND username = '" . str_replace("\'", "''", $username) . "'"; if ( $result = $db->sql_query($sql) ) --- 28,34 ---- $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : ''; ! $sql = "SELECT user_id, username, user_email, user_active, user_lang ! FROM " . USERS_TABLE . " ! WHERE user_email = '" . str_replace("\'", "''", $email) . "' AND username = '" . str_replace("\'", "''", $username) . "'"; if ( $result = $db->sql_query($sql) ) *************** *** 49,55 **** $user_actkey = substr($user_actkey, 0, $key_len); $user_password = pcp_gen_rand_string(false); ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_newpasswd = '" . md5($user_password) . "', user_actkey = '$user_actkey' WHERE user_id = " . $row['user_id']; if ( !$db->sql_query($sql) ) --- 49,55 ---- $user_actkey = substr($user_actkey, 0, $key_len); $user_password = pcp_gen_rand_string(false); ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_newpasswd = '" . md5($user_password) . "', user_actkey = '$user_actkey' WHERE user_id = " . $row['user_id']; if ( !$db->sql_query($sql) ) *************** *** 72,79 **** $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'USERNAME' => $username, 'PASSWORD' => $user_password, ! 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) --- 72,79 ---- $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'USERNAME' => $username, 'PASSWORD' => $user_password, ! 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) *************** *** 83,90 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="15;url=' . append_sid(this_profile_mxurl()) . '">') ); ! $message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 83,90 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="15;url=' . mx_append_sid(this_profile_mxurl()) . '">') ); ! $message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid(this_profile_mxurl()) . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 116,120 **** 'body' => 'profile_send_pass.tpl') ); ! make_jumpbox( $phpbb_root_path . 'viewforum.'.$phpEx); $template->assign_vars(array( --- 116,120 ---- 'body' => 'profile_send_pass.tpl') ); ! mx_make_jumpbox( $phpbb_root_path . 'viewforum.'.$phpEx); $template->assign_vars(array( *************** *** 122,133 **** 'EMAIL' => $email, ! 'L_SEND_PASSWORD' => $lang['Send_password'], 'L_ITEMS_REQUIRED' => $lang['Items_required'], 'L_EMAIL_ADDRESS' => $lang['Email_address'], 'L_SUBMIT' => $lang['Submit'], 'L_RESET' => $lang['Reset'], ! ! 'S_HIDDEN_FIELDS' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />', ! 'S_PROFILE_ACTION' => append_sid(this_profile_mxurl("mode=sendpassword"))) ); --- 122,133 ---- 'EMAIL' => $email, ! 'L_SEND_PASSWORD' => $lang['Send_password'], 'L_ITEMS_REQUIRED' => $lang['Items_required'], 'L_EMAIL_ADDRESS' => $lang['Email_address'], 'L_SUBMIT' => $lang['Submit'], 'L_RESET' => $lang['Reset'], ! ! 'S_HIDDEN_FIELDS' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />', ! 'S_PROFILE_ACTION' => mx_append_sid(this_profile_mxurl("mode=sendpassword"))) ); Index: profilcp_privmsg.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_privmsg.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** profilcp_privmsg.php 5 Apr 2006 23:04:42 -0000 1.8 --- profilcp_privmsg.php 9 Sep 2007 20:33:06 -0000 1.9 *************** *** 95,102 **** { $redirect = str_replace("?", "&", this_profile_mxurl("mode=privmsg&privmsg_mode=$mode&sub=$folder&" . POST_POST_URL . "=$privmsgs_id") ); ! mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true)); ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_profile_mxurl("mode=privmsg&privmsg_mode=$mode&sub=$folder&" . POST_POST_URL . "=$privmsgs_id"), true)); // mx_message_die(GENERAL_MESSAGE, $lang['Not_allowed_to']); ! // redirect(append_sid("login.$phpEx?redirect=profile.$phpEx&mode=privmsg&privmsg_mode=$mode&sub=$folder&" . POST_POST_URL . "=$privmsgs_id", true)); } --- 95,102 ---- { [...1465 lines suppressed...] ! 'L_PRIVMSG_FOLDER_ALT' => $icon_flag_alt, ! 'S_MARK_ID' => $privmsg_id, 'U_READ' => $u_subject, *************** *** 2145,2150 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(this_profile_mxurl("mode=privmsg&sub=$folder"), $pm_total, $board_config['topics_per_page'], $start), ! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $pm_total / $board_config['topics_per_page'] )), 'L_GOTO_PAGE' => $lang['Goto_page']) --- 2145,2150 ---- $template->assign_vars(array( ! 'PAGINATION' => phpBB2::generate_pagination(this_profile_mxurl("mode=privmsg&sub=$folder"), $pm_total, $board_config['topics_per_page'], $start), ! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $pm_total / $board_config['topics_per_page'] )), 'L_GOTO_PAGE' => $lang['Goto_page']) Index: profilcp_home_buddy.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_buddy.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** profilcp_home_buddy.php 5 Apr 2006 23:04:42 -0000 1.5 --- profilcp_home_buddy.php 9 Sep 2007 20:33:06 -0000 1.6 *************** *** 156,165 **** $last_status = $buddy_rowset[$i]['online']; ! // birthday $real_display = ( $userdata['user_allow_real'] && $buddy_rowset[$i]['user_allow_real'] && ( ($buddy_rowset[$i]['user_viewreal'] == YES) || ( ($buddy_rowset[$i]['user_viewreal'] == FRIEND_ONLY) && $friend ) ) ); $birthday_img = ''; if ($real_display) { ! $temp_url = append_sid(this_profile_mxurl("mode=privmsg&privmsg_mode=post&" . POST_USERS_URL . "=$w_user_id")); $birthday_img = ( intval(substr($buddy_rowset[$i]['user_birthday'], 4, 4)) == date('md', time()) ) ? '<a href="' . $temp_url . '"><img src="' . $images['profilecp_icon_birthday'] . '" border="0" alt="' . $lang['Happy_birthday'] . '" title="' . $lang['Happy_birthday'] . '" /></a>' : ''; } --- 156,165 ---- $last_status = $buddy_rowset[$i]['online']; ! // birthday $real_display = ( $userdata['user_allow_real'] && $buddy_rowset[$i]['user_allow_real'] && ( ($buddy_rowset[$i]['user_viewreal'] == YES) || ( ($buddy_rowset[$i]['user_viewreal'] == FRIEND_ONLY) && $friend ) ) ); $birthday_img = ''; if ($real_display) { ! $temp_url = mx_append_sid(this_profile_mxurl("mode=privmsg&privmsg_mode=post&" . POST_USERS_URL . "=$w_user_id")); $birthday_img = ( intval(substr($buddy_rowset[$i]['user_birthday'], 4, 4)) == date('md', time()) ) ? '<a href="' . $temp_url . '"><img src="' . $images['profilecp_icon_birthday'] . '" border="0" alt="' . $lang['Happy_birthday'] . '" title="' . $lang['Happy_birthday'] . '" /></a>' : ''; } *************** *** 169,173 **** 'VISIBLE' => ($buddy_rowset[$i]['buddy_visible']) ? $lang['Always_visible'] : $lang['Not_always_visible'], 'USERNAME' => $buddy_rowset[$i]['username'], ! 'U_PROFILE' => append_sid(this_profile_mxurl("mode=viewprofile&" . POST_USERS_URL . "=$w_user_id")), 'BIRTHDAY' => $birthday_img, ) --- 169,173 ---- 'VISIBLE' => ($buddy_rowset[$i]['buddy_visible']) ? $lang['Always_visible'] : $lang['Not_always_visible'], 'USERNAME' => $buddy_rowset[$i]['username'], ! 'U_PROFILE' => mx_append_sid(this_profile_mxurl("mode=viewprofile&" . POST_USERS_URL . "=$w_user_id")), 'BIRTHDAY' => $birthday_img, ) Index: profilcp_profil_signature.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_signature.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** profilcp_profil_signature.php 5 Apr 2006 23:04:42 -0000 1.5 --- profilcp_profil_signature.php 9 Sep 2007 20:33:06 -0000 1.6 *************** *** 50,54 **** $view_userdata['user_sig'] = $signature; ! $view_userdata['user_sig_bbcode_uid'] = $signature_bbcode_uid; } if ( $error ) --- 50,54 ---- $view_userdata['user_sig'] = $signature; ! $view_userdata['user_sig_bbcode_uid'] = $signature_bbcode_uid; } if ( $error ) *************** *** 58,65 **** if (!$error && !$preview) { ! $sql = "UPDATE " . USERS_TABLE . " SET user_sig = '" . $signature . "', ! user_sig_bbcode_uid = '" . $signature_bbcode_uid . "' WHERE user_id = " . $view_userdata['user_id']; --- 58,65 ---- if (!$error && !$preview) { ! $sql = "UPDATE " . USERS_TABLE . " SET user_sig = '" . $signature . "', ! user_sig_bbcode_uid = '" . $signature_bbcode_uid . "' WHERE user_id = " . $view_userdata['user_id']; *************** *** 81,120 **** 'L_RESET' => $lang['Reset'], ! 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], ! 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], ! 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], ! 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], ! 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], ! 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], ! 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], ! 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], ! 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], ! 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], ! 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], ! 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], 'L_EMPTY_MESSAGE' => $lang['Empty_message'], ! 'L_FONT_COLOR' => $lang['Font_color'], ! 'L_COLOR_DEFAULT' => $lang['color_default'], ! 'L_COLOR_DARK_RED' => $lang['color_dark_red'], ! 'L_COLOR_RED' => $lang['color_red'], ! 'L_COLOR_ORANGE' => $lang['color_orange'], ! 'L_COLOR_BROWN' => $lang['color_brown'], ! 'L_COLOR_YELLOW' => $lang['color_yellow'], ! 'L_COLOR_GREEN' => $lang['color_green'], ! 'L_COLOR_OLIVE' => $lang['color_olive'], ! 'L_COLOR_CYAN' => $lang['color_cyan'], ! 'L_COLOR_BLUE' => $lang['color_blue'], ! 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], ! 'L_COLOR_INDIGO' => $lang['color_indigo'], ! 'L_COLOR_VIOLET' => $lang['color_violet'], ! 'L_COLOR_WHITE' => $lang['color_white'], ! 'L_COLOR_BLACK' => $lang['color_black'], ! 'L_FONT_SIZE' => $lang['Font_size'], ! 'L_FONT_TINY' => $lang['font_tiny'], ! 'L_FONT_SMALL' => $lang['font_small'], ! 'L_FONT_NORMAL' => $lang['font_normal'], ! 'L_FONT_LARGE' => $lang['font_large'], 'L_FONT_HUGE' => $lang['font_huge'], --- 81,120 ---- 'L_RESET' => $lang['Reset'], ! 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], ! 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], ! 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], ! 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], ! 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], ! 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], ! 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], ! 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], ! 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], ! 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], ! 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], ! 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], 'L_EMPTY_MESSAGE' => $lang['Empty_message'], ! 'L_FONT_COLOR' => $lang['Font_color'], ! 'L_COLOR_DEFAULT' => $lang['color_default'], ! 'L_COLOR_DARK_RED' => $lang['color_dark_red'], ! 'L_COLOR_RED' => $lang['color_red'], ! 'L_COLOR_ORANGE' => $lang['color_orange'], ! 'L_COLOR_BROWN' => $lang['color_brown'], ! 'L_COLOR_YELLOW' => $lang['color_yellow'], ! 'L_COLOR_GREEN' => $lang['color_green'], ! 'L_COLOR_OLIVE' => $lang['color_olive'], ! 'L_COLOR_CYAN' => $lang['color_cyan'], ! 'L_COLOR_BLUE' => $lang['color_blue'], ! 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], ! 'L_COLOR_INDIGO' => $lang['color_indigo'], ! 'L_COLOR_VIOLET' => $lang['color_violet'], ! 'L_COLOR_WHITE' => $lang['color_white'], ! 'L_COLOR_BLACK' => $lang['color_black'], ! 'L_FONT_SIZE' => $lang['Font_size'], ! 'L_FONT_TINY' => $lang['font_tiny'], ! 'L_FONT_SMALL' => $lang['font_small'], ! 'L_FONT_NORMAL' => $lang['font_normal'], ! 'L_FONT_LARGE' => $lang['font_large'], 'L_FONT_HUGE' => $lang['font_huge'], *************** *** 142,146 **** 'SIG_PREVIEW' => $preview_sig, 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid( $phpbb_root_path . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, ) --- 142,146 ---- 'SIG_PREVIEW' => $preview_sig, 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . mx_append_sid( $phpbb_root_path . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, ) *************** *** 149,153 **** $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => append_sid(this_profile_mxurl()), ) ); --- 149,153 ---- $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => mx_append_sid(this_profile_mxurl()), ) ); Index: profilcp_privmsg_popup.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_privmsg_popup.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** profilcp_privmsg_popup.php 18 Jun 2006 10:47:14 -0000 1.6 --- profilcp_privmsg_popup.php 9 Sep 2007 20:33:06 -0000 1.7 *************** *** 49,53 **** $l_new_message = $lang['You_no_new_pm']; } ! $l_new_message .= '<br /><br />' . sprintf($lang['Click_view_privmsg'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")) . '" onclick="jump_to_inbox();return false;" target="_new">', '</a>'); } else --- 49,53 ---- $l_new_message = $lang['You_no_new_pm']; } ! $l_new_message .= '<br /><br />' . sprintf($lang['Click_view_privmsg'], '<a href="' . mx_append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")) . '" onclick="jump_to_inbox();return false;" target="_new">', '</a>'); } else Index: profilcp_board_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_board_config.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_board_config.php 5 Apr 2006 23:04:42 -0000 1.4 --- profilcp_board_config.php 9 Sep 2007 20:33:05 -0000 1.5 *************** *** 291,295 **** if ($error) { ! $ret_link = append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$mod_id&msub=$sub_id&" . POST_USERS_URL . "=$view_user_id")); $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="3;url=' . $ret_link . '">') --- 291,295 ---- if ($error) { ! $ret_link = mx_append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$mod_id&msub=$sub_id&" . POST_USERS_URL . "=$view_user_id")); $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="3;url=' . $ret_link . '">') *************** *** 310,314 **** { // update ! $sql = "UPDATE " . USERS_TABLE . " SET $user_field='" . $$user_field . "' WHERE user_id = " . $view_userdata['user_id']; --- 310,314 ---- { // update ! $sql = "UPDATE " . USERS_TABLE . " SET $user_field='" . $$user_field . "' WHERE user_id = " . $view_userdata['user_id']; *************** *** 321,325 **** // send an update message ! $ret_link = append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$mod_id&msub=$sub_id&" . POST_USERS_URL . "=$view_user_id")); $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="3;url=' . $ret_link . '">') --- 321,325 ---- // send an update message ! $ret_link = mx_append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$mod_id&msub=$sub_id&" . POST_USERS_URL . "=$view_user_id")); $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="3;url=' . $ret_link . '">') *************** *** 354,358 **** 'CLASS' => ($mod_id == $i) ? 'row1' : 'row2', 'ALIGN' => ( ($mod_id == $i) && (count($sub_keys[$i]) > 1) ) ? 'left' : 'center', ! 'U_MOD' => append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$i&" . POST_USERS_URL . "=$view_user_id")), 'L_MOD' => sprintf( (($mod_id == $i) ? '<b>%s</b>' : '%s'), mods_settings_get_lang($l_mod) ), ) --- 354,358 ---- 'CLASS' => ($mod_id == $i) ? 'row1' : 'row2', 'ALIGN' => ( ($mod_id == $i) && (count($sub_keys[$i]) > 1) ) ? 'left' : 'center', ! 'U_MOD' => mx_append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$i&" . POST_USERS_URL . "=$view_user_id")), 'L_MOD' => sprintf( (($mod_id == $i) ? '<b>%s</b>' : '%s'), mods_settings_get_lang($l_mod) ), ) *************** *** 367,371 **** $template->assign_block_vars('mod.sub.row', array( 'CLASS' => ($sub_id == $j) ? 'row1' : 'row1', ! 'U_MOD' => append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$i&msub=$j&" . POST_USERS_URL . "=$view_user_id")), 'L_MOD' => sprintf( (($sub_id == $j) ? '<b>%s</b>' : '%s'), mods_settings_get_lang($sub_keys[$i][$j]) ), ) --- 367,371 ---- $template->assign_block_vars('mod.sub.row', array( 'CLASS' => ($sub_id == $j) ? 'row1' : 'row1', ! 'U_MOD' => mx_append_sid(this_profile_mxurl("mode=profil&sub=$sub&mod=$i&msub=$j&" . POST_USERS_URL . "=$view_user_id")), 'L_MOD' => sprintf( (($sub_id == $j) ? '<b>%s</b>' : '%s'), mods_settings_get_lang($sub_keys[$i][$j]) ), ) *************** *** 453,457 **** $s_hidden_fields .= '<input type="hidden" name="submit" value="1" />'; $template->assign_vars(array( ! 'S_PROFILCP_ACTION' => append_sid(this_profile_mxurl()), 'S_HIDDEN_FIELDS' => $s_hidden_fields, ) --- 453,457 ---- $s_hidden_fields .= '<input type="hidden" name="submit" value="1" />'; $template->assign_vars(array( ! 'S_PROFILCP_ACTION' => mx_append_sid(this_profile_mxurl()), 'S_HIDDEN_FIELDS' => $s_hidden_fields, ) Index: profilcp_home_wtopics.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_wtopics.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_home_wtopics.php 5 Apr 2006 23:04:42 -0000 1.4 --- profilcp_home_wtopics.php 9 Sep 2007 20:33:06 -0000 1.5 *************** *** 8,12 **** * */ ! if ( !defined('IN_PORTAL') ) { --- 8,12 ---- * */ ! if ( !defined('IN_PORTAL') ) { *************** *** 125,129 **** AND p.post_id = t.topic_first_post_id AND p2.post_id = t.topic_last_post_id ! AND u2.user_id = p2.poster_id AND p2.post_time >= $floor ORDER BY t.topic_type DESC, t.topic_last_post_id DESC"; --- 125,129 ---- AND p.post_id = t.topic_first_post_id AND p2.post_id = t.topic_last_post_id ! AND u2.user_id = p2.poster_id AND p2.post_time >= $floor ORDER BY t.topic_type DESC, t.topic_last_post_id DESC"; *************** *** 161,165 **** mx_message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql); } ! while ($row = $db->sql_fetchrow($result) ) { $row['topic_id'] = POST_TOPIC_URL . $row['topic_id']; --- 161,165 ---- mx_message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql); } ! while ($row = $db->sql_fetchrow($result) ) { $row['topic_id'] = POST_TOPIC_URL . $row['topic_id']; *************** *** 229,234 **** // send the pagination sentence to display $template->assign_block_vars('right_part.box.pagination', array( ! 'PAGINATION' => generate_pagination(this_profile_mxurl("$w_pagination"), $topics_watched_total, $topics_watched_page_size, $topics_watched_start, true, 'startwt'), ! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $topics_watched_start / $topics_watched_page_size ) + 1 ), ceil( $topics_watched_total / $topics_watched_page_size )), ) ); --- 229,234 ---- // send the pagination sentence to display $template->assign_block_vars('right_part.box.pagination', array( ! 'PAGINATION' => phpBB2::generate_pagination(this_profile_mxurl("$w_pagination"), $topics_watched_total, $topics_watched_page_size, $topics_watched_start, true, 'startwt'), ! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $topics_watched_start / $topics_watched_page_size ) + 1 ), ceil( $topics_watched_total / $topics_watched_page_size )), ) ); Index: profilcp_profil_avatar.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_avatar.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** profilcp_profil_avatar.php 5 Apr 2006 23:04:42 -0000 1.6 --- profilcp_profil_avatar.php 9 Sep 2007 20:33:06 -0000 1.7 *************** *** 14,18 **** exit; } ! if ( !empty($setmodules) ) { if ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_remote'] || $board_config['allow_avatar_local'] ) --- 14,18 ---- exit; } ! if ( !empty($setmodules) ) { if ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_remote'] || $board_config['allow_avatar_local'] ) *************** *** 87,91 **** if ($avatar_sql != '') { ! $sql = "UPDATE " . USERS_TABLE . " SET $avatar_sql WHERE user_id=$view_user_id"; if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql); } --- 87,91 ---- if ($avatar_sql != '') { ! $sql = "UPDATE " . USERS_TABLE . " SET $avatar_sql WHERE user_id=$view_user_id"; if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql); } *************** *** 114,118 **** 'L_AVATAR_GALLERY' => $lang['Select_from_gallery'], 'L_SHOW_GALLERY' => $lang['View_avatar_gallery'], ! 'U_AVATAR_SELECT' => append_sid( $mx_root_path . "modules/mx_profilecp/profile_avatar.$phpEx"), 'L_SUBMIT' => $lang['Submit'], --- 114,118 ---- 'L_AVATAR_GALLERY' => $lang['Select_from_gallery'], 'L_SHOW_GALLERY' => $lang['View_avatar_gallery'], ! 'U_AVATAR_SELECT' => mx_append_sid( $mx_root_path . "modules/mx_profilecp/profile_avatar.$phpEx"), 'L_SUBMIT' => $lang['Submit'], *************** *** 176,180 **** 'S_FORM_ENCTYPE' => $form_enctype, 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => append_sid(this_profile_mxurl()), ) ); --- 176,180 ---- 'S_FORM_ENCTYPE' => $form_enctype, 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => mx_append_sid(this_profile_mxurl()), ) ); Index: uacp.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/uacp.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** uacp.php 18 Jun 2006 10:47:14 -0000 1.7 --- uacp.php 9 Sep 2007 20:33:06 -0000 1.8 *************** *** 39,43 **** if (isset($HTTP_GET_VARS[$get_vars[$i]])) $s_call .= '&' . $key . '=' . $HTTP_GET_VARS[$get_vars[$i]]; } ! redirect(append_sid( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "uacp" . $s_call, true)); exit; } --- 39,43 ---- if (isset($HTTP_GET_VARS[$get_vars[$i]])) $s_call .= '&' . $key . '=' . $HTTP_GET_VARS[$get_vars[$i]]; } ! mx_redirect(mx_append_sid( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "uacp" . $s_call, true)); exit; } *************** *** 283,290 **** //-- mod : profile cp ------------------------------------------------------------------------------ //-- add ! // redirect(append_sid( ( $is_block ? "index.$phpEx?page=$page&mode=" : "profile.$phpEx?mode=" ) . "uacp")); ! // redirect(append_sid( ( $is_block ? "index.$phpEx?page=$page&mode=" : "profile.$phpEx?mode=" ) . "home")); ! $from = append_sid( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "home") ; $l_from = sprintf( $lang['Click_return_privmsg'], '<a href="' . $from . '">', '</a>' ); $ret_link = $from; --- 283,290 ---- //-- mod : profile cp ------------------------------------------------------------------------------ //-- add ! // redirect(mx_append_sid( ( $is_block ? "index.$phpEx?page=$page&mode=" : "profile.$phpEx?mode=" ) . "uacp")); ! // redirect(mx_append_sid( ( $is_block ? "index.$phpEx?page=$page&mode=" : "profile.$phpEx?mode=" ) . "home")); ! $from = mx_append_sid( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "home") ; $l_from = sprintf( $lang['Click_return_privmsg'], '<a href="' . $from . '">', '</a>' ); $ret_link = $from; *************** *** 333,337 **** // 'L_NO' => $lang['No'], // ! // 'S_CONFIRM_ACTION' => append_sid(( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "uacp"), // 'S_HIDDEN_FIELDS' => $hidden_fields) // ); --- 333,337 ---- // 'L_NO' => $lang['No'], // ! // 'S_CONFIRM_ACTION' => mx_append_sid(( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "uacp"), // 'S_HIDDEN_FIELDS' => $hidden_fields) // ); *************** *** 395,401 **** //-- mod : profile cp ------------------------------------------------------------------------------ //-- delete ! // 'S_MODE_ACTION' => append_sid('uacp.' . $phpEx), //-- add ! 'S_MODE_ACTION' => append_sid( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "uacp"), //-- fin mod : profile cp -------------------------------------------------------------------------- 'S_MODE_SELECT' => $select_sort_mode, --- 395,401 ---- //-- mod : profile cp ------------------------------------------------------------------------------ //-- delete ! // 'S_MODE_ACTION' => mx_append_sid('uacp.' . $phpEx), //-- add ! 'S_MODE_ACTION' => mx_append_sid( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . "uacp"), //-- fin mod : profile cp -------------------------------------------------------------------------- 'S_MODE_SELECT' => $select_sort_mode, *************** *** 491,495 **** } ! $view_topic = append_sid($phpbb_root_path . 'viewtopic.' . $phpEx . '?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']); $post_titles[] = '<a href="' . $view_topic . '" class="gen" target="_blank">' . $post_title . '</a>'; --- 491,495 ---- } ! $view_topic = mx_append_sid($phpbb_root_path . 'viewtopic.' . $phpEx . '?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']); $post_titles[] = '<a href="' . $view_topic . '" class="gen" target="_blank">' . $post_title . '</a>'; *************** *** 593,603 **** 'SIZE' => round(($attachments[$i]['filesize'] / MEGABYTE), 2), 'DOWNLOAD_COUNT' => $attachments[$i]['download_count'], ! 'POST_TIME' => create_date($board_config['default_dateformat'], $attachments[$i]['filetime'], $board_config['board_timezone']), 'POST_TITLE' => $post_titles, 'S_DELETE_BOX' => $delete_box, 'S_HIDDEN' => $hidden_field, ! 'U_VIEW_ATTACHMENT' => append_sid($phpbb_root_path . 'download.' . $phpEx . '?id=' . $attachments[$i]['attach_id'])) ! // 'U_VIEW_POST' => ($attachments[$i]['post_id'] != 0) ? append_sid("../viewtopic." . $phpEx . "?" . POST_POST_URL . "=" . $attachments[$i]['post_id'] . "#" . $attachments[$i]['post_id']) : '') ); } --- 593,603 ---- 'SIZE' => round(($attachments[$i]['filesize'] / MEGABYTE), 2), 'DOWNLOAD_COUNT' => $attachments[$i]['download_count'], ! 'POST_TIME' => phpBB2::create_date($board_config['default_dateformat'], $attachments[$i]['filetime'], $board_config['board_timezone']), 'POST_TITLE' => $post_titles, 'S_DELETE_BOX' => $delete_box, 'S_HIDDEN' => $hidden_field, ! 'U_VIEW_ATTACHMENT' => mx_append_sid($phpbb_root_path . 'download.' . $phpEx . '?id=' . $attachments[$i]['attach_id'])) ! // 'U_VIEW_POST' => ($attachments[$i]['post_id'] != 0) ? mx_append_sid("../viewtopic." . $phpEx . "?" . POST_POST_URL . "=" . $attachments[$i]['post_id'] . "#" . $attachments[$i]['post_id']) : '') ); } *************** *** 614,618 **** // $pagination = generate_pagination($phpbb_root_path . 'uacp.' . $phpEx . '?mode=' . $mode . '&order=' . $sort_order . '&' . POST_USERS_URL . '=' . $profiledata['user_id'] . '&sid=' . $userdata['session_id'], $total_rows, $board_config['topics_per_page'], $start).' '; //-- add ! $pagination = generate_pagination( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . 'uacp&sort=' . $sort . '&order=' . $sort_order . '&' . POST_USERS_URL . '=' . $profiledata['user_id'] . '&sid=' . $userdata['session_id'], $total_rows, $board_config['topics_per_page'], $start).' '; //-- fin mod : profile cp -------------------------------------------------------------------------- --- 614,618 ---- // $pagination = generate_pagination($phpbb_root_path . 'uacp.' . $phpEx . '?mode=' . $mode . '&order=' . $sort_order . '&' . POST_USERS_URL . '=' . $profiledata['user_id'] . '&sid=' . $userdata['session_id'], $total_rows, $board_config['topics_per_page'], $start).' '; //-- add ! $pagination = phpBB2::generate_pagination( ( $is_block ? "index.$phpEx?page=$page_id&mode=" : "profile.$phpEx?mode=" ) . 'uacp&sort=' . $sort . '&order=' . $sort_order . '&' . POST_USERS_URL . '=' . $profiledata['user_id'] . '&sid=' . $userdata['session_id'], $total_rows, $board_config['topics_per_page'], $start).' '; //-- fin mod : profile cp -------------------------------------------------------------------------- Index: profilcp_register.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_register.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** profilcp_register.php 5 Apr 2006 23:04:42 -0000 1.8 --- profilcp_register.php 9 Sep 2007 20:33:06 -0000 1.9 *************** *** 185,207 **** } ! // check domain name ! if ( ($create_user || $email_changed) && ($board_config['require_activation'] != USER_ACTIVATION_NONE)) ! { ! $result = domain_check($user_email); ! if ( !$result['error'] && $result['error_msg'] == 'invalid_domain' ) ! { ! $user_email = $view_userdata['user_email']; ! $email_error = true; ! $error = true; ! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . sprintf($lang['profilcp_email_invalid_domain'], $board_config['email_domain']); ! } ! else $email_changed = true; ! } ! // break if error if ( $error ) mx_message_die(GENERAL_ERROR, $error_msg); ! // disabling the user (or creation) $active_changed = false; --- 185,207 ---- } ! // check domain name ! if ( ($create_user || $email_changed) && ($board_config['require_activation'] != USER_ACTIVATION_NONE)) ! { ! $result = domain_check($user_email); ! if ( !$result['error'] && $result['error_msg'] == 'invalid_domain' ) ! { ! $user_email = $view_userdata['user_email']; ! $email_error = true; ! $error = true; ! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . sprintf($lang['profilcp_email_invalid_domain'], $board_config['email_domain']); ! } ! else $email_changed = true; ! } ! // break if error if ( $error ) mx_message_die(GENERAL_ERROR, $error_msg); ! // disabling the user (or creation) $active_changed = false; *************** *** 259,263 **** // validate domain...save original mail adress $userrow['user_email_reg'] = $values['user_email']; ! // add new values @reset($values); --- 259,263 ---- // validate domain...save original mail adress $userrow['user_email_reg'] = $values['user_email']; ! // add new values @reset($values); *************** *** 380,384 **** if ( $username_changed ) { ! $sql = "UPDATE " . GROUPS_TABLE . " SET group_name = '" . str_replace("\'", "''", $username) . "' WHERE group_name = '" . str_replace("\'", "''", $view_userdata['username'] ) . "'"; --- 380,384 ---- if ( $username_changed ) { ! $sql = "UPDATE " . GROUPS_TABLE . " SET group_name = '" . str_replace("\'", "''", $username) . "' WHERE group_name = '" . str_replace("\'", "''", $view_userdata['username'] ) . "'"; *************** *** 428,441 **** if ( $board_config['require_activation'] == USER_ACTIVATION_SELF ) { ! $message = $lang['Account_inactive'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); } else if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) { ! $message = $lang['Account_inactive_admin'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); } } else { ! $message = $lang['Profile_updated_inactive'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); } } --- 428,441 ---- if ( $board_config['require_activation'] == USER_ACTIVATION_SELF ) { ! $message = $lang['Account_inactive'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); } else if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) { ! $message = $lang['Account_inactive_admin'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); } } else { ! $message = $lang['Profile_updated_inactive'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); } } *************** *** 444,452 **** if ($create_user) { ! $message = $lang['Account_added'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); } else { ! $message = $lang['Profile_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); } } --- 444,452 ---- if ($create_user) { ! $message = $lang['Account_added'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); } else { ! $message = $lang['Profile_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>'); } } *************** *** 455,459 **** { $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid(this_profile_mxurl()) . '">') ); mx_message_die(GENERAL_MESSAGE, $message); --- 455,459 ---- { $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="5;url=' . mx_append_sid(this_profile_mxurl()) . '">') ); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 520,525 **** for ($i=0; $i < strlen($userdata['session_robot']); $i++) { ! $template->assign_block_vars('switch_anti_robotic.robotic_pic', array( ! 'PIC' => append_sid($module_root_path . "profile_pic.$phpEx?l=$i"), ) ); --- 520,525 ---- for ($i=0; $i < strlen($userdata['session_robot']); $i++) { ! $template->assign_block_vars('switch_anti_robotic.robotic_pic', array( ! 'PIC' => mx_append_sid($module_root_path . "profile_pic.$phpEx?l=$i"), ) ); *************** *** 544,548 **** FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt WHERE p.topic_id = $topic_id ! AND p.post_id=t.topic_first_post_id AND pt.post_id = p.post_id AND u.user_id = p.poster_id"; --- 544,548 ---- FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt WHERE p.topic_id = $topic_id ! AND p.post_id=t.topic_first_post_id AND pt.post_id = p.post_id AND u.user_id = p.poster_id"; *************** *** 561,565 **** if ( $board_config['allow_smilies'] && $row['enable_smilies'] ) $message = smilies_pass($message); $message = str_replace("\n", "\n<br />\n", $message); ! $last_update = $lang['Last_updated'] . ": " . create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']); // send --- 561,565 ---- if ( $board_config['allow_smilies'] && $row['enable_smilies'] ) $message = smilies_pass($message); $message = str_replace("\n", "\n<br />\n", $message); ! $last_update = $lang['Last_updated'] . ": " . phpBB2::create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']); // send *************** *** 582,586 **** $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => append_sid(this_profile_mxurl()), ) ); --- 582,586 ---- $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => mx_append_sid(this_profile_mxurl()), ) ); Index: profilcp_profil_groups.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_groups.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_profil_groups.php 5 Apr 2006 23:04:42 -0000 1.4 --- profilcp_profil_groups.php 9 Sep 2007 20:33:06 -0000 1.5 *************** *** 35,51 **** $sql_mod_gmz = !$mod_group_moderatorz ? '' : ', view_ug.group_moderator AS view_group_moderator, user_ug.group_moderator AS user_group_moderator'; ! $sql = "SELECT ! g.*, ! view_ug.user_pending AS view_pending, ! user_ug.user_pending AS user_pending $sql_mod_gmz FROM ((" . GROUPS_TABLE . " AS g LEFT JOIN " . USER_GROUP_TABLE . " AS view_ug ON view_ug.group_id=g.group_id AND view_ug.user_id=" . $view_userdata['user_id'] . ") LEFT JOIN " . USER_GROUP_TABLE . " AS user_ug ON user_ug.group_id=g.group_id AND user_ug.user_id=" . $userdata['user_id'] . ") ! WHERE g.group_single_user = 0 ORDER BY g.group_name, g.group_id"; ! if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } $select_avail = false; --- 35,51 ---- $sql_mod_gmz = !$mod_group_moderatorz ? '' : ', view_ug.group_moderator AS view_group_moderator, user_ug.group_moderator AS user_group_moderator'; ! $sql = "SELECT ! g.*, ! view_ug.user_pending AS view_pending, ! user_ug.user_pending AS user_pending $sql_mod_gmz FROM ((" . GROUPS_TABLE . " AS g LEFT JOIN " . USER_GROUP_TABLE . " AS view_ug ON view_ug.group_id=g.group_id AND view_ug.user_id=" . $view_userdata['user_id'] . ") LEFT JOIN " . USER_GROUP_TABLE . " AS user_ug ON user_ug.group_id=g.group_id AND user_ug.user_id=" . $userdata['user_id'] . ") ! WHERE g.group_single_user = 0 ORDER BY g.group_name, g.group_id"; ! if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } $select_avail = false; *************** *** 256,260 **** // update table ! $sql = "SELECT * FROM " . USER_GROUP_TABLE . " WHERE group_id=$group_id AND user_id=" . $view_userdata['user_id']; if ( !$result = $db->sql_query($sql) ) --- 256,260 ---- // update table ! $sql = "SELECT * FROM " . USER_GROUP_TABLE . " WHERE group_id=$group_id AND user_id=" . $view_userdata['user_id']; if ( !$result = $db->sql_query($sql) ) *************** *** 265,270 **** { // update user group ! $sql = "UPDATE " . USER_GROUP_TABLE . " ! SET user_pending=" . ( $pending ? '1' : '0' ) . " WHERE group_id=$group_id AND user_id=" . $view_userdata['user_id']; if ( !$db->sql_query($sql) ) --- 265,270 ---- { // update user group ! $sql = "UPDATE " . USER_GROUP_TABLE . " ! SET user_pending=" . ( $pending ? '1' : '0' ) . " WHERE group_id=$group_id AND user_id=" . $view_userdata['user_id']; if ( !$db->sql_query($sql) ) *************** *** 276,282 **** { // create user group ! $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) ! VALUES ($group_id, " . $view_userdata['user_id'] . ", " . ( $pending ? '1' : '0' ) . ")"; if ( !$db->sql_query($sql) ) --- 276,282 ---- { // create user group ! $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) ! VALUES ($group_id, " . $view_userdata['user_id'] . ", " . ( $pending ? '1' : '0' ) . ")"; if ( !$db->sql_query($sql) ) *************** *** 292,300 **** if ( $action && ($view_userdata['user_level'] != ADMIN) ) { ! $sql = "SELECT COUNT(auth_mod) AS is_auth_mod ! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = " . $view_userdata['user_id'] . " AND ug.user_pending = 0 ! AND aa.group_id = ug.group_id AND aa.auth_mod = 1"; if ( !$result = $db->sql_query($sql) ) --- 292,300 ---- if ( $action && ($view_userdata['user_level'] != ADMIN) ) { ! $sql = "SELECT COUNT(auth_mod) AS is_auth_mod ! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = " . $view_userdata['user_id'] . " AND ug.user_pending = 0 ! AND aa.group_id = ug.group_id AND aa.auth_mod = 1"; if ( !$result = $db->sql_query($sql) ) *************** *** 311,316 **** // update ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_level = " . ( $is_moderator ? MOD : USER ) . " WHERE user_id = " . $view_userdata['user_id']; if ( !$db->sql_query($sql) ) --- 311,316 ---- // update ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_level = " . ( $is_moderator ? MOD : USER ) . " WHERE user_id = " . $view_userdata['user_id']; if ( !$db->sql_query($sql) ) *************** *** 372,379 **** $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'GROUP_NAME' => $group_name, 'GROUP_MODERATOR' => $moderator['username'], ! 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true") --- 372,379 ---- $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'GROUP_NAME' => $group_name, 'GROUP_MODERATOR' => $moderator['username'], ! 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true") *************** *** 412,418 **** // dump to template $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'GROUP_NAME' => $group_name, ! 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id") --- 412,418 ---- // dump to template $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], 'GROUP_NAME' => $group_name, ! 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id") *************** *** 425,429 **** // send action msg ! $ret_link = append_sid(this_profile_mxurl("mode=$mode" . (($cur_subopt < 0) ? '' : "&sub=$sub") . "&" . POST_USERS_URL . "=$view_user_id") ); if ( $action ) { --- 425,429 ---- // send action msg ! $ret_link = mx_append_sid(this_profile_mxurl("mode=$mode" . (($cur_subopt < 0) ? '' : "&sub=$sub") . "&" . POST_USERS_URL . "=$view_user_id") ); if ( $action ) { *************** *** 439,443 **** $submit = false; $redirect = str_replace("?", "&", $ret_link ); ! mx_redirect(append_sid($redirect, true), 'ddd'); // redirect($ret_link); } --- 439,443 ---- $submit = false; $redirect = str_replace("?", "&", $ret_link ); ! mx_redirect(mx_append_sid($redirect, true), 'ddd'); // redirect($ret_link); } *************** *** 492,496 **** 'CHECKED' => ( $group_data['view_status'] >= 1 ) ? 'checked="checked"' : '', ! 'U_GROUP' => append_sid($phpbb_root_path . "groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id"), ) ); --- 492,496 ---- 'CHECKED' => ( $group_data['view_status'] >= 1 ) ? 'checked="checked"' : '', ! 'U_GROUP' => mx_append_sid($phpbb_root_path . "groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id"), ) ); *************** *** 525,529 **** $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => append_sid(this_profile_mxurl()), ) ); --- 525,529 ---- $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => mx_append_sid(this_profile_mxurl()), ) ); Index: profilcp_public_groups.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_public_groups.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** profilcp_public_groups.php 5 Apr 2006 23:04:42 -0000 1.5 --- profilcp_public_groups.php 9 Sep 2007 20:33:06 -0000 1.6 *************** *** 30,51 **** // groupes $groups = array(); ! $sql = "SELECT ! g.group_id, ! g.group_name, ! g.group_description, ! g.group_type ! FROM ! " . USER_GROUP_TABLE . " l, ! " . GROUPS_TABLE . " g ! WHERE l.user_pending = 0 ! AND g.group_single_user = 0 ! AND l.user_id = $view_user_id ! AND g.group_id = l.group_id ! ORDER BY ! g.group_name, g.group_id"; ! if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) --- 30,51 ---- // groupes $groups = array(); ! $sql = "SELECT ! g.group_id, ! g.group_name, ! g.group_description, ! g.group_type ! FROM ! " . USER_GROUP_TABLE . " l, ! " . GROUPS_TABLE . " g ! WHERE l.user_pending = 0 ! AND g.group_single_user = 0 ! AND l.user_id = $view_user_id ! AND g.group_id = l.group_id ! ORDER BY ! g.group_name, g.group_id"; ! if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) *************** *** 92,96 **** $nb++; $class = !$class; ! $u_group_name = append_sid($phpbb_root_path . "groupcp.$phpEx?" . POST_GROUPS_URL . '=' . $groups[$i]['group_id']); $l_group_name = $groups[$i]['group_name']; $l_group_desc = $groups[$i]['group_description']; --- 92,96 ---- $nb++; $class = !$class; ! $u_group_name = mx_append_sid($phpbb_root_path . "groupcp.$phpEx?" . POST_GROUPS_URL . '=' . $groups[$i]['group_id']); $l_group_name = $groups[$i]['group_name']; $l_group_desc = $groups[$i]['group_description']; *************** *** 114,118 **** $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => append_sid(this_profile_mxurl()), ) ); --- 114,118 ---- $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PROFILCP_ACTION' => mx_append_sid(this_profile_mxurl()), ) ); Index: profilcp_email.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_email.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** profilcp_email.php 5 Apr 2006 23:04:42 -0000 1.8 --- profilcp_email.php 9 Sep 2007 20:33:05 -0000 1.9 *************** *** 8,12 **** * */ ! if ( !empty($setmodules) ) return; --- 8,12 ---- * */ ! if ( !empty($setmodules) ) return; *************** *** 20,24 **** if (!$board_config['board_email_form']) { ! redirect(append_sid("index.$phpEx", true)); } --- 20,24 ---- if (!$board_config['board_email_form']) { ! mx_redirect(mx_append_sid("index.$phpEx", true)); } *************** *** 35,46 **** { $redirect = str_replace("?", "&", this_profile_mxurl("mode=email&" . POST_US... [truncated message content] |
