Menu
▾
▴
[mxbb-commits] core/admin index.php, 1.66, 1.67 page_header_admin.php, 1.34, 1.35
|
From: Florin C B. <ory...@us...> - 2013-08-26 23:09:38
|
Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2046 Modified Files: index.php page_header_admin.php Log Message: Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** page_header_admin.php 28 Jun 2013 15:32:37 -0000 1.34 --- page_header_admin.php 26 Aug 2013 23:09:35 -0000 1.35 *************** *** 57,63 **** } **********/ ! ! $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']); --- 57,61 ---- } **********/ ! $template->set_filenames(array('header' => 'admin/page_header.'.$tplEx)); // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility $l_timezone = explode('.', $board_config['board_timezone']); *************** *** 66,73 **** $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); $template_config_row = $mx_user->_load_template_config(); $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], //'PAGE_TITLE' => $page_title, - 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), --- 64,71 ---- $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); $template_config_row = $mx_user->_load_template_config(); + $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], //'PAGE_TITLE' => $page_title, 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), *************** *** 130,145 **** 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css', 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], 'LOGO' => $images['mx_logo'], //- MX-Publisher ! // Backend 'PHPBB' => !(PORTAL_BACKEND === 'internal'), ! // Additional css for gecko browsers 'GECKO' => strstr($useragent, 'Gecko'), --- 128,143 ---- 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css', 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], 'LOGO' => $images['mx_logo'], //- MX-Publisher ! // Backend 'PHPBB' => !(PORTAL_BACKEND === 'internal'), ! // Additional css for gecko browsers 'GECKO' => strstr($useragent, 'Gecko'), *************** *** 156,161 **** header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); } ! header ('Expires: 0'); ! header ('Pragma: no-cache'); $template->pparse('header'); --- 154,159 ---- header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); } ! header('Expires: 0'); ! header('Pragma: no-cache'); $template->pparse('header'); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** index.php 28 Jun 2013 15:32:37 -0000 1.66 --- index.php 26 Aug 2013 23:09:35 -0000 1.67 *************** *** 103,109 **** "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "LOGO" => $images['mx_logo'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => mx_append_sid("index.$phpEx?pane=right"), --- 103,109 ---- "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "LOGO" => $images['mx_logo'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => mx_append_sid("index.$phpEx?pane=right"), *************** *** 117,121 **** //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], ! "L_ADMIN_INDEX" => $lang['Admin_Index'], )); --- 117,121 ---- //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], ! "L_ADMIN_INDEX" => $lang['Admin_Index'] )); *************** *** 473,482 **** } - $row_color = ( $guest_users % 2 ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; $row_class = ( $guest_users % 2 ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; ! $guest_ip = $mx_backend->decode_ip($onlinerow_guest[$i]['session_ip']); ! $template->assign_block_vars("guest_user_row", array( "ROW_COLOR" => "#" . $row_color, --- 473,481 ---- } $row_color = ( $guest_users % 2 ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; $row_class = ( $guest_users % 2 ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; ! $guest_ip = $mx_backend->decode_ip($onlinerow_guest[$i]['session_ip']); ! $template->assign_block_vars("guest_user_row", array( "ROW_COLOR" => "#" . $row_color, *************** *** 589,601 **** else { ! // ! // Generate frameset ! // $template->set_filenames(array( "body" => "admin/index_frameset.".$tplEx) ); ! ! $template->assign_vars(array( ! 'ADMIN_TITLE' => $lang['Mx-Publisher_adminCP'], "S_FRAME_NAV" => mx_append_sid("index.$phpEx?pane=left"), "S_FRAME_MAIN" => mx_append_sid("index.$phpEx?pane=right")) --- 588,600 ---- else { ! /* ! * Generate frameset ! */ $template->set_filenames(array( "body" => "admin/index_frameset.".$tplEx) ); ! ! $template->assign_vars(array( ! "L_ADMIN_TITLE" => $lang['Mx-Publisher_adminCP'], "S_FRAME_NAV" => mx_append_sid("index.$phpEx?pane=left"), "S_FRAME_MAIN" => mx_append_sid("index.$phpEx?pane=right")) |
