|
From: Florin C B. <ory...@us...> - 2014-05-09 07:58:38
|
Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1376 Modified Files: index.php page_header_admin.php Log Message: fix Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** page_header_admin.php 26 Aug 2013 23:09:35 -0000 1.35 --- page_header_admin.php 9 May 2014 07:58:36 -0000 1.36 *************** *** 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']); --- 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']); *************** *** 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']), --- 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']), *************** *** 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'), --- 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'), *************** *** 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'); --- 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'); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** index.php 27 Aug 2013 07:01:24 -0000 1.68 --- index.php 9 May 2014 07:58:36 -0000 1.69 *************** *** 84,90 **** // ------------- ! /* ! * Generate relevant output ! */ if ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { --- 84,90 ---- // ------------- ! // ! // Generate relevant output ! // if ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { *************** *** 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'], )); *************** *** 317,323 **** $mx_backend->load_forum_stats(); ! /* ! * Get users online information. ! */ $sql = $mx_backend->generate_session_online_sql(); --- 317,323 ---- $mx_backend->load_forum_stats(); ! // ! // Get users online information. ! // $sql = $mx_backend->generate_session_online_sql(); *************** *** 341,348 **** $reg_userid_ary = array(); ! if( count($onlinerow_reg) ) { $registered_users = 0; ! for($i = 0; $i < count($onlinerow_reg); $i++) { --- 341,351 ---- $reg_userid_ary = array(); ! if(count($onlinerow_reg)) { $registered_users = 0; ! //-MOD: ViewOnline extension for mxBB Portal Pages ! $location = $lang['Forum_index']; ! $location_url = "index.$phpEx?pane=right"; ! for($i = 0; $i < count($onlinerow_reg); $i++) { *************** *** 353,368 **** $username = $onlinerow_reg[$i]['username']; ! if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) { $registered_users++; ! $hidden = false; } else { $hidden_users++; ! $hidden = true; } ! ! if($onlinerow_reg[$i]['user_session_page'] < 1) { switch($onlinerow_reg[$i]['user_session_page']) --- 356,371 ---- $username = $onlinerow_reg[$i]['username']; ! if( isset($onlinerow_reg[$i]['user_allow_viewonline']) || $userdata['user_level'] == ADMIN ) { $registered_users++; ! $hidden = FALSE; } else { $hidden_users++; ! $hidden = TRUE; } ! ! if( $onlinerow_reg[$i]['user_session_page'] < 1 ) { switch($onlinerow_reg[$i]['user_session_page']) *************** *** 416,420 **** "FORUM_LOCATION" => $location, "IP_ADDRESS" => $reg_ip, ! "U_WHOIS_IP" => $whois_url . $reg_ip, "U_USER_PROFILE" => mx_append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), --- 419,423 ---- "FORUM_LOCATION" => $location, "IP_ADDRESS" => $reg_ip, ! "U_WHOIS_IP" => $whois_url . $reg_ip, "U_USER_PROFILE" => mx_append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), *************** *** 431,449 **** } ! /* ! * Guest users ! */ ! if( count($onlinerow_guest)) { $guest_users = 0; ! for($i = 0; $i < count($onlinerow_guest); $i++) { $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; $guest_users++; ! if( $onlinerow_guest[$i]['session_page'] < 1 ) { ! switch( $onlinerow_guest[$i]['session_page']) { case PAGE_INDEX: --- 434,452 ---- } ! // ! // Guest users ! // ! if( count($onlinerow_guest) ) { $guest_users = 0; ! for($i = 0; $i < count($onlinerow_guest); $i++) { $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; $guest_users++; ! if( $onlinerow_guest[$i]['session_page'] < 1 ) { ! switch( $onlinerow_guest[$i]['session_page'] ) { case PAGE_INDEX: *************** *** 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, --- 476,485 ---- } ! ! $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, *************** *** 486,490 **** "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => $whois_url . $guest_ip, "U_FORUM_LOCATION" => mx_append_sid($location_url)) --- 490,494 ---- "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => $whois_url . $guest_ip, "U_FORUM_LOCATION" => mx_append_sid($location_url)) *************** *** 527,531 **** @fputs($fsock, "HOST: mxpcms.sourceforge.net\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); ! $get_info = false; while (!feof($fsock)) --- 531,535 ---- @fputs($fsock, "HOST: mxpcms.sourceforge.net\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); ! $get_info = false; while (!feof($fsock)) *************** *** 544,555 **** } fclose($fsock); ! $mx_version_info = explode("\n", $mx_version_info); $latest_mx_head_revision = (int) $mx_version_info[0]; $latest_mx_minor_revision = (int) $mx_version_info[2]; $latest_mx_patch_revision = (int) $mx_version_info[3]; // For betas/RC ! $latest_mx_version = (int) $mx_version_info[0] . '.' . (int) $mx_version_info[1] . '.' . (int) $mx_version_info[2]; ! if ($latest_mx_head_revision == 3 && $minor_mx_revision == $latest_mx_minor_revision) { --- 548,559 ---- } fclose($fsock); ! $mx_version_info = explode("\n", $mx_version_info); $latest_mx_head_revision = (int) $mx_version_info[0]; $latest_mx_minor_revision = (int) $mx_version_info[2]; $latest_mx_patch_revision = (int) $mx_version_info[3]; // For betas/RC ! $latest_mx_version = (int) $mx_version_info[0] . '.' . (int) $mx_version_info[1] . '.' . (int) $mx_version_info[2]; ! if ($latest_mx_head_revision == 3 && $minor_mx_revision == $latest_mx_minor_revision) { *************** *** 573,579 **** } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; ! $template->assign_vars(array( 'MXBB_VERSION_INFO' => $mx_version_info, --- 577,583 ---- } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; ! $template->assign_vars(array( 'MXBB_VERSION_INFO' => $mx_version_info, *************** *** 581,600 **** 'L_VERSION_INFORMATION' => $lang['Version_information']) ); ! $template->pparse("body"); ! include('./page_footer_admin.'.$phpEx); } 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")) --- 585,604 ---- 'L_VERSION_INFORMATION' => $lang['Version_information']) ); ! $template->pparse("body"); ! include('./page_footer_admin.'.$phpEx); } 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")) |