[mxbb-commits] core/admin admin_mx_portal.php, 1.41, 1.42 index.php, 1.48, 1.49

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

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

Modified Files:
	admin_mx_portal.php index.php 
Log Message:
Updated install wizard, with new references to new site
Fixed the creation of default user
Updated all tpl footer, with updated copyrights etc
New validation check when switching backend, to ensure you can always manage the system
Cleanup when in internal mode. phpbb settings are hidden

Index: admin_mx_portal.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** admin_mx_portal.php	11 Feb 2008 11:13:16 -0000	1.41
--- admin_mx_portal.php	16 Jun 2008 10:46:36 -0000	1.42
***************
*** 381,386 ****
--- 381,399 ----
  	//"PORTAL_PHPBB_URL" => $portal_config['portal_phpbb_url'],
  
+ 	'PHPBB_BACKEND'				=> PORTAL_BACKEND != 'internal',
+ 
  ));
  
+ switch (PORTAL_BACKEND)
+ {
+ 	case 'internal':
+ 		break;
+ 
+ 	case 'phpbb2':
+ 	case 'phpbb3':
+ 		$template->assign_block_vars('phpbb_backend', array());
+ 		break;
+ }
+ 
  $template->pparse('admin_portal');
  include_once('page_footer_admin.' . $phpEx);

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** index.php	15 Jun 2008 21:59:42 -0000	1.48
--- index.php	16 Jun 2008 10:46:37 -0000	1.49
***************
*** 118,123 ****
  		"L_FORUM_INDEX" => $lang['Main_index'],
  		"L_ADMIN_INDEX" => $lang['Admin_Index'],
! 		"L_PREVIEW_FORUM" => $lang['Preview_forum'])
! 	);
  
  	//
--- 118,122 ----
  		"L_FORUM_INDEX" => $lang['Main_index'],
  		"L_ADMIN_INDEX" => $lang['Admin_Index'],
! 	));
  
  	//
***************
*** 187,191 ****
  		$module_phpbb = read_admin($phpbb_root_path . 'admin/');
  		$template->assign_block_vars('module_phpbb', array(
! 			'L_PHPBB' => $lang['Phpbb']
  		));
  
--- 186,193 ----
  		$module_phpbb = read_admin($phpbb_root_path . 'admin/');
  		$template->assign_block_vars('module_phpbb', array(
! 			'L_PHPBB' => $lang['Phpbb'],
! 			"L_FORUM_INDEX" => $lang['Main_index'],
! 			"L_PREVIEW_FORUM" => $lang['Preview_forum'],
! 			"U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"),
  		));
  
***************
*** 239,243 ****
  
  		$template->assign_block_vars('module_phpbb', array(
! 			'L_PHPBB' => $lang['Phpbb']
  		));
  
--- 241,248 ----
  
  		$template->assign_block_vars('module_phpbb', array(
! 			'L_PHPBB' => $lang['Phpbb'],
! 			"L_FORUM_INDEX" => $lang['Main_index'],
! 			"L_PREVIEW_FORUM" => $lang['Preview_forum'],
! 			"U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"),
  		));
  
***************
*** 1008,1012 ****
  	if ($fsock = @fsockopen('www.mx-publisher.com', 80, $errno, $errstr))
  	{
! 		@fputs($fsock, "GET /updatecheck/28x.txt HTTP/1.1\r\n");
  		@fputs($fsock, "HOST: www.mx-publisher.com\r\n");
  		@fputs($fsock, "Connection: close\r\n\r\n");
--- 1013,1017 ----
  	if ($fsock = @fsockopen('www.mx-publisher.com', 80, $errno, $errstr))
  	{
! 		@fputs($fsock, "GET /updatecheck/30x.txt HTTP/1.1\r\n");
  		@fputs($fsock, "HOST: www.mx-publisher.com\r\n");
  		@fputs($fsock, "Connection: close\r\n\r\n");
***************
*** 1032,1035 ****
--- 1037,1042 ----
  		$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];