Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[feature/mod_version_check] Remove old version check and introduce new one

Browse Source
This commit is contained in:
Marc Alexander
2013-10-30 00:26:16 +01:00
parent 6747625a5c
commit 7b130f2c49
3 changed files with 4 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acp/portal_module.php
View File

@@ -21,12 +21,12 @@ class phpbb_ext_board3_portal_acp_portal_module
public $new_config = array(); public $new_config = array();
protected $c_class; protected $c_class;
protected $db, $user, $cache, $template, $display_vars, $config, $phpbb_root_path, $portal_root_path, $phpbb_admin_path, $phpEx; protected $db, $user, $cache, $template, $display_vars, $config, $phpbb_root_path, $portal_root_path, $phpbb_admin_path, $phpEx;
protected $root_path; protected $root_path, $mod_version_check;
public function __construct() public function __construct()
{ {
global $db, $user, $cache, $template; global $db, $user, $cache, $template;
global $config, $phpbb_root_path, $portal_root_path, $phpbb_admin_path, $phpEx; global $config, $phpbb_root_path, $portal_root_path, $phpbb_admin_path, $phpbb_container, $phpEx;
$user->add_lang_ext('board3/portal', 'mods/portal'); $user->add_lang_ext('board3/portal', 'mods/portal');
@@ -44,17 +44,13 @@ class phpbb_ext_board3_portal_acp_portal_module
$this->phpbb_admin_path = $phpbb_admin_path; $this->phpbb_admin_path = $phpbb_admin_path;
$this->portal_root_path = $this->root_path . 'portal/'; $this->portal_root_path = $this->root_path . 'portal/';
$this->php_ex = $phpEx; $this->php_ex = $phpEx;
$this->mod_version_check = $phpbb_container->get('board3.version.check');
if (!function_exists('column_string_const')) if (!function_exists('column_string_const'))
{ {
include($this->portal_root_path . 'includes/functions_modules.' . $this->php_ex); include($this->portal_root_path . 'includes/functions_modules.' . $this->php_ex);
} }
if (!function_exists('mod_version_check'))
{
include($this->portal_root_path . 'includes/functions_version_check.' . $this->php_ex);
}
if(!function_exists('obtain_portal_config')) if(!function_exists('obtain_portal_config'))
{ {
include($this->portal_root_path . 'includes/functions.' . $this->php_ex); include($this->portal_root_path . 'includes/functions.' . $this->php_ex);
@@ -159,7 +155,7 @@ class phpbb_ext_board3_portal_acp_portal_module
else else
{ {
// only show the mod version check if we are on the General Settings page // only show the mod version check if we are on the General Settings page
mod_version_check($this->phpbb_root_path, $this->root_path); $this->mod_version_check->version_check();
} }
$this->new_config = $this->config; $this->new_config = $this->config;

33
adm/mods/board3_portal_check_version.php
View File

@@ -1,33 +0,0 @@
<?php
/**
*
* @package Board3 Portal v2
* @copyright (c) Board3 Group ( www.board3.de )
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
* @package mod_version_check
*/
if (!defined('IN_PHPBB'))
{
exit;
}
class board3_portal_check_version
{
public function version()
{
global $config, $phpbb_root_path, $phpEx;
return array(
'author' => 'Saint_hh',
'title' => 'Board3 Portal',
'tag' => 'board3_portal_v2_dev',
'version' => $config['board3_portal_version'],
'file' => array('board3.de', 'updatecheck', 'board3_portal.xml'),
);
}
}

189
portal/includes/functions_version_check.php
View File

@@ -1,189 +0,0 @@
<?php
/**
*
* @package Board3 Portal v2
* @copyright (c) Board3 Group ( www.board3.de )
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* A copy of Handyman` s MOD version check, to view it on the gallery overview
*/
function mod_version_check($phpbb_root_path, $root_path, $return_version = false)
{
global $user, $template;
global $phpEx;
if (!function_exists('get_remote_file'))
{
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
}
// load version files
$class_functions = array();
include($root_path . 'adm/mods/board3_portal_check_version.' . $phpEx);
$class_name = 'board3_portal_check_version';
$version_check = new $class_name();
$var = call_user_func(array($version_check, 'version'));
// Get current and latest version
$errstr = '';
$errno = 0;
if (!$return_version)
{
$mod_version = $user->lang['NO_INFO'];
$data = array(
'title' => $var['title'],
'description' => $user->lang['NO_INFO'],
'download' => $user->lang['NO_INFO'],
'announcement' => $user->lang['NO_INFO'],
);
}
$file = get_remote_file($var['file'][0], '/' . $var['file'][1], $var['file'][2], $errstr, $errno);
if ($file)
{
if (version_compare(PHP_VERSION, '5.0.0', '<'))
{
$row = array();
$data_array = mvc_setup_array($file);
$row = $data_array['mods'][$var['tag']];
$mod_version = $row['mod_version'];
$mod_version = $mod_version['major'] . '.' . $mod_version['minor'] . '.' . $mod_version['revision'] . $mod_version['release'];
$data = array(
'title' => $row['title'],
'description' => $row['description'],
'download' => $row['download'],
'announcement' => $row['announcement'],
);
}
else
{
// let's not stop the page from loading if a mod author messed up their mod check file
// also take care of one of the easiest ways to mess up an xml file: "&"
$mod = @simplexml_load_string(str_replace('&', '&amp;', $file));
if (isset($mod->$var['tag']))
{
$row = $mod->$var['tag'];
$mod_version = $row->mod_version->major . '.' . $row->mod_version->minor . '.' . $row->mod_version->revision . $row->mod_version->release;
$data = array(
'title' => $row->title,
'description' => $row->description,
'download' => $row->download,
'announcement' => $row->announcement,
);
}
}
}
// remove spaces from the version in the mod file stored locally
$version = str_replace(' ', '', $var['version']);
if ($return_version)
{
return $version;
}
$version_compare = (version_compare($version, $mod_version, '<')) ? false : true;
$template->assign_block_vars('mods', array(
'ANNOUNCEMENT' => $data['announcement'],
'AUTHOR' => $var['author'],
'CURRENT_VERSION' => $version,
'DESCRIPTION' => $data['description'],
'DOWNLOAD' => $data['download'],
'LATEST_VERSION' => $mod_version,
'TITLE' => $data['title'],
'UP_TO_DATE' => sprintf((!$version_compare) ? $user->lang['NOT_UP_TO_DATE'] : $user->lang['UP_TO_DATE'], $data['title']),
'S_UP_TO_DATE' => $version_compare,
'U_AUTHOR' => 'http://www.phpbb.com/community/memberlist.php?mode=viewprofile&un=' . $var['author'],
));
}
/**
* this is for php4 only
* kind of a dirty hack, but since I get the say on how the xml is done, I can have 4 levels max
*/
function mvc_setup_array($xml)
{
// Fire up the built-in XML parser
$values = $index = array();
$parser = xml_parser_create();
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
// this takes care of one possible xml error
$xml = str_replace('&', '&amp;', $xml);
// Set tag names and values
xml_parse_into_struct($parser, $xml, $values, $index);
// Close down XML parser
xml_parser_free($parser);
$ary = array();
foreach ($values as $value)
{
switch (trim($value['level']))
{
case 1:
if ($value['type'] == 'open')
{
$one = $value['tag'];
}
else if ($value['type'] == 'complete')
{
$ary[$value['tag']] = $value['value'];
}
break;
case 2:
if ($value['type'] == 'open')
{
$two = $value['tag'];
}
else if ($value['type'] == 'complete')
{
$ary[$one][$value['tag']] = $value['value'];
}
break;
case 3:
if ($value['type'] == 'open')
{
$three = $value['tag'];
}
else if ($value['type'] == 'complete')
{
$ary[$one][$two][$value['tag']] = $value['value'];
}
break;
case 4:
if ($value['type'] == 'complete')
{
$ary[$one][$two][$three][$value['tag']] = isset($value['value']) ? $value['value'] : '';
}
break;
}
}
return $ary;
}