github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 22:03:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #230 from Exile37/code_inspection

Browse source 
Static code analyzer inspection, part 2
This commit is contained in:
Yuriy Pikhtarev 2017-05-10 19:28:52 +03:00 • committed by GitHub
commit d754a4dc2c
11 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/admin_attach_cp.php
View file

@ -76,7 +76,7 @@ if ($view === 'username') {
} }
// Pagination ? // Pagination ?
$do_pagination = ($view !== 'stats' && $view !== 'search') ? true : false; $do_pagination = ($view !== 'stats' && $view !== 'search');
// Set Order // Set Order
$order_by = ''; $order_by = '';
@ -319,7 +319,7 @@ if ($view === 'username') {
// Attachments // Attachments
if ($view === 'attachments') { if ($view === 'attachments') {
$user_based = ($uid) ? true : false; $user_based = ($uid) ? true : false;
$search_based = (isset($_POST['search']) && $_POST['search']) ? true : false; $search_based = (isset($_POST['search']) && $_POST['search']);
$hidden_fields = ''; $hidden_fields = '';

2
admin/admin_attachments.php
View file

@ -157,7 +157,7 @@ if ($search_imagick) {
$paths = explode(' ', $retval); $paths = explode(' ', $retval);
if (is_array($paths)) { if (is_array($paths)) {
for ($i = 0; $i < sizeof($paths); $i++) { for ($i = 0, $iMax = count($paths); $i < $iMax; $i++) {
$path = basename($paths[$i]); $path = basename($paths[$i]);
if ($path == 'convert') { if ($path == 'convert') {

16
library/ajax/sitemap.php
View file

@ -51,27 +51,27 @@ switch ($mode) {
$map_link = make_url(SITEMAP_DIR . '/sitemap.xml'); $map_link = make_url(SITEMAP_DIR . '/sitemap.xml');
if (strpos($map->send_url("http://google.com/webmasters/sitemaps/ping?sitemap=", $map_link), "successfully added") !== false) { if (strpos($map->send_url("http://google.com/webmasters/sitemaps/ping?sitemap=", $map_link), "successfully added") !== false) {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Google: <font style="color: green;">' . $lang['SITEMAP_SENT'] . '</font>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Google: <span style="color: green;">' . $lang['SITEMAP_SENT'] . '</span>';
} else { } else {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Google: <font style="color: red;">' . $lang['SITEMAP_ERROR'] . '</font> URL: <a href="http://google.com/webmasters/sitemaps/ping?sitemap=' . urlencode($map_link) . '" target="_blank">http://google.com/webmasters/sitemaps/ping?sitemap=' . $map_link . '</a>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Google: <span style="color: red;">' . $lang['SITEMAP_ERROR'] . '</span> URL: <a href="http://google.com/webmasters/sitemaps/ping?sitemap=' . urlencode($map_link) . '" target="_blank">http://google.com/webmasters/sitemaps/ping?sitemap=' . $map_link . '</a>';
} }
if (strpos($map->send_url("http://ping.blogs.yandex.ru/ping?sitemap=", $map_link), "OK") !== false) { if (strpos($map->send_url("http://ping.blogs.yandex.ru/ping?sitemap=", $map_link), "OK") !== false) {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: <font style="color: green;">' . $lang['SITEMAP_SENT'] . '</font>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: <span style="color: green;">' . $lang['SITEMAP_SENT'] . '</span>';
} else { } else {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: <font style="color: red;">' . $lang['SITEMAP_ERROR'] . '</font> URL: <a href="http://ping.blogs.yandex.ru/ping?sitemap=' . urlencode($map_link) . '" target="_blank">http://ping.blogs.yandex.ru/ping?sitemap=' . $map_link . '</a>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: <span style="color: red;">' . $lang['SITEMAP_ERROR'] . '</span> URL: <a href="http://ping.blogs.yandex.ru/ping?sitemap=' . urlencode($map_link) . '" target="_blank">http://ping.blogs.yandex.ru/ping?sitemap=' . $map_link . '</a>';
} }
if ($map->send_url("http://www.bing.com/ping?sitemap=", $map_link)) { if ($map->send_url("http://www.bing.com/ping?sitemap=", $map_link)) {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Bing: <font style="color: green;">' . $lang['SITEMAP_SENT'] . '</font>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Bing: <span style="color: green;">' . $lang['SITEMAP_SENT'] . '</span>';
} else { } else {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Bing: <font style="color: red;">' . $lang['SITEMAP_ERROR'] . '</font> URL: <a href="http://www.bing.com/ping?sitemap=' . urlencode($map_link) . '" target="_blank">http://www.bing.com/ping?sitemap=' . $map_link . '</a>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Bing: <span style="color: red;">' . $lang['SITEMAP_ERROR'] . '</span> URL: <a href="http://www.bing.com/ping?sitemap=' . urlencode($map_link) . '" target="_blank">http://www.bing.com/ping?sitemap=' . $map_link . '</a>';
} }
if (strpos($map->send_url("http://rpc.weblogs.com/pingSiteForm?name=InfraBlog&url=", $map_link), "Thanks for the ping") !== false) { if (strpos($map->send_url("http://rpc.weblogs.com/pingSiteForm?name=InfraBlog&url=", $map_link), "Thanks for the ping") !== false) {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Weblogs: <font style="color: green;">' . $lang['SITEMAP_SENT'] . '</font>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Weblogs: <span style="color: green;">' . $lang['SITEMAP_SENT'] . '</span>';
} else { } else {
$html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Weblogs: <font style="color: red;">' . $lang['SITEMAP_ERROR'] . '</font> URL: <a href="http://rpc.weblogs.com/pingSiteForm?name=InfraBlog&url=' . urlencode($map_link) . '" target="_blank">http://rpc.weblogs.com/pingSiteForm?name=InfraBlog&url=' . $map_link . '</a>'; $html .= '<br />' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Weblogs: <span style="color: red;">' . $lang['SITEMAP_ERROR'] . '</span> URL: <a href="http://rpc.weblogs.com/pingSiteForm?name=InfraBlog&url=' . urlencode($map_link) . '" target="_blank">http://rpc.weblogs.com/pingSiteForm?name=InfraBlog&url=' . $map_link . '</a>';
} }
break; break;
} }

2
library/ajax/view_torrent.php
View file

@ -89,7 +89,7 @@ class TorrentFileList
$filelist = $html->array2html($this->files_ary); $filelist = $html->array2html($this->files_ary);
return "<div class=\"tor-root-dir\">{$this->root_dir}</div>$filelist"; return "<div class=\"tor-root-dir\">{$this->root_dir}</div>$filelist";
} else { } else {
return join('', $this->files_ary['/']); return implode('', $this->files_ary['/']);
} }
} }

4
library/attach_mod/includes/functions_admin.php
View file

@ -121,8 +121,8 @@ function sort_multi_array($sort_array, $key, $sort_order, $pre_string_sort = 0)
// do checks based on key // do checks based on key
$switch = false; $switch = false;
if (!$string_sort) { if (!$string_sort) {
if (($sort_order == 'DESC' && intval(@$sort_array[$j][$key]) < intval(@$sort_array[$j + 1][$key])) || if (($sort_order == 'DESC' && (int)(@$sort_array[$j][$key]) < (int)(@$sort_array[$j + 1][$key])) ||
($sort_order == 'ASC' && intval(@$sort_array[$j][$key]) > intval(@$sort_array[$j + 1][$key]))) { ($sort_order == 'ASC' && (int)(@$sort_array[$j][$key]) > (int)(@$sort_array[$j + 1][$key]))) {
$switch = true; $switch = true;
} }
} else { } else {

2
library/attach_mod/includes/functions_attach.php
View file

@ -410,7 +410,7 @@ function attachment_sync_topic($topics)
*/ */
function get_extension($filename) function get_extension($filename)
{ {
if (false === strstr($filename, '.')) { if (false === strpos($filename, '.')) {
return ''; return '';
} }
$extension = strrchr(strtolower($filename), '.'); $extension = strrchr(strtolower($filename), '.');

14
library/includes/bbcode.php
View file

@ -220,7 +220,7 @@ function strip_quotes($text)
} }
} while ($pos !== false); } while ($pos !== false);
if (sizeof($start_pos) == 0) { if (count($start_pos) == 0) {
return $text; return $text;
} }
@ -235,7 +235,7 @@ function strip_quotes($text)
} }
} while ($pos !== false); } while ($pos !== false);
if (sizeof($end_pos) == 0) { if (count($end_pos) == 0) {
return $text; return $text;
} }
@ -250,7 +250,7 @@ function strip_quotes($text)
$newtext = '[...] '; $newtext = '[...] ';
$substr_pos = 0; $substr_pos = 0;
foreach ($pos_list as $pos => $type) { foreach ($pos_list as $pos => $type) {
$stacksize = sizeof($stack); $stacksize = count($stack);
if ($type == 'start') { if ($type == 'start') {
// empty stack, so add from the last close tag or the beginning of the string // empty stack, so add from the last close tag or the beginning of the string
if ($stacksize == 0) { if ($stacksize == 0) {
@ -377,7 +377,7 @@ function extract_search_words($text)
} }
$text = $text_out; $text = $text_out;
if (sizeof($text) > $max_words_count) { if (count($text) > $max_words_count) {
# shuffle($text); # shuffle($text);
$text = array_splice($text, 0, $max_words_count); $text = array_splice($text, 0, $max_words_count);
} }
@ -393,7 +393,7 @@ function add_search_words($post_id, $post_message, $topic_title = '', $only_retu
$words = ($text) ? extract_search_words($text) : array(); $words = ($text) ? extract_search_words($text) : array();
if ($only_return_words || $bb_cfg['search_engine_type'] == 'sphinx') { if ($only_return_words || $bb_cfg['search_engine_type'] == 'sphinx') {
return join("\n", $words); return implode("\n", $words);
} }
DB()->query("DELETE FROM " . BB_POSTS_SEARCH . " WHERE post_id = $post_id"); DB()->query("DELETE FROM " . BB_POSTS_SEARCH . " WHERE post_id = $post_id");
@ -543,7 +543,7 @@ class bbcode
$text = preg_replace_callback("#\[url=(www\.$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text); $text = preg_replace_callback("#\[url=(www\.$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text);
// Normalize block level tags wrapped with new lines // Normalize block level tags wrapped with new lines
$block_tags = join('|', $this->block_tags); $block_tags = implode('|', $this->block_tags);
$text = str_replace("\n\n[hr]\n\n", '[br][hr][br]', $text); $text = str_replace("\n\n[hr]\n\n", '[br][hr][br]', $text);
$text = preg_replace("#(\s*)(\[/?($block_tags)(.*?)\])(\s*)#", '$2', $text); $text = preg_replace("#(\s*)(\[/?($block_tags)(.*?)\])(\s*)#", '$2', $text);
@ -623,7 +623,7 @@ class bbcode
foreach ($found_spam as $keyword) { foreach ($found_spam as $keyword) {
$spam_exp[] = preg_quote($keyword, '/'); $spam_exp[] = preg_quote($keyword, '/');
} }
$spam_exp = join('|', $spam_exp); $spam_exp = implode('|', $spam_exp);
$text = preg_replace("/($spam_exp)(\S*)/i", $spam_replace, $msg_decoded); $text = preg_replace("/($spam_exp)(\S*)/i", $spam_replace, $msg_decoded);
$text = htmlCHR($text, false, ENT_NOQUOTES); $text = htmlCHR($text, false, ENT_NOQUOTES);

2
library/includes/cache/redis.php vendored
View file

@ -119,7 +119,7 @@ class cache_redis extends cache_common
return ($this->connected) ? $this->redis->del($this->prefix . $name) : false; return ($this->connected) ? $this->redis->del($this->prefix . $name) : false;
} else { } else {
return ($this->connected) ? $this->redis->flushdb() : false; return ($this->connected) ? $this->redis->flushDB() : false;
} }
} }

4
library/includes/functions_torrent.php
View file

@ -703,7 +703,7 @@ function bdecode_r($str, &$pos)
return null; return null;
} else { } else {
$pos++; $pos++;
return floatval(substr($str, $spos, $numlen)); return (float)substr($str, $spos, $numlen);
} }
} elseif ($str[$pos] == 'd') { } elseif ($str[$pos] == 'd') {
$pos++; $pos++;
@ -757,7 +757,7 @@ function bdecode_r($str, &$pos)
if (($pos >= $strlen) || ($str[$pos] != ':')) { if (($pos >= $strlen) || ($str[$pos] != ':')) {
return null; return null;
} else { } else {
$vallen = intval(substr($str, $spos, $numlen)); $vallen = (int)substr($str, $spos, $numlen);
$pos++; $pos++;
$val = substr($str, $pos, $vallen); $val = substr($str, $pos, $vallen);

2
library/includes/functions_upload.php
View file

@ -59,7 +59,7 @@ class upload_common
8 => 'tiff', 8 => 'tiff',
); );
public function init($cfg = array(), $post_params = array(), $uploaded_only = true) public function init(array $cfg = [], array $post_params = [], $uploaded_only = true)
{ {
global $bb_cfg, $lang; global $bb_cfg, $lang;

2
library/language/ru/main.php
View file

@ -2422,7 +2422,7 @@ $lang['REPAIR_CRON'] = 'Восстановить';
$lang['CRON_EDIT_HEAD_EDIT'] = 'Редактировать задачу'; $lang['CRON_EDIT_HEAD_EDIT'] = 'Редактировать задачу';
$lang['CRON_EDIT_HEAD_ADD'] = 'Добавить задачу'; $lang['CRON_EDIT_HEAD_ADD'] = 'Добавить задачу';
$lang['CRON_SCRIPT_EXPL'] = 'название в папке "includes/cron/jobs/"';; $lang['CRON_SCRIPT_EXPL'] = 'название в папке "includes/cron/jobs/"';
$lang['SCHEDULE'] = array( $lang['SCHEDULE'] = array(
'select' => '&raquo; Выберите запуск', 'select' => '&raquo; Выберите запуск',
'hourly' => 'ежечасно', 'hourly' => 'ежечасно',