Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23199/modules Modified Files: pa_category.php pa_download.php pa_email.php pa_file.php pa_license.php pa_lists.php pa_main.php pa_mcp.php pa_mini.php pa_post_comment.php pa_quickdl.php pa_rate.php pa_search.php pa_stats.php pa_toplist.php pa_ucp.php pa_user_upload.php pa_viewall.php Log Message: for 2.9.x Index: pa_viewall.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_viewall.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pa_viewall.php 13 Aug 2006 19:44:46 -0000 1.20 --- pa_viewall.php 9 Sep 2007 20:16:20 -0000 1.21 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $phpEx, $pafiledb_config, $userdata; $start = ( isset( $_REQUEST['start'] ) ) ? intval( $_REQUEST['start'] ) : 0; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $phpEx, $pafiledb_config, $userdata; $start = ( isset( $_REQUEST['start'] ) ) ? intval( $_REQUEST['start'] ) : 0; *************** *** 86,90 **** if ( !$userdata['session_logged_in'] ) { ! redirect( append_sid( "login.$phpEx?redirect=dload.$phpEx?action=viewall", true ) ); } --- 86,90 ---- if ( !$userdata['session_logged_in'] ) { ! mx_redirect( mx_append_sid( "login.$phpEx?redirect=dload.$phpEx?action=viewall", true ) ); } *************** *** 93,102 **** } ! $pafiledb_template->assign_vars( array( 'L_VIEWALL' => $lang['Viewall'], 'L_INDEX' => "<<", ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'] --- 93,102 ---- } ! $template->assign_vars( array( 'L_VIEWALL' => $lang['Viewall'], 'L_INDEX' => "<<", ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'] Index: pa_download.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_download.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pa_download.php 22 Feb 2007 10:12:06 -0000 1.21 --- pa_download.php 9 Sep 2007 20:16:18 -0000 1.22 *************** *** 78,82 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=download&file_id=" . $file_id), true)); } --- 78,82 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=download&file_id=" . $file_id), true)); } *************** *** 145,152 **** if ( !empty( $mirrors_data ) && !$mirror_id ) { ! global $pafiledb_template; global $template, $db, $theme, $gen_simple_header, $starttime; ! $pafiledb_template->assign_vars( array( 'L_INDEX' => "<<", 'L_MIRRORS' => $lang['Mirrors'], --- 145,152 ---- if ( !empty( $mirrors_data ) && !$mirror_id ) { ! global $template; global $template, $db, $theme, $gen_simple_header, $starttime; ! $template->assign_vars( array( 'L_INDEX' => "<<", 'L_MIRRORS' => $lang['Mirrors'], *************** *** 154,159 **** 'L_DOWNLOAD' => $lang['Download_file'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], --- 154,159 ---- 'L_DOWNLOAD' => $lang['Download_file'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => mx_append_sid( $this->this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], *************** *** 161,166 **** )); ! $pafiledb_template->assign_block_vars( 'mirror_row', array( ! 'U_DOWNLOAD' => append_sid( $$this->this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=-1' ) ), 'MIRROR_LOCATION' => $board_config['sitename'] )); --- 161,166 ---- )); ! $template->assign_block_vars( 'mirror_row', array( ! 'U_DOWNLOAD' => mx_append_sid( $$this->this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=-1' ) ), 'MIRROR_LOCATION' => $board_config['sitename'] )); *************** *** 168,173 **** foreach( $mirrors_data as $mir_id => $mirror_data ) { ! $pafiledb_template->assign_block_vars( 'mirror_row', array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=' . $mir_id ) ), 'MIRROR_LOCATION' => $mirror_data['mirror_location'] )); --- 168,173 ---- foreach( $mirrors_data as $mir_id => $mirror_data ) { ! $template->assign_block_vars( 'mirror_row', array( ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=' . $mir_id ) ), 'MIRROR_LOCATION' => $mirror_data['mirror_location'] )); Index: pa_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_post_comment.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pa_post_comment.php 13 Aug 2006 19:44:45 -0000 1.21 --- pa_post_comment.php 9 Sep 2007 20:16:19 -0000 1.22 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $pafiledb_functions, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata, $_POST; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; --- 27,31 ---- function main( $action ) { ! global $template, $pafiledb_functions, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata, $_POST; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 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)); } *************** *** 183,187 **** $this->_pafiledb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 183,187 ---- $this->_pafiledb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=file&file_id=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 200,204 **** $this->update_add_comment($file_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( 'action=file&file_id=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 200,204 ---- $this->update_add_comment($file_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( 'action=file&file_id=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 228,234 **** } ! //$pafiledb_template->set_filenames( array( 'preview' => 'pa_post_preview.tpl' ) ); ! $pafiledb_template->assign_vars( array( 'L_PREVIEW' => $lang['Preview'], 'PREVIEW' => true, --- 228,234 ---- } ! //$template->set_filenames( array( 'preview' => 'pa_post_preview.tpl' ) ); ! $template->assign_vars( array( 'L_PREVIEW' => $lang['Preview'], 'PREVIEW' => true, *************** *** 276,282 **** // Output the data to the template // ! $pafiledb_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, --- 276,282 ---- // Output the data to the template // ! $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, *************** *** 347,355 **** '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( 'action=file&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); --- 347,355 ---- '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( 'action=file&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); Index: pa_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_user_upload.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pa_user_upload.php 5 Aug 2007 22:09:09 -0000 1.24 --- pa_user_upload.php 9 Sep 2007 20:16:20 -0000 1.25 *************** *** 28,32 **** { global $pafiledb_config, $board_config, $phpbb_root_path; ! global $pafiledb_template, $db, $lang, $userdata, $user_ip, $phpEx, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; --- 28,32 ---- { global $pafiledb_config, $board_config, $phpbb_root_path; ! global $template, $db, $lang, $userdata, $user_ip, $phpEx, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 149,153 **** $this->delete_items( $file_id ); $this->_pafiledb(); ! $message = $lang['Filedeleted'] . '<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 ); } --- 149,153 ---- $this->delete_items( $file_id ); $this->_pafiledb(); ! $message = $lang['Filedeleted'] . '<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 ); } *************** *** 175,183 **** if ( $this->auth_user[$cat_id]['auth_approval'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Fileadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $file_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Fileadded_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } --- 175,183 ---- if ( $this->auth_user[$cat_id]['auth_approval'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Fileadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=file&file_id=" . $file_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Fileadded_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } *************** *** 200,208 **** if ( $this->auth_user[$cat_id]['auth_approval_edit'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Fileedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $file_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Fileedited_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } --- 200,208 ---- if ( $this->auth_user[$cat_id]['auth_approval_edit'] || $this->auth_user[$cat_id]['auth_mod'] ) { ! $message = $lang['Fileedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=file&file_id=" . $file_id ) ) . '">', '</a>' ); } else { ! $message = $lang['Fileedited_not_validated'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "action=category&cat_id=" . $cat_id ) ) . '">', '</a>' ); } *************** *** 313,318 **** $s_hidden_fields .= '<input type="hidden" name="action" value="user_upload">'; ! $pafiledb_template->assign_vars( array( ! 'S_ADD_FILE_ACTION' => append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'], --- 313,318 ---- $s_hidden_fields .= '<input type="hidden" name="action" value="user_upload">'; ! $template->assign_vars( array( ! 'S_ADD_FILE_ACTION' => mx_append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'], *************** *** 384,388 **** 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'MODE' => $mode, ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ) )); --- 384,388 ---- 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'MODE' => $mode, ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ) )); Index: pa_ucp.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_ucp.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pa_ucp.php 13 Aug 2006 19:44:46 -0000 1.6 --- pa_ucp.php 9 Sep 2007 20:16:20 -0000 1.7 *************** *** 28,32 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $debug; return false; } --- 28,32 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $debug; return false; } Index: pa_file.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_file.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pa_file.php 13 Aug 2006 19:44:45 -0000 1.22 --- pa_file.php 9 Sep 2007 20:16:19 -0000 1.23 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; global $phpbb_root_path, $userdata, $db, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; global $phpbb_root_path, $userdata, $db, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 94,98 **** if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=file&file_id=" . $file_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&file_id=" . $file_id), true)); } */ *************** *** 101,109 **** } ! $pafiledb_template->assign_vars( array( 'L_INDEX' => "<<", ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], --- 101,109 ---- } ! $template->assign_vars( array( 'L_INDEX' => "<<", ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => mx_append_sid( $this->this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], *************** *** 114,132 **** // Prepare file info to display them // =================================================== ! $file_time = create_date( $board_config['default_dateformat'], $file_data['file_time'], $board_config['board_timezone'] ); ! $file_last_download = ( $file_data['file_last'] ) ? create_date( $board_config['default_dateformat'], $file_data['file_last'], $board_config['board_timezone'] ) : $lang['never']; ! $file_update_time = ( $file_data['file_update_time'] ) ? create_date( $board_config['default_dateformat'], $file_data['file_update_time'], $board_config['board_timezone'] ) : $lang['never']; $file_author = trim( $file_data['file_creator'] ); $file_version = trim( $file_data['file_version'] ); $file_screenshot_url = trim( $file_data['file_ssurl'] ); $file_website_url = trim( $file_data['file_docsurl'] ); ! $file_download_link = ( $file_data['file_license'] > 0 ) ? append_sid( $this->this_mxurl( 'action=license&license_id=' . $file_data['file_license'] . '&file_id=' . $file_id ) ) : append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_id, 1 ) ); $file_size = $pafiledb_functions->get_file_size( $file_id, $file_data ); ! $file_poster = ( $file_data['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $file_data['user_id'] ) . '">' : ''; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? $file_data['username'] : $lang['Guest']; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $pafiledb_template->assign_vars( array( 'L_CLICK_HERE' => $lang['Click_here'], 'L_AUTHOR' => $lang['Creator'], --- 114,132 ---- // Prepare file info to display them // =================================================== ! $file_time = phpBB2::create_date( $board_config['default_dateformat'], $file_data['file_time'], $board_config['board_timezone'] ); ! $file_last_download = ( $file_data['file_last'] ) ? phpBB2::create_date( $board_config['default_dateformat'], $file_data['file_last'], $board_config['board_timezone'] ) : $lang['never']; ! $file_update_time = ( $file_data['file_update_time'] ) ? phpBB2::create_date( $board_config['default_dateformat'], $file_data['file_update_time'], $board_config['board_timezone'] ) : $lang['never']; $file_author = trim( $file_data['file_creator'] ); $file_version = trim( $file_data['file_version'] ); $file_screenshot_url = trim( $file_data['file_ssurl'] ); $file_website_url = trim( $file_data['file_docsurl'] ); ! $file_download_link = ( $file_data['file_license'] > 0 ) ? mx_append_sid( $this->this_mxurl( 'action=license&license_id=' . $file_data['file_license'] . '&file_id=' . $file_id ) ) : mx_append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_id, 1 ) ); $file_size = $pafiledb_functions->get_file_size( $file_id, $file_data ); ! $file_poster = ( $file_data['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $file_data['user_id'] ) . '">' : ''; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? $file_data['username'] : $lang['Guest']; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $template->assign_vars( array( 'L_CLICK_HERE' => $lang['Click_here'], 'L_AUTHOR' => $lang['Creator'], *************** *** 176,183 **** 'U_DOWNLOAD' => $file_download_link, ! 'U_DELETE' => append_sid( $this->this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id ) ), ! 'U_EDIT' => append_sid( $this->this_mxurl( 'action=user_upload&file_id=' . $file_id ) ), ! 'U_EMAIL' => append_sid( $this->this_mxurl( 'action=email&file_id=' . $file_id ) ) )); --- 176,183 ---- 'U_DOWNLOAD' => $file_download_link, ! 'U_DELETE' => mx_append_sid( $this->this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id ) ), ! 'U_EDIT' => mx_append_sid( $this->this_mxurl( 'action=user_upload&file_id=' . $file_id ) ), ! 'U_EMAIL' => mx_append_sid( $this->this_mxurl( 'action=email&file_id=' . $file_id ) ) )); *************** *** 198,202 **** } ! $pafiledb_template->assign_block_vars( 'use_ratings', array( 'L_RATING' => $lang['DlRating'], 'L_RATE' => $lang['Rate'], --- 198,202 ---- } ! $template->assign_block_vars( 'use_ratings', array( 'L_RATING' => $lang['DlRating'], 'L_RATE' => $lang['Rate'], *************** *** 209,213 **** // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( $this->this_mxurl( 'action=rate&file_id=' . $file_id ) ), )); } --- 209,213 ---- // 'RATE_IMG' => $rate_img, ! 'U_RATE' => mx_append_sid( $this->this_mxurl( 'action=rate&file_id=' . $file_id ) ), )); } Index: pa_license.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_license.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pa_license.php 13 Aug 2006 19:44:45 -0000 1.19 --- pa_license.php 9 Sep 2007 20:16:19 -0000 1.20 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; global $_REQUEST, $phpbb_root_path; global $mx_root_path, $module_root_path, $is_block, $page_id, $phpEx; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; global $_REQUEST, $phpbb_root_path; global $mx_root_path, $module_root_path, $is_block, $page_id, $phpEx; *************** *** 69,73 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . 'login.'.$phpEx.'?redirect='.$this->this_mxurl('action=license&license_id=' . $license_id . '&file_id=' . $file_id), true)); } --- 69,73 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . 'login.'.$phpEx.'?redirect='.$this->this_mxurl('action=license&license_id=' . $license_id . '&file_id=' . $file_id), true)); } *************** *** 92,96 **** $db->sql_freeresult( $result ); ! $pafiledb_template->assign_vars( array( 'L_INDEX' => "<<", 'L_LICENSE' => $lang['License'], --- 92,96 ---- $db->sql_freeresult( $result ); ! $template->assign_vars( array( 'L_INDEX' => "<<", 'L_LICENSE' => $lang['License'], *************** *** 99,106 **** 'L_NOT_AGREE' => $lang['Dontagree'], ! '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( 'action=file&file_id=' . $file_id ) ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_id, 1 ) ), 'LE_NAME' => $license['license_name'], --- 99,106 ---- 'L_NOT_AGREE' => $lang['Dontagree'], ! '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( 'action=file&file_id=' . $file_id ) ), ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_id, 1 ) ), 'LE_NAME' => $license['license_name'], Index: pa_mcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_mcp.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pa_mcp.php 13 Aug 2006 19:44:45 -0000 1.16 --- pa_mcp.php 9 Sep 2007 20:16:19 -0000 1.17 *************** *** 29,33 **** global $db, $lang, $userdata, $board_config, $phpEx, $images, $debug; global $mx_root_path, $phpbb_root_path, $module_root_path, $is_block, $phpEx; ! global $pafiledb_functions, $pafiledb_template, $pafiledb_config; $cat_id = ( isset( $_REQUEST['cat_id'] ) ) ? intval( $_REQUEST['cat_id'] ) : 0; --- 29,33 ---- global $db, $lang, $userdata, $board_config, $phpEx, $images, $debug; global $mx_root_path, $phpbb_root_path, $module_root_path, $is_block, $phpEx; ! global $pafiledb_functions, $template, $pafiledb_config; $cat_id = ( isset( $_REQUEST['cat_id'] ) ) ? intval( $_REQUEST['cat_id'] ) : 0; *************** *** 275,279 **** } ! $pafiledb_template->set_filenames( array( 'admin' => $template_item ) ); if ($mode == 'cat') --- 275,279 ---- } ! $template->set_filenames( array( 'admin' => $template_item ) ); if ($mode == 'cat') *************** *** 282,293 **** } ! $pafiledb_template->assign_vars( array( 'DOWNLOAD' => $pafiledb_config['module_name'], // Module specific ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), // Module specific '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" ) ) )); --- 282,293 ---- } ! $template->assign_vars( array( 'DOWNLOAD' => $pafiledb_config['module_name'], // Module specific ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), // Module specific '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" ) ) )); *************** *** 482,486 **** $cat_list .= '</select>'; ! $pafiledb_template->assign_vars( array( 'L_EDIT' => $lang['Editfile'], 'L_DELETE' => $lang['Delete'], --- 482,486 ---- $cat_list .= '</select>'; ! $template->assign_vars( array( 'L_EDIT' => $lang['Editfile'], 'L_DELETE' => $lang['Delete'], *************** *** 495,499 **** '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, $pafiledb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_num / $pafiledb_config['pagination'] ) ), --- 495,499 ---- '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, $pafiledb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_num / $pafiledb_config['pagination'] ) ), *************** *** 519,523 **** } ! $pafiledb_template->assign_block_vars( 'mcp_mode', array( 'L_MODE' => $data['lang_var'], 'DATA' => ( isset( $data['row_set'] ) ) ? true : false, --- 519,523 ---- } ! $template->assign_block_vars( 'mcp_mode', array( 'L_MODE' => $data['lang_var'], 'DATA' => ( isset( $data['row_set'] ) ) ? true : false, *************** *** 533,543 **** { $approve_mode = ( $item_data['file_approved'] ) ? 'do_unapprove' : 'do_approve'; ! $pafiledb_template->assign_block_vars( 'mcp_mode.row', array( 'NAME' => $item_data['file_name'], 'NUMBER' => $i++, 'ID' => $item_data['file_id'], ! 'U_EDIT' => append_sid( $this->this_mxurl( "action=user_upload&mode_mcp=edit&file_id={$item_data['file_id']}" ) ), ! 'U_DELETE' => append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=do_delete&id={$item_data['file_id']}" ) ), ! 'U_APPROVE' => append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=$approve_mode&id={$item_data['file_id']}" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), 'L_APPROVE' => ( $item_data['file_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ); --- 533,543 ---- { $approve_mode = ( $item_data['file_approved'] ) ? 'do_unapprove' : 'do_approve'; ! $template->assign_block_vars( 'mcp_mode.row', array( 'NAME' => $item_data['file_name'], 'NUMBER' => $i++, 'ID' => $item_data['file_id'], ! 'U_EDIT' => mx_append_sid( $this->this_mxurl( "action=user_upload&mode_mcp=edit&file_id={$item_data['file_id']}" ) ), ! 'U_DELETE' => mx_append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=do_delete&id={$item_data['file_id']}" ) ), ! 'U_APPROVE' => mx_append_sid( $this->this_mxurl( "action=mcp&mode_mcp=$mode&do_mode=$approve_mode&id={$item_data['file_id']}" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), 'L_APPROVE' => ( $item_data['file_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ); *************** *** 553,557 **** $this->update_add_item_notify($itemId, $mode_notification); ! $pafiledb_template->assign_vars( array( 'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '' ) ); $this->display( $lang['MCP'], $template_item ); --- 553,557 ---- $this->update_add_item_notify($itemId, $mode_notification); ! $template->assign_vars( array( 'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '' ) ); $this->display( $lang['MCP'], $template_item ); Index: pa_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_category.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pa_category.php 13 Aug 2006 19:44:45 -0000 1.19 --- pa_category.php 9 Sep 2007 20:16:18 -0000 1.20 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $phpEx, $pafiledb_config, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $phpEx, $pafiledb_config, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 112,116 **** 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)); } --- 112,116 ---- 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)); } *************** *** 136,141 **** } ! $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'] ) ); --- 136,141 ---- } ! $template->assign_vars( array( ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'] ) ); Index: pa_email.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_email.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pa_email.php 13 Aug 2006 19:44:45 -0000 1.17 --- pa_email.php 9 Sep 2007 20:16:18 -0000 1.18 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; global $_REQUEST, $_POST, $phpbb_root_path; global $mx_root_path, $module_root_path, $is_block, $phpEx; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; global $_REQUEST, $_POST, $phpbb_root_path; global $mx_root_path, $module_root_path, $is_block, $phpEx; *************** *** 60,64 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=email&file_id=" . $file_id), true)); } --- 60,64 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=email&file_id=" . $file_id), true)); } *************** *** 171,175 **** $emailer->reset(); ! $message = $lang['Econf'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( 'action=file&id=' . $file_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . append_sid( $mx_root_path . 'index.' . $phpEx ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 171,175 ---- $emailer->reset(); ! $message = $lang['Econf'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'action=file&id=' . $file_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . mx_append_sid( $mx_root_path . 'index.' . $phpEx ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 181,187 **** } ! $pafiledb_template->assign_vars( array( 'USER_LOGGED' => ( !$userdata['session_logged_in'] ) ? true : false, ! 'S_EMAIL_ACTION' => append_sid( $this->this_mxurl() ), 'S_HIDDEN_FIELDS' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />', --- 181,187 ---- } ! $template->assign_vars( array( 'USER_LOGGED' => ( !$userdata['session_logged_in'] ) ? true : false, ! 'S_EMAIL_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_HIDDEN_FIELDS' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />', *************** *** 201,207 **** 'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'], ! '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( 'action=file&file_id=' . $file_id ) ), 'FILE_NAME' => $file_data['file_name'], --- 201,207 ---- 'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'], ! '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( 'action=file&file_id=' . $file_id ) ), 'FILE_NAME' => $file_data['file_name'], Index: pa_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_lists.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pa_lists.php 12 Sep 2006 19:31:37 -0000 1.3 --- pa_lists.php 9 Sep 2007 20:16:19 -0000 1.4 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $phpEx, $pafiledb_config, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; global $toplist_page_id, $toplist_config; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $phpEx, $pafiledb_config, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; global $toplist_page_id, $toplist_config; *************** *** 132,145 **** $pafiledb_config['pagination'] = $tmp_pag; ! $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_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, 'pa_start'), )); if ($toplist_config['toplist_use_pagination'] == 'TRUE') { ! $pafiledb_template->assign_block_vars( "toplist_pagination", array()); } --- 132,145 ---- $pafiledb_config['pagination'] = $tmp_pag; ! $template->assign_vars( array( ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_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, 'pa_start'), )); if ($toplist_config['toplist_use_pagination'] == 'TRUE') { ! $template->assign_block_vars( "toplist_pagination", array()); } Index: pa_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_main.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pa_main.php 13 Aug 2006 19:44:45 -0000 1.18 --- pa_main.php 9 Sep 2007 20:16:19 -0000 1.19 *************** *** 27,37 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $debug, $phpbb_root_path; // // Assign vars // ! $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'], 'TREE' => $menu_output --- 27,37 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $debug, $phpbb_root_path; // // Assign vars // ! $template->assign_vars( array( ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'], 'TREE' => $menu_output Index: pa_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_search.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pa_search.php 16 May 2007 19:41:22 -0000 1.21 --- pa_search.php 9 Sep 2007 20:16:20 -0000 1.22 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; global $_REQUEST, $_POST, $phpbb_root_path, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; global $_REQUEST, $_POST, $phpbb_root_path, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx; *************** *** 35,39 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=stats"), true)); } --- 35,39 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=stats"), true)); } *************** *** 518,531 **** $l_search_matches = ( $total_match_count == 1 ) ? sprintf( $lang['Found_search_match'], $total_match_count ) : sprintf( $lang['Found_search_matches'], $total_match_count ); ! $pafiledb_template->assign_vars( array( 'L_SEARCH_MATCHES' => $l_search_matches ) ); 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=file&file_id=' . $searchset[$i]['file_id'] ) ); // =================================================== // Format the date for the given file // =================================================== ! $date = create_date( $board_config['default_dateformat'], $searchset[$i]['file_time'], $board_config['board_timezone'] ); // =================================================== // Get rating for the file and format it --- 518,531 ---- $l_search_matches = ( $total_match_count == 1 ) ? sprintf( $lang['Found_search_match'], $total_match_count ) : sprintf( $lang['Found_search_matches'], $total_match_count ); ! $template->assign_vars( array( 'L_SEARCH_MATCHES' => $l_search_matches ) ); 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=file&file_id=' . $searchset[$i]['file_id'] ) ); // =================================================== // Format the date for the given file // =================================================== ! $date = phpBB2::create_date( $board_config['default_dateformat'], $searchset[$i]['file_time'], $board_config['board_timezone'] ); // =================================================== // Get rating for the file and format it *************** *** 559,567 **** } ! $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $searchset[$i]['user_id'] ) . '">' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : $lang['Guest']; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $pafiledb_template->assign_block_vars( 'searchresults', array( 'CAT_NAME' => $searchset[$i]['cat_name'], 'FILE_NEW_IMAGE' => $images['pa_file_new'], --- 559,567 ---- } ! $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $searchset[$i]['user_id'] ) . '">' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : $lang['Guest']; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $template->assign_block_vars( 'searchresults', array( 'CAT_NAME' => $searchset[$i]['cat_name'], 'FILE_NEW_IMAGE' => $images['pa_file_new'], *************** *** 579,591 **** ); } ! $base_url = append_sid( $this->this_mxurl( "action=search&search_id=$search_id" ) ); ! $pafiledb_template->assign_vars( array( ! 'PAGINATION' => generate_pagination( $base_url, $total_match_count, $pafiledb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_match_count / $pafiledb_config['pagination'] ) ), 'L_MODULE' => $pafiledb_config['module_name'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_INDEX' => "<<", --- 579,591 ---- ); } ! $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, $pafiledb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_match_count / $pafiledb_config['pagination'] ) ), 'L_MODULE' => $pafiledb_config['module_name'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'L_INDEX' => "<<", *************** *** 611,622 **** $dropmenu = $this->generate_jumpbox(); ! $pafiledb_template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, 'L_MODULE' => $pafiledb_config['module_name'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], --- 611,622 ---- $dropmenu = $this->generate_jumpbox(); ! $template->assign_vars( array( ! 'S_SEARCH_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, 'L_MODULE' => $pafiledb_config['module_name'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], Index: pa_quickdl.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_quickdl.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pa_quickdl.php 15 Aug 2006 19:08:33 -0000 1.13 --- pa_quickdl.php 9 Sep 2007 20:16:19 -0000 1.14 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $phpEx, $pafiledb_config, $_REQUEST, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $pafiledb_quickdl, $page_id; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $phpEx, $pafiledb_config, $_REQUEST, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $pafiledb_quickdl, $page_id; *************** *** 141,145 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("actionqdl=category&cat_id=" . $cat_id), true)); } --- 141,145 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("actionqdl=category&cat_id=" . $cat_id), true)); } *************** *** 168,173 **** //$map_xtra = !empty( $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] ) ? '&dynamic_block=' . $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] : ''; ! $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl( 'actionqdl=quickdl&cat_id=' . $pafiledb_quickdl['pa_quick_cat'] . $map_xtra ) ), 'DOWNLOAD' => $quickdl['cat_name'], 'BACK' => $quickdl_back --- 168,173 ---- //$map_xtra = !empty( $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] ) ? '&dynamic_block=' . $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] : ''; ! $template->assign_vars( array( ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl( 'actionqdl=quickdl&cat_id=' . $pafiledb_quickdl['pa_quick_cat'] . $map_xtra ) ), 'DOWNLOAD' => $quickdl['cat_name'], 'BACK' => $quickdl_back Index: pa_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_rate.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pa_rate.php 13 Aug 2006 19:44:45 -0000 1.18 --- pa_rate.php 9 Sep 2007 20:16:20 -0000 1.19 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata; global $phpbb_root_path, $pafiledb_user, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata; global $phpbb_root_path, $pafiledb_user, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 63,67 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=rate&file_id=" . $file_id), true)); } --- 63,67 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=rate&file_id=" . $file_id), true)); } *************** *** 70,80 **** } ! $pafiledb_template->assign_vars( array( 'L_INDEX' => "<<", 'L_RATE' => $lang['Rate'], ! '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( 'action=file&file_id=' . $file_id ) ), 'FILE_NAME' => $file_data['file_name'], --- 70,80 ---- } ! $template->assign_vars( array( 'L_INDEX' => "<<", 'L_RATE' => $lang['Rate'], ! '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( 'action=file&file_id=' . $file_id ) ), 'FILE_NAME' => $file_data['file_name'], *************** *** 99,103 **** $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 99,103 ---- $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 106,111 **** $rate_info = str_replace( "{filename}", $file_data['file_name'], $lang['Rateinfo'] ); ! $pafiledb_template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( $this->this_mxurl( 'action=rate&file_id=' . $file_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], --- 106,111 ---- $rate_info = str_replace( "{filename}", $file_data['file_name'], $lang['Rateinfo'] ); ! $template->assign_vars( array( ! 'S_RATE_ACTION' => mx_append_sid( $this->this_mxurl( 'action=rate&file_id=' . $file_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], Index: pa_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_mini.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pa_mini.php 2 Jun 2007 19:47:06 -0000 1.5 --- pa_mini.php 9 Sep 2007 20:16:19 -0000 1.6 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $phpEx, $pafiledb_config, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars, $mini_config; global $page_id; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $phpEx, $pafiledb_config, $userdata; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars, $mini_config; global $page_id; *************** *** 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)); } *************** *** 101,106 **** } ! $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'], --- 101,106 ---- } ! $template->assign_vars( array( ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'DOWNLOAD' => $pafiledb_config['module_name'], *************** *** 108,113 **** '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'), )); --- 108,113 ---- '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: pa_toplist.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_toplist.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pa_toplist.php 16 May 2007 19:41:22 -0000 1.23 --- pa_toplist.php 9 Sep 2007 20:16:20 -0000 1.24 *************** *** 27,31 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; global $phpbb_root_path, $userdata, $db; global $mx_root_path, $module_root_path, $is_block, $phpEx; --- 27,31 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; global $phpbb_root_path, $userdata, $db; global $mx_root_path, $module_root_path, $is_block, $phpEx; *************** *** 35,39 **** if ( !$userdata['session_logged_in'] ) { ! redirect( append_sid( "login.$phpEx?redirect=dload.$phpEx?action=stats", true ) ); } --- 35,39 ---- if ( !$userdata['session_logged_in'] ) { ! mx_redirect( mx_append_sid( "login.$phpEx?redirect=dload.$phpEx?action=stats", true ) ); } *************** *** 61,72 **** } ! $pafiledb_template->assign_vars( array( 'DOWNLOAD' => $pafiledb_config['module_name'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), ! 'U_NEWEST_FILE' => append_sid( $this->this_mxurl( 'action=toplist&mode=newest' ) ), ! 'U_MOST_POPULAR' => append_sid( $this->this_mxurl( 'action=toplist&mode=downloads' ) ), ! 'U_TOP_RATED' => append_sid( $this->this_mxurl( 'action=toplist&mode=rating' ) ), 'L_CURRENT_TOPLIST' => $l_current_toplist, --- 61,72 ---- } ! $template->assign_vars( array( 'DOWNLOAD' => $pafiledb_config['module_name'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), ! 'U_NEWEST_FILE' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=newest' ) ), ! 'U_MOST_POPULAR' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=downloads' ) ), ! 'U_TOP_RATED' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=rating' ) ), 'L_CURRENT_TOPLIST' => $l_current_toplist, *************** *** 126,130 **** } ! $pafiledb_template->assign_vars( array( 'IS_NEWEST' => true, 'FILE_DATE' => ( empty( $selected_date ) ) ? true : false, --- 126,130 ---- } ! $template->assign_vars( array( 'IS_NEWEST' => true, 'FILE_DATE' => ( empty( $selected_date ) ) ? true : false, *************** *** 142,148 **** 'L_NEW_FILES' => sprintf( $lang['New_Files'], $days ), ! 'U_ONE_WEEK' => append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=7' ) ), ! 'U_TWO_WEEK' => append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=14' ) ), ! 'U_30_DAYS' => append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=30' ) ) ) ); --- 142,148 ---- 'L_NEW_FILES' => sprintf( $lang['New_Files'], $days ), ! 'U_ONE_WEEK' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=7' ) ), ! 'U_TWO_WEEK' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=14' ) ), ! 'U_30_DAYS' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=30' ) ) ) ); *************** *** 163,168 **** } ! $pafiledb_template->assign_block_vars( 'files_date', array( ! 'U_DATES' => append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=7&selected_date=' . $day_time ) ), 'DATES' => date( 'F d, Y', $day_time ), 'TOTAL_DOWNLOADS' => $file_num ) --- 163,168 ---- } ! $template->assign_block_vars( 'files_date', array( ! 'U_DATES' => mx_append_sid( $this->this_mxurl( 'action=toplist&mode=newest&days=7&selected_date=' . $day_time ) ), 'DATES' => date( 'F d, Y', $day_time ), 'TOTAL_DOWNLOADS' => $file_num ) *************** *** 172,176 **** else { ! $pafiledb_template->assign_vars( array( 'FILE_LIST' => true, --- 172,176 ---- else { ! $template->assign_vars( array( 'FILE_LIST' => true, *************** *** 258,268 **** for ( $i = 0; $i < count( $file_rowset ); $i++ ) { ! $cat_url = append_sid( $this->this_mxurl( 'action=category&cat_id=' . $file_rowset[$i]['file_catid'] ) ); ! $file_url = append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_rowset[$i]['file_id'] ) ); // =================================================== // Format the date for the given file // =================================================== ! $date = create_date( $board_config['default_dateformat'], $file_rowset[$i]['file_time'], $board_config['board_timezone'] ); ! $date_updated = create_date( $board_config['default_dateformat'], $file_rowset[$i]['file_update_time'], $board_config['board_timezone'] ); // =================================================== // Get rating for the file and format it --- 258,268 ---- for ( $i = 0; $i < count( $file_rowset ); $i++ ) { ! $cat_url = mx_append_sid( $this->this_mxurl( 'action=category&cat_id=' . $file_rowset[$i]['file_catid'] ) ); ! $file_url = mx_append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_rowset[$i]['file_id'] ) ); // =================================================== // Format the date for the given file // =================================================== ! $date = phpBB2::create_date( $board_config['default_dateformat'], $file_rowset[$i]['file_time'], $board_config['board_timezone'] ); ! $date_updated = phpBB2::create_date( $board_config['default_dateformat'], $file_rowset[$i]['file_update_time'], $board_config['board_timezone'] ); // =================================================== // Get rating for the file and format it *************** *** 298,302 **** } ! $poster = ( $file_rowset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $file_rowset[$i]['user_id'] ) . '">' : ''; $poster .= ( $file_rowset[$i]['user_id'] != ANONYMOUS ) ? $file_rowset[$i]['username'] : $lang['Guest']; $poster .= ( $file_rowset[$i]['user_id'] != ANONYMOUS ... [truncated message content] |