[mxbb-commits] core/admin index.php,1.9,1.10 page_header_admin.php,1.9,1.10 pagestart.php,1.13,1.14

[Jon O. <jon...@us...>]

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

Modified Files:
	index.php page_header_admin.php pagestart.php 
Log Message:
updated for phpBB 2.0.17

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pagestart.php	20 Aug 2005 18:19:11 -0000	1.13
--- pagestart.php	10 Sep 2005 22:08:23 -0000	1.14
***************
*** 53,75 ****
  //
  
- //
- // Security - used for block_edits
- //
- /*
- $block_id = $mx_request_vars->post('block_id', MX_TYPE_INT, '0');
- 
- if ( !empty( $block_id ) )
- {
- 	$block_config = read_block_config( $block_id, false );
- 
- 	$block_edit_auth = array();
- 	$block_edit_auth = block_auth( AUTH_EDIT, $block_id , $userdata, $block_config[$block_id]['auth_edit'], $block_config[$block_id]['auth_edit_group'] );
- }
- else 
- {
- 	$block_edit_auth['auth_edit'] = false;
- }
- */
- 
  if ( !$userdata['session_logged_in'] )
  {
--- 53,56 ----
***************
*** 89,92 ****
--- 70,79 ----
  }
  
+ if (!$userdata['session_admin'])
+ {
+ 	mx_redirect(append_sid("login.php?redirect=admin/index.$phpEx&admin=1", true));
+ }
+ 
+ 
  if( empty($no_page_header) )
  {

Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** page_header_admin.php	28 Apr 2005 04:13:50 -0000	1.9
--- page_header_admin.php	10 Sep 2005 22:08:23 -0000	1.10
***************
*** 102,106 ****
  	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 
  	// MX ADDON
! 	'L_MX_ADMIN' => 'mxBB-Portal Administration',
  	'U_PHPBB_ROOT_PATH' => PHPBB_URL,
  	'U_PORTAL_ROOT_PATH' => PORTAL_URL,
--- 102,106 ----
  	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 
  	// MX ADDON
! 	'L_MX_ADMIN' => $lang['mxBB_adminCP'],
  	'U_PHPBB_ROOT_PATH' => PHPBB_URL,
  	'U_PORTAL_ROOT_PATH' => PORTAL_URL,

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php	20 Aug 2005 18:19:11 -0000	1.9
--- index.php	10 Sep 2005 22:08:23 -0000	1.10
***************
*** 763,766 ****
--- 763,832 ----
  	}
  
+ 	// 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))
+ 	{
+ 		@fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n");
+ 		@fputs($fsock, "HOST: www.phpbb.com\r\n");
+ 		@fputs($fsock, "Connection: close\r\n\r\n");
+ 
+ 		$get_info = false;
+ 		while (!@feof($fsock))
+ 		{
+ 			if ($get_info)
+ 			{
+ 				$version_info .= @fread($fsock, 1024);
+ 			}
+ 			else
+ 			{
+ 				if (@fgets($fsock, 1024) == "\r\n")
+ 				{
+ 					$get_info = true;
+ 				}
+ 			}
+ 		}
+ 		@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>';
+ 		}
+ 	}
+ 	else
+ 	{
+ 		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'])
+ 	);
+ 
+ 	
  	$template->pparse("body");