Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11633 Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.php admin_mx_gen_cache.php admin_mx_meta.php admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php admin_mx_phpinfo.php admin_mx_portal.php admin_mx_preview.php admin_mx_smilies.php admin_mx_styles.php admin_mx_words.php index.php index_jon.php index_new.php index_ory.php index_test.php page_header_admin.php pagestart.php Log Message: Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_phpinfo.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_mx_phpinfo.php 11 Feb 2008 11:45:44 -0000 1.14 --- admin_mx_phpinfo.php 17 Jun 2013 02:53:26 -0000 1.15 *************** *** 19,23 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 19,23 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** admin_mx_chkobjs.php 11 Feb 2008 11:27:26 -0000 1.28 --- admin_mx_chkobjs.php 17 Jun 2013 02:53:26 -0000 1.29 *************** *** 22,26 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 22,26 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: index_test.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_test.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index_test.php 17 Jun 2013 00:32:11 -0000 1.2 --- index_test.php 17 Jun 2013 02:53:26 -0000 1.3 *************** *** 18,22 **** // Security and Page header // ! define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); --- 18,22 ---- // Security and Page header // ! @define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** admin_mx_page_cp.php 29 Dec 2011 05:51:52 -0000 1.37 --- admin_mx_page_cp.php 17 Jun 2013 02:53:26 -0000 1.38 *************** *** 20,24 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 20,24 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_mx_module_cp.php 31 Oct 2008 19:02:20 -0000 1.26 --- admin_mx_module_cp.php 17 Jun 2013 02:53:26 -0000 1.27 *************** *** 19,23 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 19,23 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** index.php 17 Jun 2013 00:32:11 -0000 1.62 --- index.php 17 Jun 2013 02:53:26 -0000 1.63 *************** *** 18,22 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 18,22 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); *************** *** 287,292 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // END ! "L_WELCOME" => $lang['Welcome_mxBB'], ! "L_ADMIN_INTRO" => $lang['Admin_intro_mxBB'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], --- 287,292 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // END ! "L_WELCOME" => $lang['Welcome_Mx-Publisher'], ! "L_ADMIN_INTRO" => $lang['Admin_intro_Mx-Publisher'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** page_header_admin.php 17 Jun 2013 00:32:11 -0000 1.31 --- page_header_admin.php 17 Jun 2013 02:53:26 -0000 1.32 *************** *** 60,66 **** $template->set_filenames(array('header' => 'admin/page_header.tpl')); - // // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility - // $l_timezone = explode('.', $board_config['board_timezone']); $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; --- 60,64 ---- *************** *** 88,131 **** // These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file ! /* ! 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'], ! 'T_BODY_BACKGROUND' => $theme['body_background'], ! 'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'], ! 'T_BODY_TEXT' => '#'.$theme['body_text'], ! 'T_BODY_LINK' => '#'.$theme['body_link'], ! 'T_BODY_VLINK' => '#'.$theme['body_vlink'], ! 'T_BODY_ALINK' => '#'.$theme['body_alink'], ! 'T_BODY_HLINK' => '#'.$theme['body_hlink'], ! 'T_TR_COLOR1' => '#'.$theme['tr_color1'], ! 'T_TR_COLOR2' => '#'.$theme['tr_color2'], ! 'T_TR_COLOR3' => '#'.$theme['tr_color3'], ! 'T_TR_CLASS1' => $theme['tr_class1'], ! 'T_TR_CLASS2' => $theme['tr_class2'], ! 'T_TR_CLASS3' => $theme['tr_class3'], ! 'T_TH_COLOR1' => '#'.$theme['th_color1'], ! 'T_TH_COLOR2' => '#'.$theme['th_color2'], ! 'T_TH_COLOR3' => '#'.$theme['th_color3'], ! 'T_TH_CLASS1' => $theme['th_class1'], ! 'T_TH_CLASS2' => $theme['th_class2'], ! 'T_TH_CLASS3' => $theme['th_class3'], ! 'T_TD_COLOR1' => '#'.$theme['td_color1'], ! 'T_TD_COLOR2' => '#'.$theme['td_color2'], ! 'T_TD_COLOR3' => '#'.$theme['td_color3'], ! 'T_TD_CLASS1' => $theme['td_class1'], ! 'T_TD_CLASS2' => $theme['td_class2'], ! 'T_TD_CLASS3' => $theme['td_class3'], ! 'T_FONTFACE1' => $theme['fontface1'], ! 'T_FONTFACE2' => $theme['fontface2'], ! 'T_FONTFACE3' => $theme['fontface3'], ! 'T_FONTSIZE1' => $theme['fontsize1'], ! 'T_FONTSIZE2' => $theme['fontsize2'], ! 'T_FONTSIZE3' => $theme['fontsize3'], ! 'T_FONTCOLOR1' => '#'.$theme['fontcolor1'], ! 'T_FONTCOLOR2' => '#'.$theme['fontcolor2'], ! 'T_FONTCOLOR3' => '#'.$theme['fontcolor3'], ! 'T_SPAN_CLASS1' => $theme['span_class1'], ! 'T_SPAN_CLASS2' => $theme['span_class2'], ! 'T_SPAN_CLASS3' => $theme['span_class3'], ! */ //+ MX-Publisher --- 86,127 ---- // These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file ! 'T_HEAD_STYLESHEET' => $mx_user->theme['head_stylesheet'], ! //'T_BODY_BACKGROUND' => $mx_user->theme['body_background'], ! 'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'], ! 'T_BODY_TEXT' => '#'.$mx_user->theme['body_text'], ! 'T_BODY_LINK' => '#'.$mx_user->theme['body_link'], ! 'T_BODY_VLINK' => '#'.$mx_user->theme['body_vlink'], ! 'T_BODY_ALINK' => '#'.$mx_user->theme['body_alink'], ! 'T_BODY_HLINK' => '#'.$mx_user->theme['body_hlink'], ! 'T_TR_COLOR1' => '#'.$mx_user->theme['tr_color1'], ! 'T_TR_COLOR2' => '#'.$mx_user->theme['tr_color2'], ! 'T_TR_COLOR3' => '#'.$mx_user->theme['tr_color3'], ! //'T_TR_CLASS1' => $mx_user->theme['tr_class1'], ! //'T_TR_CLASS2' => $mx_user->theme['tr_class2'], ! //'T_TR_CLASS3' => $mx_user->theme['tr_class3'], ! 'T_TH_COLOR1' => '#'.$mx_user->theme['th_color1'], ! 'T_TH_COLOR2' => '#'.$mx_user->theme['th_color2'], ! 'T_TH_COLOR3' => '#'.$mx_user->theme['th_color3'], ! //'T_TH_CLASS1' => $mx_user->theme['th_class1'], ! //'T_TH_CLASS2' => $mx_user->theme['th_class2'], ! //'T_TH_CLASS3' => $mx_user->theme['th_class3'], ! 'T_TD_COLOR1' => '#'.$mx_user->theme['td_color1'], ! 'T_TD_COLOR2' => '#'.$mx_user->theme['td_color2'], ! //'T_TD_COLOR3' => '#'.$mx_user->theme['td_color3'], ! //'T_TD_CLASS1' => $mx_user->theme['td_class1'], ! //'T_TD_CLASS2' => $mx_user->theme['td_class2'], ! //'T_TD_CLASS3' => $mx_user->theme['td_class3'], ! //'T_FONTFACE1' => $mx_user->theme['fontface1'], ! //'T_FONTFACE2' => $mx_user->theme['fontface2'], ! //'T_FONTFACE3' => $mx_user->theme['fontface3'], ! //'T_FONTSIZE1' => $mx_user->theme['fontsize1'], ! //'T_FONTSIZE2' => $mx_user->theme['fontsize2'], ! //'T_FONTSIZE3' => $mx_user->theme['fontsize3'], ! 'T_FONTCOLOR1' => '#'.$mx_user->theme['fontcolor1'], ! 'T_FONTCOLOR2' => '#'.$mx_user->theme['fontcolor2'], ! //'T_FONTCOLOR3' => '#'.$mx_user->theme['fontcolor3'], ! //'T_SPAN_CLASS1' => $mx_user->theme['span_class1'], ! //'T_SPAN_CLASS2' => $mx_user->theme['span_class2'], ! //'T_SPAN_CLASS3' => $mx_user->theme['span_class3'], //+ MX-Publisher *************** *** 135,140 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'], ! 'T_MXBB_STYLESHEET' => $theme['head_stylesheet'], 'T_GECKO_STYLESHEET' => 'gecko.css', --- 131,136 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'], ! 'T_MXBB_STYLESHEET' => $mx_user->theme['head_stylesheet'], 'T_GECKO_STYLESHEET' => 'gecko.css', Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** admin_mx_smilies.php 20 Mar 2011 18:25:40 -0000 1.23 --- admin_mx_smilies.php 17 Jun 2013 02:53:26 -0000 1.24 *************** *** 24,32 **** **************************************************************************/ ! define('IN_PHPBB', 1); - // // First we do the setmodules stuff for the admin cp. - // if( !empty($setmodules) ) { --- 24,36 ---- **************************************************************************/ ! /* ! * Security and Page header ! */ ! @define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.' . $phpEx); // First we do the setmodules stuff for the admin cp. if( !empty($setmodules) ) { *************** *** 37,51 **** } ! // ! // Security and Page header ! // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.' . $phpEx); ! ! // ! // Load default header ! // if ($mx_request_vars->is_get('export_pack')) { --- 41,47 ---- } ! /* ! * Load default header ! */ if ($mx_request_vars->is_get('export_pack')) { Index: admin_mx_preview.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_preview.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_preview.php 9 Feb 2008 12:44:32 -0000 1.3 --- admin_mx_preview.php 17 Jun 2013 02:53:26 -0000 1.4 *************** *** 23,27 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 23,27 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** index_new.php 17 Jun 2013 00:32:11 -0000 1.18 --- index_new.php 17 Jun 2013 02:53:26 -0000 1.19 *************** *** 10,14 **** */ // Security and Page header ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 10,14 ---- */ // Security and Page header ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: admin_mx_words.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_words.php 11 Feb 2008 11:13:16 -0000 1.3 --- admin_mx_words.php 17 Jun 2013 02:53:26 -0000 1.4 *************** *** 27,37 **** return; } - - define('IN_PHPBB', 1); - // // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 27,34 ---- return; } // // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: admin_mx_styles.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_mx_styles.php 31 Oct 2008 19:02:20 -0000 1.9 --- admin_mx_styles.php 17 Jun 2013 02:53:26 -0000 1.10 *************** *** 35,39 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 35,39 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: index_ory.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_ory.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index_ory.php 17 Jun 2013 00:32:11 -0000 1.2 --- index_ory.php 17 Jun 2013 02:53:26 -0000 1.3 *************** *** 18,22 **** // Security and Page header // ! define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); --- 18,22 ---- // Security and Page header // ! @define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** admin_mx_gen_cache.php 12 Feb 2008 21:24:18 -0000 1.29 --- admin_mx_gen_cache.php 17 Jun 2013 02:53:26 -0000 1.30 *************** *** 19,23 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 19,23 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin_mx_meta.php 23 Oct 2009 07:46:32 -0000 1.20 --- admin_mx_meta.php 17 Jun 2013 02:53:26 -0000 1.21 *************** *** 19,23 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 19,23 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** pagestart.php 31 Oct 2008 19:02:20 -0000 1.40 --- pagestart.php 17 Jun 2013 02:53:26 -0000 1.41 *************** *** 33,40 **** } ! // ! // Start session, user and style (template + theme) management ! // - populate $userdata, $lang, $theme, $images and initiate $template. ! // $mx_user->init($user_ip, PAGE_INDEX); --- 33,40 ---- } ! /* ! * Start session, user and style (template + theme) management ! * - populate $userdata, $lang, $theme, $images and initiate $template. ! */ $mx_user->init($user_ip, PAGE_INDEX); Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** admin_mx_module.php 11 Feb 2008 11:13:16 -0000 1.51 --- admin_mx_module.php 17 Jun 2013 02:53:26 -0000 1.52 *************** *** 19,23 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 19,23 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: index_jon.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_jon.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index_jon.php 17 Jun 2013 00:32:11 -0000 1.5 --- index_jon.php 17 Jun 2013 02:53:26 -0000 1.6 *************** *** 18,22 **** // Security and Page header // ! define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); --- 18,22 ---- // Security and Page header // ! @define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** admin_mx_portal.php 18 Oct 2009 04:15:18 -0000 1.50 --- admin_mx_portal.php 17 Jun 2013 02:53:26 -0000 1.51 *************** *** 19,23 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 19,23 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_mx_block_cp.php 18 Jun 2009 21:38:58 -0000 1.26 --- admin_mx_block_cp.php 17 Jun 2013 02:53:26 -0000 1.27 *************** *** 20,24 **** // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 20,24 ---- // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); |