'(mb_)substr(...)' used as index-based access.

(cherry picked from commit e89f017)
This commit is contained in:
Yuriy Pikhtarev 2017-05-05 01:01:29 +03:00 committed by Vasily Komrakov
commit 5dd290f2b2
No known key found for this signature in database
GPG key ID: 558236680C20A69A
5 changed files with 27 additions and 23 deletions

View file

@ -83,7 +83,7 @@ function init_display_template($template_var, $replacement, $filename = 'viewtop
}
$complete_filename = $filename;
if (substr($complete_filename, 0, 1) != '/') {
if ($complete_filename[0] != '/') {
$complete_filename = $template->root . '/' . $complete_filename;
}

View file

@ -49,7 +49,9 @@ function base64_pack($number)
if ($number > 4096) {
return;
} elseif ($number < $base) {
}
if ($number < $base) {
return $chars[$number];
}
@ -81,7 +83,7 @@ function base64_unpack($string)
for ($i = 1; $i <= $length; $i++) {
$pos = $length - $i;
$operand = strpos($chars, substr($string, $pos, 1));
$operand = strpos($chars, $string[$pos]);
$exponent = pow($base, $i - 1);
$decValue = $operand * $exponent;
$number += $decValue;
@ -129,11 +131,13 @@ function auth_unpack($auth_cache)
$auth_len = 1;
for ($pos = 0; $pos < strlen($auth_cache); $pos += $auth_len) {
$forum_auth = substr($auth_cache, $pos, 1);
$forum_auth = $auth_cache[$pos];
if ($forum_auth == $one_char_encoding) {
$auth_len = 1;
continue;
} elseif ($forum_auth == $two_char_encoding) {
}
if ($forum_auth == $two_char_encoding) {
$auth_len = 2;
$pos--;
continue;
@ -162,11 +166,13 @@ function is_forum_authed($auth_cache, $check_forum_id)
$auth_len = 1;
for ($pos = 0; $pos < strlen($auth_cache); $pos += $auth_len) {
$forum_auth = substr($auth_cache, $pos, 1);
$forum_auth = $auth_cache[$pos];
if ($forum_auth == $one_char_encoding) {
$auth_len = 1;
continue;
} elseif ($forum_auth == $two_char_encoding) {
}
if ($forum_auth == $two_char_encoding) {
$auth_len = 2;
$pos--;
continue;
@ -210,9 +216,9 @@ function attachment_exists($filename)
if (!@file_exists(@amod_realpath($upload_dir . '/' . $filename))) {
return false;
} else {
return true;
}
return true;
}
/**
@ -226,9 +232,9 @@ function thumbnail_exists($filename)
if (!@file_exists(@amod_realpath($upload_dir . '/' . THUMB_DIR . '/t_' . $filename))) {
return false;
} else {
return true;
}
return true;
}
/**
@ -412,9 +418,9 @@ function get_extension($filename)
$extension = strtolower(trim($extension));
if (is_array($extension)) {
return '';
} else {
return $extension;
}
return $extension;
}
/**
@ -495,11 +501,9 @@ function _set_var(&$result, $var, $type, $multibyte = false)
*/
function get_var($var_name, $default, $multibyte = false)
{
if (
!isset($_REQUEST[$var_name]) ||
if (!isset($_REQUEST[$var_name]) ||
(is_array($_REQUEST[$var_name]) && !is_array($default)) ||
(is_array($default) && !is_array($_REQUEST[$var_name]))
) {
(is_array($default) && !is_array($_REQUEST[$var_name]))) {
return (is_array($default)) ? [] : $default;
}
@ -544,9 +548,9 @@ function attach_mod_sql_escape($text)
{
if (function_exists('mysqli_real_escape_string')) {
return DB()->escape_string($text);
} else {
return str_replace("'", "''", str_replace('\\', '\\\\', $text));
}
return str_replace("'", "''", str_replace('\\', '\\\\', $text));
}
/**