Menu
▾
▴
[mxbb-commits] mx_pafiledb/pafiledb/modules pa_category.php, 1.20, 1.21 pa_download.php, 1.22, 1.23 pa_email.php, 1.18, 1.19 pa_file.php, 1.23, 1.24 pa_license.php, 1.20, 1.21 pa_lists.php, 1.4, 1.5 pa_mcp.php, 1.17, 1.18 pa_mini.php, 1.6, 1.7 pa_post_comment.php, 1.23, 1.24 pa_quickdl.php, 1.15, 1.16 pa_rate.php, 1.19, 1.20 pa_search.php, 1.22, 1.23 pa_stats.php, 1.24, 1.25 pa_toplist.php, 1.24, 1.25 pa_user_upload.php, 1.25, 1.26
|
From: Jon O. <jon...@us...> - 2008-02-15 22:15:23
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23098/modules Modified Files: pa_category.php pa_download.php pa_email.php pa_file.php pa_license.php pa_lists.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_user_upload.php Log Message: Updated, sync with phpBB2 standalone usage Trailing newlines Bad globals Index: pa_download.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_download.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pa_download.php 9 Sep 2007 20:16:18 -0000 1.22 --- pa_download.php 15 Feb 2008 22:15:15 -0000 1.23 *************** *** 27,32 **** function main( $action ) { ! global $_REQUEST, $lang, $db, $pafiledb_user, $pafiledb_config, $board_config, $phpEx, $userdata; ! global $phpbb_root_path, $_SERVER, $pafiledb_functions; global $mx_script_name, $module_root_path; --- 27,32 ---- function main( $action ) { ! global $lang, $db, $pafiledb_user, $pafiledb_config, $board_config, $phpEx, $userdata; ! global $phpbb_root_path, $pafiledb_functions; global $mx_script_name, $module_root_path; *************** *** 34,44 **** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } --- 34,58 ---- // Read language definition // ********************************************************************** ! if ( !MXBB_MODULE ) { ! if ( !file_exists( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) ! { ! include( $module_root_path . 'pafiledb/language/lang_english/lang_main.' . $phpEx ); ! } ! else ! { ! include( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); ! } } else { ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); ! } ! else ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); ! } } *************** *** 145,149 **** if ( !empty( $mirrors_data ) && !$mirror_id ) { - global $template; global $template, $db, $theme, $gen_simple_header, $starttime; --- 159,162 ---- Index: pa_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_post_comment.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pa_post_comment.php 28 Jan 2008 21:57:10 -0000 1.23 --- pa_post_comment.php 15 Feb 2008 22:15:15 -0000 1.24 *************** *** 27,33 **** 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; global $mx_block, $theme; --- 27,33 ---- function main( $action ) { ! global $template, $pafiledb_functions, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; 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, $mx_request_vars; global $mx_block, $theme; Index: pa_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_user_upload.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** pa_user_upload.php 9 Sep 2007 20:16:20 -0000 1.25 --- pa_user_upload.php 15 Feb 2008 22:15:16 -0000 1.26 *************** *** 29,33 **** 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; // ======================================================= --- 29,33 ---- 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, $mx_request_vars; // ======================================================= Index: pa_file.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_file.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pa_file.php 9 Sep 2007 20:16:19 -0000 1.23 --- pa_file.php 15 Feb 2008 22:15:15 -0000 1.24 *************** *** 27,33 **** 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; // ======================================================= --- 27,33 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $images; global $phpbb_root_path, $userdata, $db, $pafiledb_functions; ! global $mx_root_path, $module_root_path, $is_block, $mx_request_vars; // ======================================================= *************** *** 128,131 **** --- 128,142 ---- $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; + if ( !MXBB_MODULE ) + { + $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; + $server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])); + $server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : ''; + $script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])); + $false_phpbb_url = $server_protocol . $server_name . $server_port . '/'; + $false_phpbb_path = './'; + $file_screenshot_url = str_replace($false_phpbb_url . $false_phpbb_path, PORTAL_URL, $file_screenshot_url); + } + $template->assign_vars( array( 'L_CLICK_HERE' => $lang['Click_here'], Index: pa_license.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_license.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pa_license.php 9 Sep 2007 20:16:19 -0000 1.20 --- pa_license.php 15 Feb 2008 22:15:15 -0000 1.21 *************** *** 28,33 **** { 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; if ( isset( $_REQUEST['license_id'] ) ) --- 28,32 ---- { global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; ! global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $page_id; if ( isset( $_REQUEST['license_id'] ) ) Index: pa_mcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_mcp.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pa_mcp.php 9 Sep 2007 20:16:19 -0000 1.17 --- pa_mcp.php 15 Feb 2008 22:15:15 -0000 1.18 *************** *** 28,32 **** { 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; --- 28,32 ---- { global $db, $lang, $userdata, $board_config, $phpEx, $images, $debug; ! global $mx_root_path, $phpbb_root_path, $module_root_path, $is_block; global $pafiledb_functions, $template, $pafiledb_config; Index: pa_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_category.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pa_category.php 9 Sep 2007 20:16:18 -0000 1.20 --- pa_category.php 15 Feb 2008 22:15:15 -0000 1.21 *************** *** 28,32 **** { global $template, $lang, $phpEx, $pafiledb_config, $userdata; ! global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; // ======================================================= --- 28,32 ---- { global $template, $lang, $phpEx, $pafiledb_config, $userdata; ! global $mx_root_path, $module_root_path, $is_block, $mx_request_vars; // ======================================================= Index: pa_email.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_email.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pa_email.php 9 Sep 2007 20:16:18 -0000 1.18 --- pa_email.php 15 Feb 2008 22:15:15 -0000 1.19 *************** *** 28,33 **** { 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; if ( isset( $_REQUEST['file_id'] ) ) --- 28,32 ---- { global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; ! global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block; if ( isset( $_REQUEST['file_id'] ) ) Index: pa_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_lists.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pa_lists.php 9 Sep 2007 20:16:19 -0000 1.4 --- pa_lists.php 15 Feb 2008 22:15:15 -0000 1.5 *************** *** 28,32 **** { 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; --- 28,32 ---- { global $template, $lang, $phpEx, $pafiledb_config, $userdata; ! global $mx_root_path, $module_root_path, $is_block, $mx_request_vars; global $toplist_page_id, $toplist_config; Index: pa_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_search.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pa_search.php 9 Sep 2007 20:16:20 -0000 1.22 --- pa_search.php 15 Feb 2008 22:15:15 -0000 1.23 *************** *** 28,33 **** { 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; if ( !$this->auth_global['auth_search'] ) --- 28,33 ---- { global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; ! global $phpbb_root_path, $userdata; ! global $mx_root_path, $module_root_path, $is_block; if ( !$this->auth_global['auth_search'] ) Index: pa_quickdl.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_quickdl.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pa_quickdl.php 28 Jan 2008 21:57:10 -0000 1.15 --- pa_quickdl.php 15 Feb 2008 22:15:15 -0000 1.16 *************** *** 27,32 **** 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; // ======================================================= --- 27,32 ---- function main( $action ) { ! global $template, $lang, $phpEx, $pafiledb_config, $userdata; ! global $mx_root_path, $module_root_path, $is_block, $pafiledb_quickdl, $page_id; // ======================================================= Index: pa_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_rate.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pa_rate.php 9 Sep 2007 20:16:20 -0000 1.19 --- pa_rate.php 15 Feb 2008 22:15:15 -0000 1.20 *************** *** 29,33 **** 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; // ======================================================= --- 29,33 ---- 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, $mx_request_vars; // ======================================================= Index: pa_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_mini.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pa_mini.php 9 Sep 2007 20:16:19 -0000 1.6 --- pa_mini.php 15 Feb 2008 22:15:15 -0000 1.7 *************** *** 28,32 **** { 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; --- 28,32 ---- { global $template, $lang, $phpEx, $pafiledb_config, $userdata; ! global $mx_root_path, $module_root_path, $is_block, $mx_request_vars, $mini_config; global $page_id; Index: pa_toplist.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_toplist.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pa_toplist.php 9 Sep 2007 20:16:20 -0000 1.24 --- pa_toplist.php 15 Feb 2008 22:15:16 -0000 1.25 *************** *** 28,33 **** { 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; if ( !$this->auth_global['auth_toplist'] ) --- 28,33 ---- { global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; ! global $phpbb_root_path, $userdata; ! global $mx_root_path, $module_root_path, $is_block; if ( !$this->auth_global['auth_toplist'] ) Index: pa_stats.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_stats.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pa_stats.php 9 Sep 2007 20:16:20 -0000 1.24 --- pa_stats.php 15 Feb 2008 22:15:16 -0000 1.25 *************** *** 27,33 **** function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $db, $images; ! global $_REQUEST, $phpbb_root_path, $userdata; ! global $mx_root_path, $module_root_path, $is_block, $phpEx; if ( !$this->auth_global['auth_stats'] ) --- 27,33 ---- function main( $action ) { ! global $template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; ! global $phpbb_root_path, $userdata; ! global $mx_root_path, $module_root_path, $is_block; if ( !$this->auth_global['auth_stats'] ) |
