diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-12 04:31:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-12 04:31:15 +0100 |
| commit | 68d945e93190e04b596a819742b1d88ef5495d4a (patch) | |
| tree | e67dab7f95c68482a6b447d3bd601732f95e46ff /phpBB/phpbb/version_helper.php | |
| parent | 7f7b09fdeb087ed826bf5216fa271f2dd65c52e6 (diff) | |
| parent | 826d6aac74303afa3fee78a4874e7ac5ca210630 (diff) | |
| download | forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar.gz forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar.bz2 forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar.xz forums-68d945e93190e04b596a819742b1d88ef5495d4a.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/version_helper.php')
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index e4f68f5aab..a1e66ba8fe 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -34,6 +34,11 @@ class version_helper protected $file = 'versions.json'; /** + * @var bool Use SSL or not + */ + protected $use_ssl = false; + + /** * @var string Current version installed */ protected $current_version; @@ -85,13 +90,15 @@ class version_helper * @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 */ - 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->use_ssl = $use_ssl; return $this; } @@ -244,7 +251,7 @@ class version_helper */ 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); @@ -255,7 +262,7 @@ class version_helper else if ($info === false || $force_update) { try { - $info = $this->file_downloader->get($this->host, $this->path, $this->file); + $info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80); } catch (\phpbb\exception\runtime_exception $exception) { |