Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2029 Modified Files: Tag: core28x db_install.php db_upgrade.php dload.php dload_lists.php dload_mini.php dload_quickdl.php Log Message: Updated, sync with phpBB2 standalone usage Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_upgrade.php,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -C2 -d -r1.25 -r1.25.2.1 *** db_upgrade.php 22 Jul 2007 21:06:29 -0000 1.25 --- db_upgrade.php 15 Feb 2008 23:53:11 -0000 1.25.2.1 *************** *** 259,261 **** echo "</table><br />"; ! ?> --- 259,261 ---- echo "</table><br />"; ! ?> \ No newline at end of file Index: dload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -C2 -d -r1.23.2.1 -r1.23.2.2 *** dload.php 28 Jan 2008 03:11:06 -0000 1.23.2.1 --- dload.php 15 Feb 2008 23:53:11 -0000 1.23.2.2 *************** *** 11,106 **** $phpEx = substr(strrchr(__FILE__, '.'), 1); ! if ( @file_exists("./viewtopic.$phpEx") ) // -------------------------------------------- phpBB MOD MODE { ! if ( file_exists("./modcp.$phpEx") ) { ! define('PORTAL_BACKEND', 'phpbb2'); ! define( 'MXBB_MODULE', false ); ! define( 'IN_PHPBB', true ); ! define( 'IN_PORTAL', true ); ! define( 'IN_DOWNLOAD', true ); ! // When run as a phpBB mod these paths are identical ;) ! $phpbb_root_path = $module_root_path = $mx_root_path = './'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! $tplEx = 'tpl'; ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! include( $phpbb_root_path . 'common.' . $phpEx ); ! @ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); - include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx ); - include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx ); - - define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;) // Start session management $userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD ); init_userprefs( $userdata ); - // End session management - // - // Instatiate the mx_cache class - // - $mx_cache = new mx_cache(); - // - // Get mxBB config settings - // - $portal_config = $mx_cache->obtain_mxbb_config(); - // - // instatiate the mx_request_vars class - // - $mx_request_vars = new mx_request_vars(); - - $is_block = false; } ! else if ( @file_exists("./mcp.$phpEx") ) { define('PORTAL_BACKEND', 'phpbb3'); - define( 'MXBB_MODULE', false ); - define( 'IN_PHPBB', true ); - define( 'IN_PORTAL', true ); - define( 'IN_DOWNLOAD', true ); - $tplEx = 'html'; - // When run as a phpBB mod these paths are identical ;) - $phpbb_root_path = $module_root_path = $mx_root_path = './'; - $mx_mod_path = $phpbb_root_path . 'mx_mod/'; - - //Check for cash mod - if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) - { - define('IN_CASHMOD', true); - } - - include( $phpbb_root_path . 'common.' . $phpEx ); - - // - // ERROR HANDLING - // - @ini_set( 'display_errors', '1' ); - //error_reporting( E_ALL ); - error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); - include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx ); - include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx ); - - define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;) // --- 11,80 ---- $phpEx = substr(strrchr(__FILE__, '.'), 1); ! if ( !defined('PORTAL_BACKEND') && @file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE { + define( 'MXBB_MODULE', false ); + define( 'IN_PHPBB', true ); + define( 'IN_PORTAL', true ); + define( 'IN_DOWNLOAD', true ); ! // When run as a phpBB mod these paths are identical ;) ! $phpbb_root_path = $module_root_path = $mx_root_path = './'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) { ! define('IN_CASHMOD', true); ! } ! include( $phpbb_root_path . 'common.' . $phpEx ); ! @ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx ); ! include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx ); ! define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // Get mxBB config settings ! // ! $portal_config = $mx_cache->obtain_mxbb_config(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! $is_block = false; ! ! if ( file_exists("./modcp.$phpEx") ) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management $userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD ); init_userprefs( $userdata ); // End session management } ! else if ( @file_exists("./mcp.$phpEx") ) // phpBB3 { define('PORTAL_BACKEND', 'phpbb3'); $tplEx = 'html'; //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); // *************** *** 118,138 **** // $board_config = $config; - - // - // Instatiate the mx_cache class - // - $mx_cache = new mx_cache(); - - // - // Get mxBB config settings - // - $portal_config = $mx_cache->obtain_mxbb_config(); - - // - // instatiate the mx_request_vars class - // - $mx_request_vars = new mx_request_vars(); - - $is_block = false; } else --- 92,95 ---- *************** *** 185,191 **** $title = $mx_block->block_info['block_title']; $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' ); ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) { define('IN_CASHMOD', true); --- 142,148 ---- $title = $mx_block->block_info['block_title']; $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' ); ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) { define('IN_CASHMOD', true); *************** *** 195,199 **** global $images; } ! define( 'MXBB_27x', @file_exists($mx_root_path . "mx_login.$phpEx") ); } --- 152,156 ---- global $images; } ! define( 'MXBB_27x', @file_exists( $mx_root_path . 'mx_login.'.$phpEx ) ); } *************** *** 210,231 **** $mx_script_name = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $mx_script_name_temp ) ); - // =================================================== // Include the common file // =================================================== include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); - $pafiledb_template->destroy(); // =================================================== // Get action variable otherwise set it to the main // =================================================== ! if ( !MXBB_MODULE ) ! { ! $action = ( isset( $_REQUEST['action'] ) ) ? htmlspecialchars( $_REQUEST['action'] ) : 'main'; ! } ! else ! { ! $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, 'main'); ! } // =================================================== --- 167,179 ---- $mx_script_name = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $mx_script_name_temp ) ); // =================================================== // Include the common file // =================================================== include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); // =================================================== // Get action variable otherwise set it to the main // =================================================== ! $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, 'main'); // =================================================== *************** *** 294,297 **** } } - ?> \ No newline at end of file --- 242,244 ---- Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -C2 -d -r1.31 -r1.31.2.1 *** db_install.php 22 Jul 2007 21:06:29 -0000 1.31 --- db_install.php 15 Feb 2008 23:53:11 -0000 1.31.2.1 *************** *** 335,339 **** // Notifications ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify', 'pm')", // pm_notify "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify_group', '0')", // NEW --- 335,339 ---- // Notifications ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify', '0')", // pm_notify "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify_group', '0')", // NEW *************** *** 368,370 **** echo "</table><br />"; ! ?> --- 368,370 ---- echo "</table><br />"; ! ?> \ No newline at end of file Index: dload_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_mini.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** dload_mini.php 13 Aug 2006 19:44:45 -0000 1.2 --- dload_mini.php 15 Feb 2008 23:53:11 -0000 1.2.2.1 *************** *** 47,51 **** // =================================================== include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); - $pafiledb_template->destroy(); // =================================================== --- 47,50 ---- Index: dload_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_lists.php,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -d -r1.24 -r1.24.2.1 *** dload_lists.php 13 Aug 2006 19:44:45 -0000 1.24 --- dload_lists.php 15 Feb 2008 23:53:11 -0000 1.24.2.1 *************** *** 50,54 **** // =================================================== include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); - $pafiledb_template->destroy(); // =================================================== --- 50,53 ---- Index: dload_quickdl.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_quickdl.php,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** dload_quickdl.php 13 Aug 2006 19:44:45 -0000 1.14 --- dload_quickdl.php 15 Feb 2008 23:53:11 -0000 1.14.2.1 *************** *** 47,51 **** // =================================================== include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); - $pafiledb_template->destroy(); // =================================================== --- 47,50 ---- |