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

[ticket/289] Fix some scrutinizer issues

Browse Source 
B3P-289
This commit is contained in:
Marc Alexander
2014-07-06 23:43:09 +02:00
parent 9c87379bf5
commit 09c3898fad
3 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
includes/functions.php
View File

@@ -555,7 +555,7 @@ function get_portal_tracking_info($fetch_news)
{
global $config, $request, $user;
$last_read = $topic_ids = $forum_ids = $tracking_info = $rev_forum_ids = array();
$last_read = $topic_ids = $forum_ids = $tracking_info = $rev_forum_ids = $user_lastmark = array();
/**
* group everything by the forum IDs
@@ -614,7 +614,10 @@ function get_portal_tracking_info($fetch_news)
// @todo: also check if $user_lastmark has been defined for this specific forum_id
foreach ($topic_ids as $topic_id)
{
$last_read[$topic_id] = (!isset($last_read[$topic_id]) || $user_lastmark[$rev_forum_ids[$topic_id]] > $last_read[$topic_id]) ? $user_lastmark[$rev_forum_ids[$topic_id]] : $last_read[$topic_id];
if (!isset($last_read[$topic_id]) || (isset($user_lastmark[$rev_forum_ids[$topic_id]]) && $user_lastmark[$rev_forum_ids[$topic_id]] > $last_read[$topic_id]))
{
$last_read[$topic_id] = $user_lastmark[$rev_forum_ids[$topic_id]];
}
}
}
}
@@ -628,11 +631,11 @@ function get_portal_tracking_info($fetch_news)
{
if (STRIP)
{
$tracking_topics = stripslashes($this->request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE));
$tracking_topics = stripslashes($request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE));
}
else
{
$tracking_topics = $this->request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE);
$tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE);
}
}
else
@@ -686,7 +689,14 @@ function get_portal_tracking_info($fetch_news)
}
/**
* check if the entered source file actually exists
* Check if the entered source file actually exists
*
* @param string $value Filename of file to check
* @param string $key Key of the acp setting (unused here)
* @param int $module_id Module ID of this module
* @param bool $force_error Whether an error message should be triggered on
* errors.
* @return bool|string False if file exists, an error string if file doesn't exist.
*/
function check_file_src($value, $key, $module_id, $force_error = true)
{

25
includes/mod_version_check.php
View File

@@ -12,7 +12,7 @@ namespace board3\portal\includes;
class mod_version_check
{
/**
* @var version_data
* @var array version_data
*/
protected $version_data;
@@ -22,12 +22,12 @@ class mod_version_check
protected $config;
/**
* @var phpbb_root_path
* @var string phpbb_root_path
*/
protected $phpbb_root_path;
/**
* @var phpEx
* @var string PHP file extension
*/
protected $php_ext;
@@ -80,16 +80,15 @@ class mod_version_check
$errstr = '';
$errno = 0;
if (!$return_version)
{
$mod_version = $this->user->lang['NO_INFO'];
$data = array(
'title' => $var['title'],
'description' => $this->user->lang['NO_INFO'],
'download' => $this->user->lang['NO_INFO'],
'announcement' => $this->user->lang['NO_INFO'],
);
}
// Fill with bogus data
$mod_version = $this->user->lang['NO_INFO'];
$data = array(
'title' => $var['title'],
'description' => $this->user->lang['NO_INFO'],
'download' => $this->user->lang['NO_INFO'],
'announcement' => $this->user->lang['NO_INFO'],
);
$file = get_remote_file($var['file'][0], '/' . $var['file'][1], $var['file'][2], $errstr, $errno);
if ($file)