phpBB

Code Changes

File: phpbb/version_helper.php

  Unmodified   Added   Modified   Removed
Line 32Line 32
	 * @var string File name
*/
protected $file = 'versions.json';

	 * @var string File name
*/
protected $file = 'versions.json';

 

/**
* @var bool Use SSL or not
*/
protected $use_ssl = false;


/**
* @var string Current version installed


/**
* @var string Current version installed

Line 49Line 54

/** @var \phpbb\config\config */
protected $config;


/** @var \phpbb\config\config */
protected $config;

 

/** @var \phpbb\file_downloader */
protected $file_downloader;


/** @var \phpbb\user */
protected $user;


/** @var \phpbb\user */
protected $user;

Line 58Line 66
	 *
* @param \phpbb\cache\service $cache
* @param \phpbb\config\config $config

	 *
* @param \phpbb\cache\service $cache
* @param \phpbb\config\config $config

 
	 * @param \phpbb\file_downloader $file_downloader

	 * @param \phpbb\user $user
*/

	 * @param \phpbb\user $user
*/

	public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, \phpbb\user $user)

	public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, \phpbb\file_downloader $file_downloader, \phpbb\user $user)

	{
$this->cache = $cache;
$this->config = $config;

	{
$this->cache = $cache;
$this->config = $config;

 
		$this->file_downloader = $file_downloader;

		$this->user = $user;

if (defined('PHPBB_QA'))

		$this->user = $user;

if (defined('PHPBB_QA'))

Line 80Line 90
	 * @param string $host Host (e.g. version.phpbb.com)
* @param string $path Path to file (e.g. /phpbb)
* @param string $file File name (Default: versions.json)

	 * @param string $host Host (e.g. version.phpbb.com)
* @param string $path Path to file (e.g. /phpbb)
* @param string $file File name (Default: versions.json)

 
	 * @param bool $use_ssl Use SSL or not (Default: false)

	 * @return version_helper
*/

	 * @return version_helper
*/

	public function set_file_location($host, $path, $file = 'versions.json')

	public function set_file_location($host, $path, $file = 'versions.json', $use_ssl = false)

	{
$this->host = $host;
$this->path = $path;
$this->file = $file;

	{
$this->host = $host;
$this->path = $path;
$this->file = $file;

 
		$this->use_ssl = $use_ssl;


return $this;
}


return $this;
}

Line 239Line 251
	*/
public function get_versions($force_update = false, $force_cache = false)
{

	*/
public function get_versions($force_update = false, $force_cache = false)
{

		$cache_file = '_versioncheck_' . $this->host . $this->path . $this->file;

		$cache_file = '_versioncheck_' . $this->host . $this->path . $this->file . $this->use_ssl;


$info = $this->cache->get($cache_file);



$info = $this->cache->get($cache_file);


Line 249Line 261
		}
else if ($info === false || $force_update)
{

		}
else if ($info === false || $force_update)
{

			$errstr = $errno = '';
$info = get_remote_file($this->host, $this->path, $this->file, $errstr, $errno);








			try {
$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80);
}
catch (\phpbb\exception\runtime_exception $exception)
{
$prepare_parameters = array_merge(array($exception->getMessage()), $exception->get_parameters());
throw new \RuntimeException(call_user_func_array(array($this->user, 'lang'), $prepare_parameters));
}
$error_string = $this->file_downloader->get_error_string();





			if (!empty($errstr))

			if (!empty($error_string))

			{

			{

				throw new \RuntimeException($errstr);

				throw new \RuntimeException($error_string);

			}

$info = json_decode($info, true);

			}

$info = json_decode($info, true);

 

// Sanitize any data we retrieve from a server
if (!empty($info))
{
$json_sanitizer = function (&$value, $key) {
$type_cast_helper = new \phpbb\request\type_cast_helper();
$type_cast_helper->set_var($value, $value, gettype($value), true);
};
array_walk_recursive($info, $json_sanitizer);
}


if (empty($info['stable']) && empty($info['unstable']))
{
$this->user->add_lang('acp/common');

throw new \RuntimeException($this->user->lang('VERSIONCHECK_FAIL'));


if (empty($info['stable']) && empty($info['unstable']))
{
$this->user->add_lang('acp/common');

throw new \RuntimeException($this->user->lang('VERSIONCHECK_FAIL'));

			}

// Replace & with & on announcement links
foreach ($info as $stability => $branches)
{
foreach ($branches as $branch => $branch_data)
{
$info[$stability][$branch]['announcement'] = str_replace('&', '&', $branch_data['announcement']);
}

 
			}

$info['stable'] = (empty($info['stable'])) ? array() : $info['stable'];

			}

$info['stable'] = (empty($info['stable'])) ? array() : $info['stable'];