[Phpbb-checkins] r9880 - in /branches/phpBB-3_0_0/phpBB: adm/style/acp_main.html adm/style/acp_update.html docs/CHANGELOG.html includes/acp/acp_main.php includes/acp/acp_update.php includes/functions_admin.php language/en/acp/common.php

[Marek R. <ap...@ph...>]

Author: aptx
Date: Tue Jul 28 14:58:01 2009
New Revision: 9880

Log:
- Display version check on ACP main page.
- Cache version check.

Modified:
    branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
    branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php
    branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Tue Jul 28 14:58:01 2009
***************
*** 14,19 ****
--- 14,35 ----
  
  	<p>{L_ADMIN_INTRO}</p>
  
+ 	<!-- IF S_VERSIONCHECK_FAIL -->
+ 		<div class="errorbox notice">
+ 			<p>{L_VERSIONCHECK_FAIL} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
+ 		</div>
+ 	<!-- ELSE -->
+ 		<!-- IF S_VERSION_UP_TO_DATE -->
+ 			<div class="successbox">
+ 				<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
+ 			</div>
+ 		<!-- ELSE -->
+ 			<div class="errorbox">
+ 				<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
+ 			</div>
+ 		<!-- ENDIF -->
+ 	<!-- ENDIF -->
+ 
  	<!-- IF S_REMOVE_INSTALL -->
  		<div class="errorbox">
  			<h3>{L_WARNING}</h3>

Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html Tue Jul 28 14:58:01 2009
***************
*** 10,20 ****
  
  	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
  		<div class="successbox">
! 			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
  		</div>
  	<!-- ELSE -->
  		<div class="errorbox">
! 			<p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p>
  		</div>
  	<!-- ENDIF -->
  
--- 10,20 ----
  
  	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
  		<div class="successbox">
! 			<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
  		</div>
  	<!-- ELSE -->
  		<div class="errorbox">
! 			<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
  		</div>
  	<!-- ENDIF -->
  

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Jul 28 14:58:01 2009
***************
*** 201,206 ****
--- 201,207 ----
  		<li>[Change] Add confirm-box when deleting permissions (Bug #13673 - Patch by nickvergessen)</li>
  		<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
  		<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
+ 		<li>[Change] Cache version check.</li>
  		<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
  		<li>[Feature] Backported 3.2 captcha plugins.
  			<ul>
***************
*** 247,252 ****
--- 248,254 ----
  				<li>Show date of last reminder sent to user.</li>
  			</ul>
  		</li>
+ 		<li>[Feature] Display version check on ACP main page.</li>
  	</ul>
  
  	<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php Tue Jul 28 14:58:01 2009
***************
*** 395,400 ****
--- 395,419 ----
  			}
  		}
  
+ 		// Version check
+ 		$user->add_lang('install');
+ 
+ 		$latest_version_info = false;
+ 		if (($latest_version_info = obtain_latest_version_info(request_var('versioncheck_force', false))) === false)
+ 		{
+ 			$template->assign_var('S_VERSIONCHECK_FAIL', true);
+ 		}
+ 		else
+ 		{
+ 			$latest_version_info = explode("\n", $latest_version_info);
+ 			$latest_version = trim($latest_version_info[0]);
+ 			$template->assign_var('S_VERSION_UP_TO_DATE',
+ 					version_compare(
+ 							str_replace('rc', 'RC', strtolower($config['version'])),
+ 							str_replace('rc', 'RC', strtolower($latest_version)),
+ 							'<') ? false : true);
+ 		}
+ 
  		// Get forum statistics
  		$total_posts = $config['num_posts'];
  		$total_topics = $config['num_topics'];
***************
*** 492,497 ****
--- 511,518 ----
  			'U_ACTION'			=> $this->u_action,
  			'U_ADMIN_LOG'		=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=admin'),
  			'U_INACTIVE_USERS'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&amp;mode=list'),
