[mxbb-commits] core/includes mx_functions_admincp.php, 1.40, 1.41 page_tail.php, 1.33, 1.34

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24668/includes

Modified Files:
	mx_functions_admincp.php page_tail.php 
Log Message:
Admin templates by Culprit and some fixes to admin files by me.

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** mx_functions_admincp.php	19 Nov 2007 16:39:56 -0000	1.40
--- mx_functions_admincp.php	20 Dec 2007 13:10:05 -0000	1.41
***************
*** 3827,3829 ****
--- 3827,3883 ----
  	return $select;
  }
+ /**
+ * Retrieve contents from remotely stored file
+ */
+ function mx_get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 10)
+ {
+ 	global $user;
+ 
+ 	if ($fsock = @fsockopen($host, $port, $errno, $errstr, $timeout))
+ 	{
+ 		@fputs($fsock, "GET $directory/$filename HTTP/1.1\r\n");
+ 		@fputs($fsock, "HOST: $host\r\n");
+ 		@fputs($fsock, "Connection: close\r\n\r\n");
+ 	
+ 		$file_info = '';
+ 		$get_info = false;
+ 
+ 		while (!@feof($fsock))
+ 		{
+ 			if ($get_info)
+ 			{
+ 				$file_info .= @fread($fsock, 1024);
+ 			}
+ 			else
+ 			{
+ 				$line = @fgets($fsock, 1024);
+ 				if ($line == "\r\n")
+ 				{
+ 					$get_info = true;
+ 				}
+ 				else if (stripos($line, '404 not found') !== false)
+ 				{
+ 					$errstr = $user->lang['FILE_NOT_FOUND'] . ': ' . $filename;
+ 					return false;
+ 				}
+ 			}
+ 		}
+ 		@fclose($fsock);
+ 	}
+ 	else
+ 	{
+ 		if ($errstr)
+ 		{
+ 			$errstr = utf8_convert_message($errstr);
+ 			return false;
+ 		}
+ 		else
+ 		{
+ 			$errstr = $user->lang['FSOCK_DISABLED'];
+ 			return false;
+ 		}
+ 	}
+ 	
+ 	return $file_info;
+ }
  ?>

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** page_tail.php	14 Dec 2007 03:41:56 -0000	1.33
--- page_tail.php	20 Dec 2007 13:10:12 -0000	1.34
***************
*** 91,94 ****
--- 91,109 ----
  }
  
+ switch (PORTAL_BACKEND)
+ {
+ 	case 'internal':
+ 
+ 	case 'phpbb2':
+ 
+ 		$current_phpbb_version = '2' . $board_config['version'];
+ 		break;
+ 
+ 	case 'phpbb3':
+ 
+ 		$current_phpbb_version = $board_config['version'];
+ 		break;
+ }
+ 
  $template->assign_vars(array(
  	'U_PORTAL_ROOT_PATH' 		=> PORTAL_URL,
***************
*** 99,103 ****
  	'POWERED_BY' 				=> $lang['Powered_by'],
  	'MX_VERSION' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
! 	'PHPBB_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '' . $board_config['version'] : '',
  	'ADMIN_LINK' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '<a href="' . $u_acp . '?sid=' . $userdata['session_id'] . '">' . $l_acp . '</a><br />' : '',
  	'L_ACP' 					=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $l_acp : '',
--- 114,118 ----
  	'POWERED_BY' 				=> $lang['Powered_by'],
  	'MX_VERSION' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
! 	'PHPBB_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $current_phpbb_version : '',
  	'ADMIN_LINK' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '<a href="' . $u_acp . '?sid=' . $userdata['session_id'] . '">' . $l_acp . '</a><br />' : '',
  	'L_ACP' 					=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $l_acp : '',