[mxbb-commits] core/admin index.php,1.63,1.64

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12746

Modified Files:
	index.php 
Log Message:


Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** index.php	17 Jun 2013 02:53:26 -0000	1.63
--- index.php	17 Jun 2013 03:24:00 -0000	1.64
***************
*** 153,158 ****
  		while( list($action, $file) = each($action_array) )
  		{
! 			$row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2'];
! 			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
  			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
--- 153,158 ----
  		while( list($action, $file) = each($action_array) )
  		{
! 			$row_color = ( !($row_count%2) ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2'];
! 			$row_class = ( !($row_count%2) ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2'];
  
  			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
***************
*** 245,250 ****
  		while( list($action, $file) = each($action_array) )
  		{
! 			$row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2'];
! 			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
  			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
--- 245,250 ----
  		while( list($action, $file) = each($action_array) )
  		{
! 			$row_color = ( !($row_count%2) ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2'];
! 			$row_class = ( !($row_count%2) ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2'];
  
  			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
***************
*** 403,408 ****
  				}
  
! 				$row_color = ( $registered_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! 				$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
  				$reg_ip = $mx_backend->decode_ip($onlinerow_reg[$i]['session_ip']);
--- 403,408 ----
  				}
  
! 				$row_color = ( $registered_users % 2 ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2'];
! 				$row_class = ( $registered_users % 2 ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2'];
  
  				$reg_ip = $mx_backend->decode_ip($onlinerow_reg[$i]['session_ip']);
***************
*** 474,479 ****
  			
  
! 			$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! 			$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
  			$guest_ip = $mx_backend->decode_ip($onlinerow_guest[$i]['session_ip']);
--- 474,479 ----
  			
  
! 			$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']);
***************
*** 504,512 ****
  
  	/* Begin MX-Publisher version check code block */
! 	$current_mxbb_version = explode('.', $portal_config['portal_version']);
! 	$minor_mxbb_revision = (int) $current_mxbb_version[2];
  
  	$errno = 0;
! 	$errstr = $mxbb_version_info = '';
  	
  	$mx_version_check = false;
--- 504,512 ----
  
  	/* Begin MX-Publisher version check code block */
! 	$current_MXP_version = explode('.', $portal_config['portal_version']);
! 	$minor_MXP_revision = (int) $current_MXP_version[2];
  
  	$errno = 0;
! 	$errstr = $MXP_version_info = '';
  	
  	$mx_version_check = false;
***************
*** 534,538 ****
  			if ($get_info)
  			{
! 				$mxbb_version_info .= fread($fsock, 1024);
  			}
  			else
--- 534,538 ----
  			if ($get_info)
  			{
! 				$MXP_version_info .= fread($fsock, 1024);
  			}
  			else
***************
*** 546,564 ****
  		fclose($fsock);
  
! 		$mxbb_version_info = explode("\n", $mxbb_version_info);
! 		$latest_mxbb_head_revision = (int) $mxbb_version_info[0];
! 		$latest_mxbb_minor_revision = (int) $mxbb_version_info[2];
! 		$latest_mxbb_patch_revision = (int) $mxbb_version_info[3]; // For betas/RC
  
! 		$latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2];
  
! 		if ($latest_mxbb_head_revision == 3 && $minor_mxbb_revision == $latest_mxbb_minor_revision)
  		{
! 			$mxbb_version_info = '<p style="color:green">' . $lang['mxBB_Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$mxbb_version_info = '<p style="color:red">' . $lang['mxBB_Version_outdated'];
! 			$mxbb_version_info .= '<br />' . sprintf($lang['mxBB_Latest_version_info'], $latest_mxbb_version) . sprintf($lang['mxBB_Current_version_info'], $portal_config['portal_version']) . '</p>';
  		}
  	}
--- 546,564 ----
  		fclose($fsock);
  
! 		$MXP_version_info = explode("\n", $MXP_version_info);
! 		$latest_MXP_head_revision = (int) $MXP_version_info[0];
! 		$latest_MXP_minor_revision = (int) $MXP_version_info[2];
! 		$latest_MXP_patch_revision = (int) $MXP_version_info[3]; // For betas/RC
  
! 		$latest_MXP_version = (int) $MXP_version_info[0] . '.' . (int) $MXP_version_info[1] . '.' . (int) $MXP_version_info[2];
  
! 		if ($latest_MXP_head_revision == 3 && $minor_MXP_revision == $latest_MXP_minor_revision)
  		{
! 			$MXP_version_info = '<p style="color:green">' . $lang['MXP_Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$MXP_version_info = '<p style="color:red">' . $lang['MXP_Version_outdated'];
! 			$MXP_version_info .= '<br />' . sprintf($lang['MXP_Latest_version_info'], $latest_MXP_version) . sprintf($lang['MXP_Current_version_info'], $portal_config['portal_version']) . '</p>';
  		}
  	}
***************
*** 567,582 ****
  		if ($errstr)
  		{
! 			$mxbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$mxbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  
! 	$mxbb_version_info .= '<p>' . $lang['mxBB_Mailing_list_subscribe_reminder'] . '</p>';
  
  	$template->assign_vars(array(
! 		'MXBB_VERSION_INFO'		=> $mxbb_version_info,
  		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
--- 567,582 ----
  		if ($errstr)
  		{
! 			$MXP_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$MXP_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  
! 	$MXP_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>';
  
  	$template->assign_vars(array(
! 		'MXP_VERSION_INFO'		=> $MXP_version_info,
  		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])