+ 			'U_VERSIONCHECK'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=update&amp;mode=version_check'),
+ 			'U_VERSIONCHECK_FORCE'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=1&amp;versioncheck_force=1'),
  
  			'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? true : false,
  			'S_FOUNDER'			=> ($user->data['user_type'] == USER_FOUNDER) ? true : false,

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php Tue Jul 28 14:58:01 2009
***************
*** 37,48 ****
  		$errstr = '';
  		$errno = 0;
  
! 		$info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
! 
! 		if ($info === false)
! 		{
! 			trigger_error($errstr, E_USER_WARNING);
! 		}
  
  		$info = explode("\n", $info);
  		$latest_version = trim($info[0]);
--- 37,43 ----
  		$errstr = '';
  		$errno = 0;
  
! 		$info = obtain_latest_version_info(request_var('versioncheck_force', false), true);
  
  		$info = explode("\n", $info);
  		$latest_version = trim($info[0]);
***************
*** 68,73 ****
--- 63,69 ----
  			'S_UP_TO_DATE_AUTO'	=> $up_to_date_automatic,
  			'S_VERSION_CHECK'	=> true,
  			'U_ACTION'			=> $this->u_action,
+ 			'U_VERSIONCHECK_FORCE' => append_sid($this->u_action . '&amp;versioncheck_force=1'),
  
  			'LATEST_VERSION'	=> $latest_version,
  			'CURRENT_VERSION'	=> $config['version'],

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Tue Jul 28 14:58:01 2009
***************
*** 3054,3057 ****
--- 3054,3096 ----
  	return true;
  }
  
+ /**
+  * Obtains the latest version information
+  *
+  * @param bool $force_update Ignores cached data. Defaults to false.
+  * @param bool $warn_fail Trigger a warning if obtaining the latest version information fails. Defaults to false.
+  * @param int $ttl Cache version information for $ttl seconds. Defaults to 86400 (24 hours).
+  *
+  * @return string | false Version info on success, false on failure.
+  */
+ function obtain_latest_version_info($force_update = false, $warn_fail = false, $ttl = 86400)
+ {
+ 	global $cache;
+ 
+ 	$info = $cache->get('versioncheck');
+ 
+ 	if ($info === false || $force_update)
+ 	{
+ 		$errstr = '';
+ 		$errno = 0;
+ 
+ 		$info = get_remote_file('www.phpbb.com', '/updatecheck',
+ 				((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
+ 
+ 		if ($info === false)
+ 		{
+ 			$cache->destroy('versioncheck');
+ 			if ($warn_fail)
+ 			{
+ 				trigger_error($errstr, E_USER_WARNING);
+ 			}
+ 			return false;
+ 		}
+ 
+ 		$cache->put('versioncheck', $info, $ttl);
+ 	}
+ 
+ 	return $info;
+ }
+ 
  ?>
\ No newline at end of file

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Tue Jul 28 14:58:01 2009
***************
*** 249,254 ****
--- 249,255 ----
  
  	'MANAGE'				=> 'Manage',
  	'MENU_TOGGLE'			=> 'Hide or display the side menu',
+ 	'MORE'					=> 'More &raquo;',
  	'MOVE_DOWN'				=> 'Move down',
  	'MOVE_UP'				=> 'Move up',
  
***************
*** 374,382 ****
  	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
  	'USERS_PER_DAY'		=> 'Users per day',
  
! 	'VALUE'					=> 'Value',
! 	'VIEW_ADMIN_LOG'		=> 'View administrator log',
! 	'VIEW_INACTIVE_USERS'	=> 'View inactive users',
  
  	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
  	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
--- 375,385 ----
  	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
  	'USERS_PER_DAY'		=> 'Users per day',
  
! 	'VALUE'						=> 'Value',
! 	'VERSIONCHECK_FAIL'			=> 'Failed to obtain latest version',
! 	'VERSIONCHECK_FORCE_UPDATE'	=> 'Re-Check version',
! 	'VIEW_ADMIN_LOG'			=> 'View administrator log',
! 	'VIEW_INACTIVE_USERS'		=> 'View inactive users',
  
  	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
  	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',