|
From: Jon O. <jon...@us...> - 2007-09-09 20:09:15
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19690/modules Modified Files: link_category.php link_jump.php link_link.php link_lists.php link_main.php link_mcp.php link_mini.php link_post_comment.php link_rate.php link_search.php link_user_upload.php link_viewall.php Log Message: for 2.9.x Index: link_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_mini.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** link_mini.php 2 Jun 2007 19:46:32 -0000 1.5 --- link_mini.php 9 Sep 2007 20:09:04 -0000 1.6 *************** *** 69,73 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("action=category&cat_id=" . $cat_id, true), true)); } --- 69,73 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("action=category&cat_id=" . $cat_id, true), true)); } *************** *** 106,110 **** $template->assign_vars( array( ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINK' => $linkdb_config['module_name'], --- 106,110 ---- $template->assign_vars( array( ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'LINK' => $linkdb_config['module_name'], *************** *** 113,118 **** 'MX_PAGE' => $page_id, ! 'S_JUMPBOX_ACTION' => append_sid( $this->this_mxurl( ) ), ! 'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( 'cat_id=' . $cat_id, false, false ) ), $total_num_items, $mini_config['mini_pagination'], $start, true, true, true, false, 'mini_start'), )); --- 113,118 ---- 'MX_PAGE' => $page_id, ! 'S_JUMPBOX_ACTION' => mx_append_sid( $this->this_mxurl( ) ), ! 'BLOCK_PAGINATION' => mx_generate_pagination(mx_append_sid( $this->this_mxurl( 'cat_id=' . $cat_id, false, false ) ), $total_num_items, $mini_config['mini_pagination'], $start, true, true, true, false, 'mini_start'), )); Index: link_mcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_mcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_mcp.php 13 Aug 2006 19:43:51 -0000 1.2 --- link_mcp.php 9 Sep 2007 20:09:04 -0000 1.3 *************** *** 273,282 **** $template->assign_vars( array( 'LINKS' => $linkdb_config['module_name'], ! 'U_LINKS' => append_sid( $this->this_mxurl() ), 'L_MCP_TITLE' => $l_title, 'L_MCP_EXPLAIN' => $l_explain, 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_ACTION' => append_sid( $this->this_mxurl( "action=mcp" ) ) )); --- 273,282 ---- $template->assign_vars( array( 'LINKS' => $linkdb_config['module_name'], ! 'U_LINKS' => mx_append_sid( $this->this_mxurl() ), 'L_MCP_TITLE' => $l_title, 'L_MCP_EXPLAIN' => $l_explain, 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_ACTION' => mx_append_sid( $this->this_mxurl( "action=mcp" ) ) )); *************** *** 435,439 **** 'L_NO_ITEMS' => $lang['No_item'], ! 'PAGINATION' => generate_pagination( append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&sort_method=$sort_method&sort_order=$sort_order" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), $total_num, $linkdb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $linkdb_config['pagination'] ) + 1 ), ceil( $total_num / $linkdb_config['pagination'] ) ), --- 435,439 ---- 'L_NO_ITEMS' => $lang['No_item'], ! 'PAGINATION' => phpBB2::generate_pagination( mx_append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&sort_method=$sort_method&sort_order=$sort_order" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), $total_num, $linkdb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $linkdb_config['pagination'] ) + 1 ), ceil( $total_num / $linkdb_config['pagination'] ) ), *************** *** 477,483 **** 'NUMBER' => $i++, 'ID' => $item_data['link_id'], ! 'U_EDIT' => append_sid( $this->this_mxurl( "action=user_upload&mode_mcp=edit&link_id={$item_data['link_id']}" ) ), ! 'U_DELETE' => append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=do_delete&id={$item_data['link_id']}" ) ), ! 'U_APPROVE' => append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=$approve_mode&id={$item_data['link_id']}" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), 'L_APPROVE' => ( $item_data['link_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ); --- 477,483 ---- 'NUMBER' => $i++, 'ID' => $item_data['link_id'], ! 'U_EDIT' => mx_append_sid( $this->this_mxurl( "action=user_upload&mode_mcp=edit&link_id={$item_data['link_id']}" ) ), ! 'U_DELETE' => mx_append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=do_delete&id={$item_data['link_id']}" ) ), ! 'U_APPROVE' => mx_append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=$approve_mode&id={$item_data['link_id']}" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), 'L_APPROVE' => ( $item_data['link_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ); Index: link_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_category.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** link_category.php 14 Aug 2006 10:46:47 -0000 1.13 --- link_category.php 9 Sep 2007 20:09:03 -0000 1.14 *************** *** 106,110 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("mode=cat&cat=" . $cat_id, true), true)); } --- 106,110 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("mode=cat&cat=" . $cat_id, true), true)); } *************** *** 136,140 **** $template->assign_vars( array( ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'] ) ); --- 136,140 ---- $template->assign_vars( array( ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'] ) ); Index: link_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_lists.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** link_lists.php 15 Aug 2006 19:43:28 -0000 1.3 --- link_lists.php 9 Sep 2007 20:09:03 -0000 1.4 *************** *** 132,139 **** $template->assign_vars( array( ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINK' => $linkdb_config['module_name'], ! 'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'link_start'), )); --- 132,139 ---- $template->assign_vars( array( ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'LINK' => $linkdb_config['module_name'], ! 'BLOCK_PAGINATION' => mx_generate_pagination(mx_append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'link_start'), )); Index: link_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_user_upload.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** link_user_upload.php 5 Aug 2007 22:08:28 -0000 1.13 --- link_user_upload.php 9 Sep 2007 20:09:05 -0000 1.14 *************** *** 139,143 **** $this->delete_items( $link_id ); $this->_linkdb(); ! $message = $lang['Linkdeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 139,143 ---- $this->delete_items( $link_id ); $this->_linkdb(); ! $message = $lang['Linkdeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 164,172 **** if ( $this->auth_user[$cat_id]['auth_approval'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Linkadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=link&link_id=" . $link_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Linkadded_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } --- 164,172 ---- if ( $this->auth_user[$cat_id]['auth_approval'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Linkadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=link&link_id=" . $link_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Linkadded_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } *************** *** 189,197 **** if ( $this->auth_user[$cat_id]['auth_approval_edit'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Linkedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=link&link_id=" . $link_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Linkedited_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } --- 189,197 ---- if ( $this->auth_user[$cat_id]['auth_approval_edit'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Linkedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=link&link_id=" . $link_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Linkedited_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } *************** *** 312,316 **** $template->assign_vars( array( ! 'S_ADD_FILE_ACTION' => append_sid( $this->this_mxurl() ), 'LINK_CAT_NOT_ALLOW' => $lang['Cat_not_allow'], 'LINKS' => $lang['Links_Title'], --- 312,316 ---- $template->assign_vars( array( ! 'S_ADD_FILE_ACTION' => mx_append_sid( $this->this_mxurl() ), 'LINK_CAT_NOT_ALLOW' => $lang['Cat_not_allow'], 'LINKS' => $lang['Links_Title'], *************** *** 359,364 **** 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ) ) ); --- 359,364 ---- 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'U_INDEX' => mx_append_sid( 'index.' . $phpEx ), ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ) ) ); Index: link_jump.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_jump.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_jump.php 13 Aug 2006 19:43:51 -0000 1.2 --- link_jump.php 9 Sep 2007 20:09:03 -0000 1.3 *************** *** 92,96 **** if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=file&file_id=" . $link_id), true)); } */ --- 92,96 ---- if ( !$userdata['session_logged_in'] ) { ! mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=file&file_id=" . $link_id), true)); } */ Index: link_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_rate.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** link_rate.php 13 Aug 2006 19:43:51 -0000 1.13 --- link_rate.php 9 Sep 2007 20:09:04 -0000 1.14 *************** *** 66,70 **** { // $redirect = $this->this_mxurl("action=rate&link_id=$link_id"); ! // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); mx_message_die( GENERAL_MESSAGE, 'not logged in' ); } --- 66,70 ---- { // $redirect = $this->this_mxurl("action=rate&link_id=$link_id"); ! // redirect(mx_append_sid("login.$phpEx?redirect=" . $redirect, true)); mx_message_die( GENERAL_MESSAGE, 'not logged in' ); } *************** *** 76,82 **** 'L_RATE' => $lang['Rate'], ! 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'action=link&link_id=' . $link_id ) ), 'FILE_NAME' => $link_data['link_name'], --- 76,82 ---- 'L_RATE' => $lang['Rate'], ! 'U_INDEX' => mx_append_sid( 'index.' . $phpEx ), ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => mx_append_sid( $this->this_mxurl( 'action=link&link_id=' . $link_id ) ), 'FILE_NAME' => $link_data['link_name'], *************** *** 107,111 **** $cat_id = $link_data['link_catid']; ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? append_sid( $this->this_mxurl( "action=category&cat_id=$cat_id" ) ) : append_sid( $this->this_mxurl( "action=link&link_id=$link_id" ) ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 107,111 ---- $cat_id = $link_data['link_catid']; ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? mx_append_sid( $this->this_mxurl( "action=category&cat_id=$cat_id" ) ) : mx_append_sid( $this->this_mxurl( "action=link&link_id=$link_id" ) ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 115,119 **** $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( $this->this_mxurl( 'action=rate&link_id=' . $link_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], --- 115,119 ---- $template->assign_vars( array( ! 'S_RATE_ACTION' => mx_append_sid( $this->this_mxurl( 'action=rate&link_id=' . $link_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], Index: link_link.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_link.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** link_link.php 13 Aug 2006 19:43:51 -0000 1.9 --- link_link.php 9 Sep 2007 20:09:03 -0000 1.10 *************** *** 94,98 **** if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=file&link_id=" . $link_id), true)); } */ --- 94,98 ---- if ( !$userdata['session_logged_in'] ) { ! mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=file&link_id=" . $link_id), true)); } */ *************** *** 103,107 **** $template->assign_vars( array( ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'] )); --- 103,107 ---- $template->assign_vars( array( ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'] )); *************** *** 110,118 **** // Prepare link info to display them // =================================================== ! $link_time = create_date( $board_config['default_dateformat'], $link_data['link_time'], $board_config['board_timezone'] ); ! $link_update_time = ( $link_data['link_update_time'] ) ? create_date( $board_config['default_dateformat'], $link_data['link_update_time'], $board_config['board_timezone'] ) : $lang['never']; $link_author = trim( $link_data['link_creator'] ); ! $link_poster = ( $link_data['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $link_data['user_id'] ) . '">' : ''; $link_poster .= ( $link_data['user_id'] != ANONYMOUS ) ? $link_data['username'] : $lang['Guest']; $link_poster .= ( $link_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; --- 110,118 ---- // Prepare link info to display them // =================================================== ! $link_time = phpBB2::create_date( $board_config['default_dateformat'], $link_data['link_time'], $board_config['board_timezone'] ); ! $link_update_time = ( $link_data['link_update_time'] ) ? phpBB2::create_date( $board_config['default_dateformat'], $link_data['link_update_time'], $board_config['board_timezone'] ) : $lang['never']; $link_author = trim( $link_data['link_creator'] ); ! $link_poster = ( $link_data['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $link_data['user_id'] ) . '">' : ''; $link_poster .= ( $link_data['user_id'] != ANONYMOUS ) ? $link_data['username'] : $lang['Guest']; $link_poster .= ( $link_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; *************** *** 142,148 **** 'PIN_IMAGE' => $this->display_banner( $link_data ), ! 'U_JUMP' => append_sid( $this->this_mxurl( 'action=jump&link_id=' . $link_id ) ), ! 'U_DELETE' => append_sid( $this->this_mxurl( 'action=user_upload&do=delete&link_id=' . $link_id ) ), ! 'U_EDIT' => append_sid( $this->this_mxurl( 'action=user_upload&link_id=' . $link_id ) ), )); --- 142,148 ---- 'PIN_IMAGE' => $this->display_banner( $link_data ), ! 'U_JUMP' => mx_append_sid( $this->this_mxurl( 'action=jump&link_id=' . $link_id ) ), ! 'U_DELETE' => mx_append_sid( $this->this_mxurl( 'action=user_upload&do=delete&link_id=' . $link_id ) ), ! 'U_EDIT' => mx_append_sid( $this->this_mxurl( 'action=user_upload&link_id=' . $link_id ) ), )); *************** *** 187,191 **** // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( $this->this_mxurl( 'action=rate&link_id=' . $link_id ) ), )); } --- 187,191 ---- // 'RATE_IMG' => $rate_img, ! 'U_RATE' => mx_append_sid( $this->this_mxurl( 'action=rate&link_id=' . $link_id ) ), )); } Index: link_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_search.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** link_search.php 16 May 2007 19:38:07 -0000 1.14 --- link_search.php 9 Sep 2007 20:09:05 -0000 1.15 *************** *** 451,461 **** for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( $this->this_mxurl( 'action=category&cat_id=' . $searchset[$i]['cat_id'] ) ); ! $file_url = append_sid( $this->this_mxurl( 'action=link&link_id=' . $searchset[$i]['link_id'] ) ); // // Format the date for the given file // ! $date = create_date( $board_config['default_dateformat'], $searchset[$i]['link_time'], $board_config['board_timezone'] ); // --- 451,461 ---- for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = mx_append_sid( $this->this_mxurl( 'action=category&cat_id=' . $searchset[$i]['cat_id'] ) ); ! $file_url = mx_append_sid( $this->this_mxurl( 'action=link&link_id=' . $searchset[$i]['link_id'] ) ); // // Format the date for the given file // ! $date = phpBB2::create_date( $board_config['default_dateformat'], $searchset[$i]['link_time'], $board_config['board_timezone'] ); // *************** *** 473,477 **** }*/ ! $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $searchset[$i]['user_id'] ) . '">' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : $searchset[$i]['post_username'] . '(' . $lang['Guest'] . ')'; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; --- 473,477 ---- }*/ ! $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid( 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $searchset[$i]['user_id'] ) . '">' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : $searchset[$i]['post_username'] . '(' . $lang['Guest'] . ')'; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; *************** *** 488,492 **** 'DATE' => $date, 'FILE_DLS' => $searchset[$i]['link_hits'], ! 'L_RATING' => '<a href="' . append_sid( $this->this_mxurl( 'action=rate&link_id=' . $searchset[$i]['link_id'] ) ) . '">' . $lang['LinkRating'] . '</a>', 'RATING' => $rating, 'FILE_VOTES' => $searchset[$i]['total_votes'], --- 488,492 ---- 'DATE' => $date, 'FILE_DLS' => $searchset[$i]['link_hits'], ! 'L_RATING' => '<a href="' . mx_append_sid( $this->this_mxurl( 'action=rate&link_id=' . $searchset[$i]['link_id'] ) ) . '">' . $lang['LinkRating'] . '</a>', 'RATING' => $rating, 'FILE_VOTES' => $searchset[$i]['total_votes'], *************** *** 503,515 **** } } ! $base_url = append_sid( $this->this_mxurl( "action=search&search_id=$search_id" ) ); $template->assign_vars( array( ! 'PAGINATION' => generate_pagination( $base_url, $total_match_count, $linkdb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $linkdb_config['pagination'] ) + 1 ), ceil( $total_match_count / $linkdb_config['pagination'] ) ), 'LINKS' => $lang['Links_Title'], ! 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), --- 503,515 ---- } } ! $base_url = mx_append_sid( $this->this_mxurl( "action=search&search_id=$search_id" ) ); $template->assign_vars( array( ! 'PAGINATION' => phpBB2::generate_pagination( $base_url, $total_match_count, $linkdb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $linkdb_config['pagination'] ) + 1 ), ceil( $total_match_count / $linkdb_config['pagination'] ) ), 'LINKS' => $lang['Links_Title'], ! 'U_INDEX' => mx_append_sid( 'index.' . $phpEx ), ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), *************** *** 536,546 **** $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, 'LINKS' => $lang['Links_Title'], ! 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], --- 536,546 ---- $template->assign_vars( array( ! 'S_SEARCH_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, 'LINKS' => $lang['Links_Title'], ! 'U_INDEX' => mx_append_sid( 'index.' . $phpEx ), ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], Index: link_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_post_comment.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** link_post_comment.php 22 Jul 2007 22:38:25 -0000 1.3 --- link_post_comment.php 9 Sep 2007 20:09:04 -0000 1.4 *************** *** 70,74 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=post_comment&item_id=" . $item_id), true)); } --- 70,74 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=post_comment&item_id=" . $item_id), true)); } *************** *** 181,185 **** $this->_linkdb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "mode=article&k=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 181,185 ---- $this->_linkdb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "mode=article&k=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 198,202 **** $this->update_add_comment($link_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 198,202 ---- $this->update_add_comment($link_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 282,286 **** $template->assign_vars( array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'LINKS_STATUS' => $links_status, --- 282,286 ---- $template->assign_vars( array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . mx_append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'LINKS_STATUS' => $links_status, *************** *** 351,358 **** 'L_STYLES_TIP' => $lang['Styles_tip'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); --- 351,358 ---- 'L_STYLES_TIP' => $lang['Styles_tip'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => mx_append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => mx_append_sid( $this->this_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); Index: link_viewall.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_viewall.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** link_viewall.php 14 Aug 2006 10:46:48 -0000 1.12 --- link_viewall.php 9 Sep 2007 20:09:05 -0000 1.13 *************** *** 89,94 **** 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), ! 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'SEARCH_TYPE' => $sort_type, --- 89,94 ---- 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), ! 'U_INDEX' => mx_append_sid( 'index.' . $phpEx ), ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'SEARCH_TYPE' => $sort_type, Index: link_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_main.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** link_main.php 13 Aug 2006 19:43:51 -0000 1.11 --- link_main.php 9 Sep 2007 20:09:04 -0000 1.12 *************** *** 33,37 **** // $template->assign_vars( array( ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'], 'TREE' => $menu_output, --- 33,37 ---- // $template->assign_vars( array( ! 'U_LINK' => mx_append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'], 'TREE' => $menu_output, |