Menu
▾
▴
[mxbb-commits] mx_smartor/admin admin_album_auth.php, 1.15, 1.16 admin_album_cat.php, 1.13, 1.14 admin_album_cfg.php, 1.8, 1.9 admin_album_clearcache.php, 1.13, 1.14 admin_album_clown_SP.php, 1.17, 1.18 admin_album_config_personal.php, 1.4, 1.5 admin_album_ext.php, 1.3, 1.4 admin_album_otf.php, 1.2, 1.3 admin_album_personal.php, 1.13, 1.14
|
From: OryNider <ory...@us...> - 2008-03-13 08:36:29
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/admin Modified Files: admin_album_auth.php admin_album_cat.php admin_album_cfg.php admin_album_clearcache.php admin_album_clown_SP.php admin_album_config_personal.php admin_album_ext.php admin_album_otf.php admin_album_personal.php Log Message: upgrade version to 2.0.2 for core29x branch Index: admin_album_config_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config_personal.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_album_config_personal.php 8 Feb 2008 10:47:59 -0000 1.4 --- admin_album_config_personal.php 13 Mar 2008 08:35:53 -0000 1.5 *************** *** 9,18 **** */ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Album_Personal_Settings'] = "modules/mx_smartor/admin/" .$filename; return; } --- 9,105 ---- */ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE ! { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Album_Personal_Settings'] = $setmodules_admin_path . $filename; return; } *************** *** 21,63 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); ! define('ALBUM_MOD_PATH', 'album_mod/'); ! ! // Get general album information ! if (!isset($album_root_path) || empty($album_root_path)) { ! $album_root_path = $module_root_path . ALBUM_MOD_PATH . ''; ! } ! if (!isset($acp_prefix) || empty($acp_prefix)) ! { ! $acp_prefix = 'admin/'; } ! include_once($album_root_path . 'album_common.'.$phpEx); ! // require($module_root_path . 'album_mod/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); ! } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } --- 108,140 ---- // Let's set the root dir for phpBB // ! $album_root_path = $module_root_path . 'album_mod/'; require($mx_root_path . 'admin/pagestart.' . $phpEx); ! if ( !MXBB_MODULE ) { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); } ! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } *************** *** 101,105 **** $template->set_filenames(array( ! "body" => $acp_prefix . 'album_config_personal_body.tpl') ); --- 178,182 ---- $template->set_filenames(array( ! "body" => 'admin/album_config_personal_body.tpl') ); Index: admin_album_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_album_cfg.php 13 Mar 2008 03:43:40 -0000 1.8 --- admin_album_cfg.php 13 Mar 2008 08:35:53 -0000 1.9 *************** *** 9,18 **** */ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Configuration std'] = "modules/mx_smartor/admin/" .$filename; return; } --- 9,105 ---- */ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE ! { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Configuration std'] = $setmodules_admin_path . $filename; return; } *************** *** 21,48 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); ! require($module_root_path . 'album_mod/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } --- 108,149 ---- // Let's set the root dir for phpBB // ! $album_root_path = $module_root_path . 'album_mod/'; require($mx_root_path . 'admin/pagestart.' . $phpEx); ! ! if ( !MXBB_MODULE ) ! { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); ! } ! ! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } ! ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_main.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"); } Index: admin_album_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_album_auth.php 8 Feb 2008 10:47:59 -0000 1.15 --- admin_album_auth.php 13 Mar 2008 08:35:53 -0000 1.16 *************** *** 11,41 **** /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */ ! define( 'IN_PORTAL', 1 ); ! if ( !empty( $setmodules ) ) { ! $filename = basename( __FILE__ ); ! $module['Smartor_Album']['Permissions'] = "modules/mx_smartor/admin/" . $filename; return; } // Let's set the root dir for phpBB ! $module_root_path = './../'; ! $mx_root_path = './../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require( $mx_root_path . 'admin/pagestart.' . $phpEx ); ! include_once( $module_root_path . 'album_mod/album_common.' . $phpEx ); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } --- 11,142 ---- /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! ! ! if( !empty($setmodules) ) ! { ! $filename = basename(__FILE__); ! $module['Smartor_Album']['Permissions'] = $setmodules_admin_path . $filename; return; } + // // Let's set the root dir for phpBB + // + $album_root_path = $module_root_path . 'album_mod/'; + require($mx_root_path . 'admin/pagestart.' . $phpEx); ! if ( !MXBB_MODULE ) ! { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); ! } ! ! require($module_root_path . 'album_mod/album_common.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } Index: admin_album_clearcache.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_album_clearcache.php 8 Feb 2008 10:47:59 -0000 1.13 --- admin_album_clearcache.php 13 Mar 2008 08:35:53 -0000 1.14 *************** *** 9,18 **** */ ! define( 'IN_PORTAL', 1 ); if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Clear_Cache'] = "modules/mx_smartor/admin/" .$filename; return; } --- 9,105 ---- */ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE ! { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Clear_Cache'] = $setmodules_admin_path . $filename; return; } *************** *** 21,40 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); ! require($module_root_path . 'album_mod/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } --- 108,140 ---- // Let's set the root dir for phpBB // ! $album_root_path = $module_root_path . 'album_mod/'; require($mx_root_path . 'admin/pagestart.' . $phpEx); ! ! if ( !MXBB_MODULE ) ! { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); ! } ! ! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } Index: admin_album_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_ext.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_album_ext.php 8 Feb 2008 10:47:59 -0000 1.3 --- admin_album_ext.php 13 Mar 2008 08:35:53 -0000 1.4 *************** *** 18,49 **** } ! $mx_root_path = './../../../'; ! $module_root_path = "./../"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require( $mx_root_path . '/admin/pagestart.' . $phpEx ); ! ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); ! ! define('ALBUM_MOD_PATH', 'album_mod/'); ! ! // Get general album information ! if (!isset($album_root_path) || empty($album_root_path)) ! { ! $album_root_path = $module_root_path . ALBUM_MOD_PATH . ''; ! } - include_once($album_root_path . 'album_common.'.$phpEx); - // include_once( $module_root_path . 'album_mod/album_constants.'.$phpEx ); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } --- 18,40 ---- } ! // Let's set the root dir for phpBB ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $album_root_path = $module_root_path . 'album_mod/'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require($mx_root_path . 'admin/pagestart.' . $phpEx); ! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } Index: admin_album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_album_cat.php 8 Feb 2008 10:47:59 -0000 1.13 --- admin_album_cat.php 13 Mar 2008 08:35:53 -0000 1.14 *************** *** 20,29 **** ***************************************************************************/ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Categories'] = "modules/mx_smartor/admin/" .$filename; return; } --- 20,116 ---- ***************************************************************************/ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE ! { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Categories'] = $setmodules_admin_path . $filename; return; } *************** *** 32,77 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require( $mx_root_path . '/admin/pagestart.' . $phpEx ); ! ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); ! ! define('ALBUM_MOD_PATH', 'album_mod/'); ! // Get general album information ! if (!isset($album_root_path) || empty($album_root_path)) { ! $album_root_path = $module_root_path . ALBUM_MOD_PATH . ''; ! } ! if (!isset($acp_prefix) || empty($acp_prefix)) ! { ! $acp_prefix = 'admin/'; } ! ! include_once($album_root_path . 'album_common.'.$phpEx); ! // ********************************************************************** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } --- 119,160 ---- // Let's set the root dir for phpBB // ! $album_root_path = $module_root_path . 'album_mod/'; ! require($mx_root_path . 'admin/pagestart.' . $phpEx); ! if ( !MXBB_MODULE ) { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); } ! require($module_root_path . 'album_mod/album_common.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } ! ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_main.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"); } *************** *** 82,93 **** global $lang, $album_user_id, $phpEx; ! $message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } ! if( !isset($_POST['mode']) ) { ! if( !isset($_GET['action']) ) { album_read_tree(); --- 165,176 ---- global $lang, $album_user_id, $phpEx; ! $message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("../admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } ! if( !isset($HTTP_POST_VARS['mode']) ) { ! if( !isset($HTTP_GET_VARS['action']) ) { album_read_tree(); *************** *** 98,102 **** then go back to this template file $acp_prefix . 'album_cat_body.tpl'. */ ! $template->set_filenames(array('body' => $acp_prefix . 'album_cat_body.tpl')); $template->assign_vars(array( --- 181,185 ---- then go back to this template file $acp_prefix . 'album_cat_body.tpl'. */ ! $template->set_filenames(array('body' => 'admin/album_cat_body.tpl')); $template->assign_vars(array( *************** *** 127,133 **** else { ! if( $_GET['action'] == 'edit' ) { ! $cat_id = intval($_GET['cat_id']); $sql = "SELECT cat.*, cat2.cat_title AS cat_parent_title, cat2.cat_id AS cat_parent_id --- 210,216 ---- else { ! if( $HTTP_GET_VARS['action'] == 'edit' ) { ! $cat_id = intval($HTTP_GET_VARS['cat_id']); $sql = "SELECT cat.*, cat2.cat_title AS cat_parent_title, cat2.cat_id AS cat_parent_id *************** *** 148,152 **** $s_album_cat_list = album_get_tree_option($catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT); ! $template->set_filenames(array('body' => $acp_prefix . 'album_cat_new_body.tpl')); $template->assign_block_vars('acp', array( --- 231,235 ---- $s_album_cat_list = album_get_tree_option($catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT); ! $template->set_filenames(array('body' => 'admin/album_cat_new_body.tpl')); $template->assign_block_vars('acp', array( *************** *** 236,242 **** include($mx_root_path . 'admin/page_footer_admin.'.$phpEx); } ! elseif( $_GET['action'] == 'delete' ) { ! $cat_id = intval($_GET['cat_id']); $sql = "SELECT cat_id, cat_title, cat_order --- 319,325 ---- include($mx_root_path . 'admin/page_footer_admin.'.$phpEx); } ! elseif( $HTTP_GET_VARS['action'] == 'delete' ) { ! $cat_id = intval($HTTP_GET_VARS['cat_id']); $sql = "SELECT cat_id, cat_title, cat_order *************** *** 271,275 **** $select_to .= '</select>'; ! $template->set_filenames(array('body' => $acp_prefix . 'album_cat_delete_body.tpl')); $template->assign_vars(array( --- 354,358 ---- $select_to .= '</select>'; ! $template->set_filenames(array('body' => 'admin/album_cat_delete_body.tpl')); $template->assign_vars(array( *************** *** 289,296 **** include($mx_root_path . 'admin/page_footer_admin.'.$phpEx); } ! elseif( $_GET['action'] == 'move' ) { ! $cat_id = intval($_GET['cat_id']); ! $move = intval($_GET['move']); album_move_tree($cat_id, $move); --- 372,379 ---- include($mx_root_path . 'admin/page_footer_admin.'.$phpEx); } ! elseif( $HTTP_GET_VARS['action'] == 'move' ) { ! $cat_id = intval($HTTP_GET_VARS['cat_id']); ! $move = intval($HTTP_GET_VARS['move']); album_move_tree($cat_id, $move); *************** *** 303,322 **** else { ! if( $_POST['mode'] == 'new' ) { ! if ( is_array($_POST['addcategory'])) { ! list($cat_id) = each($_POST['addcategory']); ! $cat_title = stripslashes($_POST['name'][$cat_id]); $cat_parent = $cat_id; $cat_id = -1; } ! if( !isset($_POST['cat_title']) ) { album_read_tree(); $s_album_cat_list = album_get_tree_option($cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL); ! $template->set_filenames(array('body' => $acp_prefix . 'album_cat_new_body.tpl')); $template->assign_vars(array( --- 386,405 ---- else { ! if( $HTTP_POST_VARS['mode'] == 'new' ) { ! if ( is_array($HTTP_POST_VARS['addcategory'])) { ! list($cat_id) = each($HTTP_POST_VARS['addcategory']); ! $cat_title = stripslashes($HTTP_POST_VARS['name'][$cat_id]); $cat_parent = $cat_id; $cat_id = -1; } ! if( !isset($HTTP_POST_VARS['cat_title']) ) { album_read_tree(); $s_album_cat_list = album_get_tree_option($cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL); ! $template->set_filenames(array('body' => 'admin/album_cat_new_body.tpl')); $template->assign_vars(array( *************** *** 376,396 **** if( !get_magic_quotes_gpc() ) { ! $cat_title = addslashes(htmlspecialchars(trim($_POST['cat_title']))); ! $cat_desc = addslashes(trim($_POST['cat_desc'])); } else { ! $cat_title = htmlspecialchars(trim($_POST['cat_title'])); ! $cat_desc = trim($_POST['cat_desc']); } ! $cat_wm = trim($_POST['cat_wm']); ! $view_level = intval($_POST['cat_view_level']); ! $upload_level = intval($_POST['cat_upload_level']); ! $rate_level = intval($_POST['cat_rate_level']); ! $comment_level = intval($_POST['cat_comment_level']); ! $edit_level = intval($_POST['cat_edit_level']); ! $delete_level = intval($_POST['cat_delete_level']); ! $cat_approval = intval($_POST['cat_approval']); ! $cat_parent = ($_POST['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($_POST['cat_parent_id']); $cat_parent = ($cat_parent < 0) ? 0 : $cat_parent; --- 459,479 ---- if( !get_magic_quotes_gpc() ) { ! $cat_title = addslashes(htmlspecialchars(trim($HTTP_POST_VARS['cat_title']))); ! $cat_desc = addslashes(trim($HTTP_POST_VARS['cat_desc'])); } else { ! $cat_title = htmlspecialchars(trim($HTTP_POST_VARS['cat_title'])); ! $cat_desc = trim($HTTP_POST_VARS['cat_desc']); } ! $cat_wm = trim($HTTP_POST_VARS['cat_wm']); ! $view_level = intval($HTTP_POST_VARS['cat_view_level']); ! $upload_level = intval($HTTP_POST_VARS['cat_upload_level']); ! $rate_level = intval($HTTP_POST_VARS['cat_rate_level']); ! $comment_level = intval($HTTP_POST_VARS['cat_comment_level']); ! $edit_level = intval($HTTP_POST_VARS['cat_edit_level']); ! $delete_level = intval($HTTP_POST_VARS['cat_delete_level']); ! $cat_approval = intval($HTTP_POST_VARS['cat_approval']); ! $cat_parent = ($HTTP_POST_VARS['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($HTTP_POST_VARS['cat_parent_id']); $cat_parent = ($cat_parent < 0) ? 0 : $cat_parent; *************** *** 420,446 **** } } ! elseif( $_POST['mode'] == 'edit' ) { // Get posting variables ! $cat_id = intval($_GET['cat_id']); if( !get_magic_quotes_gpc() ) { ! $cat_title = addslashes(htmlspecialchars(trim($_POST['cat_title']))); ! $cat_desc = addslashes(trim($_POST['cat_desc'])); } else { ! $cat_title = htmlspecialchars(trim($_POST['cat_title'])); ! $cat_desc = trim($_POST['cat_desc']); } ! $cat_wm = trim($_POST['cat_wm']); ! $view_level = intval($_POST['cat_view_level']); ! $upload_level = intval($_POST['cat_upload_level']); ! $rate_level = intval($_POST['cat_rate_level']); ! $comment_level = intval($_POST['cat_comment_level']); ! $edit_level = intval($_POST['cat_edit_level']); ! $delete_level = intval($_POST['cat_delete_level']); ! $cat_approval = intval($_POST['cat_approval']); ! $cat_parent = ($_POST['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($_POST['cat_parent_id']); $cat_parent = ($cat_parent < 0) ? 0 : $cat_parent; --- 503,529 ---- } } ! elseif( $HTTP_POST_VARS['mode'] == 'edit' ) { // Get posting variables ! $cat_id = intval($HTTP_GET_VARS['cat_id']); if( !get_magic_quotes_gpc() ) { ! $cat_title = addslashes(htmlspecialchars(trim($HTTP_POST_VARS['cat_title']))); ! $cat_desc = addslashes(trim($HTTP_POST_VARS['cat_desc'])); } else { ! $cat_title = htmlspecialchars(trim($HTTP_POST_VARS['cat_title'])); ! $cat_desc = trim($HTTP_POST_VARS['cat_desc']); } ! $cat_wm = trim($HTTP_POST_VARS['cat_wm']); ! $view_level = intval($HTTP_POST_VARS['cat_view_level']); ! $upload_level = intval($HTTP_POST_VARS['cat_upload_level']); ! $rate_level = intval($HTTP_POST_VARS['cat_rate_level']); ! $comment_level = intval($HTTP_POST_VARS['cat_comment_level']); ! $edit_level = intval($HTTP_POST_VARS['cat_edit_level']); ! $delete_level = intval($HTTP_POST_VARS['cat_delete_level']); ! $cat_approval = intval($HTTP_POST_VARS['cat_approval']); ! $cat_parent = ($HTTP_POST_VARS['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($HTTP_POST_VARS['cat_parent_id']); $cat_parent = ($cat_parent < 0) ? 0 : $cat_parent; *************** *** 468,472 **** showResultMessage($lang['Category_updated']); } ! elseif( $_POST['mode'] == 'delete' ) { $parent_cat_deleted = false; --- 551,555 ---- showResultMessage($lang['Category_updated']); } ! elseif( $HTTP_POST_VARS['mode'] == 'delete' ) { $parent_cat_deleted = false; *************** *** 474,479 **** $parent_cat_title = ""; ! $cat_id = intval($_GET['cat_id']); ! $target = intval($_POST['target']); if( $target == ALBUM_JUMPBOX_DELETE ) // Delete All --- 557,562 ---- $parent_cat_title = ""; ! $cat_id = intval($HTTP_GET_VARS['cat_id']); ! $target = intval($HTTP_POST_VARS['target']); if( $target == ALBUM_JUMPBOX_DELETE ) // Delete All Index: admin_album_otf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_otf.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_album_otf.php 5 Feb 2008 03:51:29 -0000 1.2 --- admin_album_otf.php 13 Mar 2008 08:35:53 -0000 1.3 *************** *** 20,62 **** ***************************************************************************/ ! define( 'IN_PORTAL', 1 ); ! if ( !empty( $setmodules ) ) { ! $file = basename( __FILE__ ); ! $module['Smartor_Album']['Configuration otf'] = 'modules/mx_smartor/admin/' . $file; ! return; } ! $mx_root_path = './../../../'; ! $module_root_path = "./../"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require( $mx_root_path . '/admin/pagestart.' . $phpEx ); ! // Start session management ! $mx_user->init($user_ip, PAGE_INDEX); ! // End session management ! define('ALBUM_MOD_PATH', 'album_mod/'); ! // Get general album information ! if (!isset($album_root_path) || empty($album_root_path)) { ! $album_root_path = $module_root_path . ALBUM_MOD_PATH . ''; } ! include_once($album_root_path . 'album_common.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } --- 20,160 ---- ***************************************************************************/ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } } + else + { + define( 'IN_PORTAL', 1 ); + define( 'MXBB_MODULE', true ); ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; + $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! ! if( !empty($setmodules) ) { ! $filename = basename(__FILE__); ! $module['Smartor_Album']['Configuration otf'] = $setmodules_admin_path . $filename; ! return; } ! // ! // Let's set the root dir for phpBB ! // ! $album_root_path = $module_root_path . 'album_mod/'; ! require($mx_root_path . 'admin/pagestart.' . $phpEx); ! ! if ( !MXBB_MODULE ) ! { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); ! } ! ! require($module_root_path . 'album_mod/album_common.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); ! } ! ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx")) ! { ! include($album_root_path . "language/lang_english/lang_main.$phpEx"); ! } ! else ! { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"); } *************** *** 288,292 **** */ ! $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); if ( ($upload_pics == true) && ($cat_to_upload > 0) ) --- 386,390 ---- */ ! $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); if ( ($upload_pics == true) && ($cat_to_upload > 0) ) Index: admin_album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_album_personal.php 8 Feb 2008 10:47:59 -0000 1.13 --- admin_album_personal.php 13 Mar 2008 08:35:53 -0000 1.14 *************** *** 9,18 **** */ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Personal_Galleries'] = "modules/mx_smartor/admin/" .$filename; return; } --- 9,105 ---- */ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE ! { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Personal_Galleries'] = $setmodules_admin_path . $filename; return; } *************** *** 21,67 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); ! define('ALBUM_MOD_PATH', 'album_mod/'); ! ! // Get general album information ! if (!isset($album_root_path) || empty($album_root_path)) { ! $album_root_path = $module_root_path . ALBUM_MOD_PATH . ''; ! } ! if (!isset($acp_prefix) || empty($acp_prefix)) ! { ! $acp_prefix = 'admin/'; } ! include_once($album_root_path . 'album_common.'.$phpEx); ! // require($module_root_path . 'album_mod/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } --- 108,149 ---- // Let's set the root dir for phpBB // ! $album_root_path = $module_root_path . 'album_mod/'; require($mx_root_path . 'admin/pagestart.' . $phpEx); ! if ( !MXBB_MODULE ) { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); } ! require($module_root_path . 'album_mod/album_common.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } ! ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_main.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"); } Index: admin_album_clown_SP.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clown_SP.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_album_clown_SP.php 13 Mar 2008 03:43:40 -0000 1.17 --- admin_album_clown_SP.php 13 Mar 2008 08:35:53 -0000 1.18 *************** *** 9,18 **** */ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Configuration adv'] = "modules/mx_smartor/admin/" .$filename; return; } --- 9,105 ---- */ ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE ! { ! define('MXBB_MODULE', false); ! define('IN_PHPBB', true); ! ! $phpbb_root_path = $module_root_path = './../'; ! $mx_mod_path = $phpbb_root_path . 'mx_mod/'; ! ! require_once($mx_mod_path . "includes/functions_required.$phpEx"); ! ! @define('IN_PORTAL', true); ! ! //Check if forum_hack is installed ! if (!isset($mx_root_path)) ! { ! $mx_root_path = './../'; ! ! include_once($mx_mod_path . "includes/mx_constants.$phpEx"); ! include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); ! } ! ! require_once($mx_mod_path . "includes/functions_core.$phpEx"); ! ! //Check for cash mod ! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) ! { ! define('IN_CASHMOD', true); ! } ! ! //@ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //error_reporting(E_ALL & ~E_NOTICE); ! ! define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;) ! ! // ! // Instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! ! // ! // instatiate the mx_request_vars class ! // ! $mx_request_vars = new mx_request_vars(); ! ! ! // ! // instatiate the mx_user class ! // ! //$mx_user = new mx_user(); ! ! // ! // Left Pane Paths ! // ! $setmodules_admin_path = ''; ! $setmodules_module_path = "./../"; ! ! if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2 ! { ! define('PORTAL_BACKEND', 'phpbb2'); ! $tplEx = 'tpl'; ! } ! else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3 ! { ! define('PORTAL_BACKEND', 'phpbb3'); ! $tplEx = 'html'; ! } ! } ! else ! { ! define( 'IN_PORTAL', 1 ); ! define( 'MXBB_MODULE', true ); ! ! // ! // Main paths ! // ! $mx_root_path = './../../../'; ! $module_root_path = './../../../modules/mx_smartor/'; ! ! $setmodules_admin_path = 'modules/mx_smartor/admin/'; ! ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! } ! if( !empty($setmodules) ) { $filename = basename(__FILE__); ! $module['Smartor_Album']['Configuration adv'] = $setmodules_admin_path . $filename; return; } *************** *** 21,48 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); ! require($module_root_path . 'album_mod/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); ! } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } --- 108,140 ---- // Let's set the root dir for phpBB // ! $album_root_path = $module_root_path . 'album_mod/'; require($mx_root_path . 'admin/pagestart.' . $phpEx); ! ! if ( !MXBB_MODULE ) ! { ! require_once($mx_mod_path . "includes/functions_styles.$phpEx"); ! ! $mx_user = new mx_user(); // instatiate the mx_user class ! ! // ! // Define basic constants ! // ! $mx_user->page_id = 1; ! $mx_user->user_ip = $user_ip; ! $mx_user->_init_userprefs(); ! } ! ! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx); // ********************************************************************** // Read language definition // ********************************************************************** ! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx")) { ! include($album_root_path . "language/lang_english/lang_admin.$phpEx"); } ! else { ! include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); } |