[mxbb-commits] core/admin index.php,1.14,1.15

[Andrew N. \(MHobbit\) <men...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8755/admin

Modified Files:
	index.php 
Log Message:
Only altered the code within the phpBB version check block... preparing for the mxBB version check

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index.php	22 Oct 2005 23:07:00 -0000	1.14
--- index.php	23 Oct 2005 02:17:29 -0000	1.15
***************
*** 761,771 ****
  		);
  	}
! 
! 	// Check for new version
! 	$current_version = explode('.', '2' . $board_config['version']);
! 	$minor_revision = (int) $current_version[2];
  
  	$errno = 0;
! 	$errstr = $version_info = '';
  
  	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr))
--- 761,771 ----
  		);
  	}
! 	
! 	// Check for new phpBB version
! 	$current_phpbb_version = explode('.', '2' . $board_config['version']);
! 	$minor_phpbb_revision = (int) $current_phpbb_version[2];
  
  	$errno = 0;
! 	$errstr = $phpbb_version_info = '';
  
  	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr))
***************
*** 780,784 ****
  			if ($get_info)
  			{
! 				$version_info .= @fread($fsock, 1024);
  			}
  			else
--- 780,784 ----
  			if ($get_info)
  			{
! 				$phpbb_version_info .= @fread($fsock, 1024);
  			}
  			else
***************
*** 792,808 ****
  		@fclose($fsock);
  
! 		$version_info = explode("\n", $version_info);
! 		$latest_head_revision = (int) $version_info[0];
! 		$latest_minor_revision = (int) $version_info[2];
! 		$latest_version = (int) $version_info[0] . '.' . (int) $version_info[1] . '.' . (int) $version_info[2];
  
! 		if ($latest_head_revision == 2 && $minor_revision == $latest_minor_revision)
  		{
! 			$version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 			$version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
  		}
  	}
--- 792,808 ----
  		@fclose($fsock);
  
! 		$phpbb_version_info = explode("\n", $phpbb_version_info);
! 		$latest_phpbb_head_revision = (int) $phpbb_version_info[0];
! 		$latest_phpbb_minor_revision = (int) $phpbb_version_info[2];
! 		$latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2];
  
! 		if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision)
  		{
! 			$phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 			$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $phpbb_latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
  		}
  	}
***************
*** 811,827 ****
  		if ($errstr)
  		{
! 			$version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  	
! 	$version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>';
  	
  
  	$template->assign_vars(array(
! 		'VERSION_INFO'	=> $version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
  	);
--- 811,829 ----
  		if ($errstr)
  		{
! 			$phpbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$phpbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  	
! 	$phpbb_version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>';
! 	
! 	// done with the phpBB version check for now
  	
  
  	$template->assign_vars(array(
! 		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
  	);