fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix deprecation notices in PHP 8.2 #2064

Browse source
This commit is contained in:
Kijin Sung 2023-01-16 21:24:59 +09:00
parent 8e2c4b3ef9
commit c07efe7905
7 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -1686,7 +1686,7 @@ class Context
for($i = 0; $i < $num_args; $i += 2) for($i = 0; $i < $num_args; $i += 2)
{ {
$key = $args_list[$i]; $key = $args_list[$i];
$val = trim($args_list[$i + 1]); $val = trim($args_list[$i + 1] ?? '');
if ($val === '') if ($val === '')
{ {
unset($get_vars[$key]); unset($get_vars[$key]);

3
classes/display/HTMLDisplayHandler.php
View file

@ -107,7 +107,8 @@ class HTMLDisplayHandler
'dispPageAdminMobileContentModify' => true, 'dispPageAdminMobileContentModify' => true,
'dispPageAdminMobileContent' => true, 'dispPageAdminMobileContent' => true,
); );
if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && !isset($x_exclude_actions[Context::get('act')])) $current_act = Context::get('act') ?? '';
if(Context::get('module') != 'admin' && strpos($current_act, 'Admin') !== false && !isset($x_exclude_actions[$current_act]))
{ {
$output = '<div class="x">' . $output . '</div>'; $output = '<div class="x">' . $output . '</div>';
} }

2
classes/module/ModuleHandler.class.php
View file

@ -1109,7 +1109,7 @@ class ModuleHandler extends Handler
{ {
if($val->type == 'image') if($val->type == 'image')
{ {
if(strncmp('./files/attach/images/', $val->value, 22) === 0) if(strncmp('./files/attach/images/', $val->value ?? '', 22) === 0)
{ {
$val->value = Context::getRequestUri() . substr($val->value, 2); $val->value = Context::getRequestUri() . substr($val->value, 2);
} }

4
classes/page/PageHandler.class.php
View file

@ -100,7 +100,7 @@ class PageHandler extends Handler implements Iterator
* *
* @return void * @return void
*/ */
public function rewind() public function rewind(): void
{ {
$this->point = 0; $this->point = 0;
} }
@ -141,7 +141,7 @@ class PageHandler extends Handler implements Iterator
* *
* @return void * @return void
*/ */
public function next() public function next(): void
{ {
$this->point++; $this->point++;
} }

12
common/framework/parsers/EditorComponentParser.php
View file

@ -34,19 +34,19 @@ class EditorComponentParser extends BaseParser
// Get basic information. // Get basic information.
$info->title = self::_getChildrenByLang($xml, 'title', $lang); $info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml, 'description', $lang); $info->description = self::_getChildrenByLang($xml, 'description', $lang);
$info->version = trim($xml->version); $info->version = trim($xml->version ?? '');
$info->date = date('Ymd', strtotime($xml->date . 'T12:00:00Z')); $info->date = date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
$info->homepage = trim($xml->homepage); $info->homepage = trim($xml->homepage ?? '');
$info->license = trim($xml->license); $info->license = trim($xml->license ?? '');
$info->license_link = trim($xml->license['link']); $info->license_link = trim($xml->license['link'] ?? '');
$info->author = array(); $info->author = array();
foreach ($xml->author as $author) foreach ($xml->author as $author)
{ {
$author_info = new \stdClass; $author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($author, 'name', $lang); $author_info->name = self::_getChildrenByLang($author, 'name', $lang);
$author_info->email_address = trim($author['email_address']); $author_info->email_address = trim($author['email_address'] ?? '');
$author_info->homepage = trim($author['link']); $author_info->homepage = trim($author['link'] ?? '');
$info->author[] = $author_info; $info->author[] = $author_info;
} }

2
common/functions.php
View file

@ -257,7 +257,7 @@ function escape_dqstr($str)
*/ */
function explode_with_escape($delimiter, $str, $limit = 0, $escape_char = '\\') function explode_with_escape($delimiter, $str, $limit = 0, $escape_char = '\\')
{ {
if ($limit < 1) $limit = null; if ($limit < 1) $limit = 0;
$result = array(); $result = array();
$split = preg_split('/(?<!' . preg_quote($escape_char, '/') . ')' . preg_quote($delimiter, '/') . '/', $str, $limit); $split = preg_split('/(?<!' . preg_quote($escape_char, '/') . ')' . preg_quote($delimiter, '/') . '/', $str, $limit);
foreach ($split as $piece) foreach ($split as $piece)

4
common/legacy.php
View file

@ -835,10 +835,10 @@ function handleError($errno, $errstr, $file, $line, $context)
function getNumberingPath($no, $size = 3) function getNumberingPath($no, $size = 3)
{ {
$mod = pow(10, $size); $mod = pow(10, $size);
$output = sprintf('%0' . $size . 'd/', $no % $mod); $output = sprintf('%0' . $size . 'd/', intval($no % $mod));
if($no >= $mod) if($no >= $mod)
{ {
$output .= getNumberingPath((int)$no / $mod, $size); $output .= getNumberingPath(intval($no / $mod), $size);
} }
return $output; return $output;
} }