|
From: Florin C B. <ory...@us...> - 2013-08-27 07:01:27
|
Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21875 Modified Files: index.php Log Message: Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** index.php 26 Aug 2013 23:09:35 -0000 1.67 --- index.php 27 Aug 2013 07:01:24 -0000 1.68 *************** *** 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' ) { *************** *** 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(); *************** *** 350,368 **** { $reg_userid_ary[] = $onlinerow_reg[$i]['user_id']; ! $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']) --- 350,368 ---- { $reg_userid_ary[] = $onlinerow_reg[$i]['user_id']; ! $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']) *************** *** 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']), --- 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']), *************** *** 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: --- 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: *************** *** 473,478 **** } ! $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']); --- 473,478 ---- } ! $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']); *************** *** 486,490 **** "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => $whois_url . $guest_ip, "U_FORUM_LOCATION" => mx_append_sid($location_url)) --- 486,490 ---- "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)) --- 527,531 ---- @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) { --- 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) { *************** *** 573,579 **** } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; ! $template->assign_vars(array( 'MXBB_VERSION_INFO' => $mx_version_info, --- 573,579 ---- } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; ! $template->assign_vars(array( 'MXBB_VERSION_INFO' => $mx_version_info, *************** *** 581,587 **** 'L_VERSION_INFORMATION' => $lang['Version_information']) ); ! $template->pparse("body"); ! include('./page_footer_admin.'.$phpEx); } --- 581,587 ---- 'L_VERSION_INFORMATION' => $lang['Version_information']) ); ! $template->pparse("body"); ! include('./page_footer_admin.'.$phpEx); } |