fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2026-04-01 12:04:22 +09:00 • committed by GitHub
commit dd8fc890f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 396 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/framework/DB.php
View file

@ -496,9 +496,9 @@ class DB
}
// Collect various counts used in the page calculation.
$list_count = $query->navigation->list_count->getValue($args)[0];
$page_count = $query->navigation->page_count->getValue($args)[0];
$page = $query->navigation->page->getValue($args)[0];
$list_count = $query->navigation->list_count ? $query->navigation->list_count->getValue($args)[0] : 10;
$page_count = $query->navigation->page_count ? $query->navigation->page_count->getValue($args)[0] : 10;
$page = $query->navigation->page ? $query->navigation->page->getValue($args)[0] : 1;
$total_count = intval($count);
$total_page = max(1, intval(ceil($total_count / $list_count)));
$last_index = $total_count - (($page - 1) * $list_count);

8
common/framework/Security.php
View file

@ -37,13 +37,19 @@ class Security
case 'filename':
if (!utf8_check($input)) return false;
return Filters\FilenameFilter::clean($input);
// Clean up SVG content to prevent various attacks.
case 'svg':
if (!utf8_check($input)) return false;
$sanitizer = new \enshrined\svgSanitize\Sanitizer();
return strval($sanitizer->sanitize($input));
// Clean up a path to prevent argument injection.
case 'command':
if (!utf8_check($input)) return false;
if (\RX_WINDOWS || preg_match('![^a-z0-9/._-]!', $input)) return escapeshellarg($input);
return strval($input);
// Unknown filters.
default:
throw new Exception('Unknown filter type for sanitize: ' . $type);

34
common/framework/parsers/ConfigParser.php
View file

@ -84,7 +84,7 @@ class ConfigParser
$config['db']['master']['prefix'] .= '_';
}
$config['db']['master']['charset'] = $db_info->master_db['db_charset'] ?: 'utf8';
$config['db']['master']['charset'] = empty($db_info->master_db['db_charset']) ? 'utf8' : $db_info->master_db['db_charset'];
if (strpos($config['db']['master']['type'], 'innodb') !== false)
{
@ -105,7 +105,7 @@ class ConfigParser
$slave_id = 'slave' . $slave_id;
$config['db'][$slave_id]['type'] = strtolower($slave_db['db_type']);
$config['db'][$slave_id]['host'] = $slave_db['db_hostname'];
$config['db'][$slave_id]['port'] = $slave_db['db_type'];
$config['db'][$slave_id]['port'] = $slave_db['db_port'];
$config['db'][$slave_id]['user'] = $slave_db['db_userid'];
$config['db'][$slave_id]['pass'] = $slave_db['db_password'];
$config['db'][$slave_id]['database'] = $slave_db['db_database'];
@ -116,7 +116,7 @@ class ConfigParser
$config['db'][$slave_id]['prefix'] .= '_';
}
$config['db'][$slave_id]['charset'] = $slave_db['db_charset'] ?: 'utf8';
$config['db'][$slave_id]['charset'] = empty($slave_db['db_charset']) ? 'utf8' : $slave_db['db_charset'];
if (strpos($config['db'][$slave_id]['type'], 'innodb') !== false)
{
@ -145,7 +145,7 @@ class ConfigParser
// Create new crypto keys.
$config['crypto']['encryption_key'] = Security::getRandom(64, 'alnum');
$config['crypto']['authentication_key'] = $db_info->secret_key ?: Security::getRandom(64, 'alnum');
$config['crypto']['authentication_key'] = empty($db_info->secret_key) ? Security::getRandom(64, 'alnum') : $db_info->secret_key;
$config['crypto']['session_key'] = Security::getRandom(64, 'alnum');
// Convert language configuration.
@ -177,8 +177,8 @@ class ConfigParser
$default_url = \Context::decodeIdna($default_url);
}
$config['url']['default'] = $default_url ?: (\RX_SSL ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . \RX_BASEURL;
$config['url']['http_port'] = $db_info->http_port ?: null;
$config['url']['https_port'] = $db_info->https_port ?: null;
$config['url']['http_port'] = $db_info->http_port ?? null;
$config['url']['https_port'] = $db_info->https_port ?? null;
// Convert SSL configuration.
if (isset($db_info->use_ssl) && in_array($db_info->use_ssl, ['always', 'optional']))
@ -193,11 +193,11 @@ class ConfigParser
}
// Convert session configuration.
$config['session']['delay'] = $db_info->delay_session === 'Y' ? true : false;
$config['session']['use_db'] = $db_info->use_db_session === 'Y' ? true : false;
$config['session']['delay'] = ($db_info->delay_session ?? 'N') === 'Y' ? true : false;
$config['session']['use_db'] = ($db_info->use_db_session ?? 'N') === 'Y' ? true : false;
// Convert view configuration.
$config['view']['minify_scripts'] = $db_info->minify_scripts ?: 'common';
$config['view']['minify_scripts'] = $db_info->minify_scripts ?? 'common';
// Convert admin IP whitelist.
if (isset($db_info->admin_ip_list) && is_array($db_info->admin_ip_list) && count($db_info->admin_ip_list))
@ -206,9 +206,9 @@ class ConfigParser
}
// Convert sitelock configuration.
$config['lock']['locked'] = $db_info->use_sitelock === 'Y' ? true : false;
$config['lock']['title'] = strval($db_info->sitelock_title);
$config['lock']['message'] = strval($db_info->sitelock_message);
$config['lock']['locked'] = ($db_info->use_sitelock ?? 'N') === 'Y' ? true : false;
$config['lock']['title'] = strval($db_info->sitelock_title ?? '');
$config['lock']['message'] = strval($db_info->sitelock_message ?? '');
if (!is_array($db_info->sitelock_whitelist))
{
$db_info->sitelock_whitelist = $db_info->sitelock_whitelist ? array_map('trim', explode(',', trim($db_info->sitelock_whitelist))) : array();
@ -220,7 +220,7 @@ class ConfigParser
$config['lock']['allow'] = array_values($db_info->sitelock_whitelist);
// Convert media filter configuration.
if (is_array($db_info->embed_white_iframe))
if (is_array($db_info->embed_white_iframe ?? null))
{
$whitelist = array_unique(array_map(function($item) {
return preg_match('@^https?://(.*)$@i', $item, $matches) ? $matches[1] : $item;
@ -228,7 +228,7 @@ class ConfigParser
natcasesort($whitelist);
$config['mediafilter']['iframe'] = $whitelist;
}
if (is_array($db_info->embed_white_object))
if (is_array($db_info->embed_white_object ?? null))
{
$whitelist = array_unique(array_map(function($item) {
return preg_match('@^https?://(.*)$@i', $item, $matches) ? $matches[1] : $item;
@ -240,9 +240,9 @@ class ConfigParser
// Convert miscellaneous configuration.
$config['file']['folder_structure'] = 1;
$config['file']['umask'] = Storage::recommendUmask();
$config['mobile']['enabled'] = $db_info->use_mobile_view === 'N' ? false : true;
$config['use_rewrite'] = $db_info->use_rewrite === 'Y' ? true : false;
$config['use_sso'] = $db_info->use_sso === 'Y' ? true : false;
$config['mobile']['enabled'] = ($db_info->use_mobile_view ?? 'N') === 'N' ? false : true;
$config['use_rewrite'] = ($db_info->use_rewrite ?? 'N') === 'Y' ? true : false;
$config['use_sso'] = ($db_info->use_sso ?? 'N') === 'Y' ? true : false;
// Copy other configuration.
unset($db_info->master_db, $db_info->slave_db);

32
common/framework/parsers/dbquery/VariableBase.php
View file

@ -254,8 +254,11 @@ class VariableBase
break;
case 'search':
$parsed_keywords = $this->_parseSearchKeywords($column, $value);
$where = $parsed_keywords[0];
$params = array_merge($params, $parsed_keywords[1]);
if (count($parsed_keywords))
{
$where = $parsed_keywords[0];
$params = array_merge($params, $parsed_keywords[1]);
}
break;
case 'plus':
$where = sprintf('%s = %s + %s', $column, $column, $is_expression ? $value : '?');
@ -500,7 +503,7 @@ class VariableBase
// parse the value (text);
$value = str_replace('"', '"', $value);
$keywords = preg_split('/(\([^\)]*?\))|(\-?\"[^\"]*?\")|[\s,]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
$keywords = preg_split('/(\([^\)]*?\))|(\-?\"[^\"]*?\")|[\s]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
$conditions = array();
$operators = array('AND' => 'AND', 'OR' => 'OR', '|' => 'OR');
@ -521,9 +524,12 @@ class VariableBase
if ($item !== '')
{
$parsed_keywords = $this->_parseSearchKeywords($column, $item);
$conditions[] = $parsed_keywords[0];
$conditions[] = 'AND';
$params = array_merge($params, $parsed_keywords[1]);
if (count($parsed_keywords))
{
$conditions[] = $parsed_keywords[0];
$conditions[] = 'AND';
$params = array_merge($params, $parsed_keywords[1]);
}
}
continue;
}
@ -563,9 +569,17 @@ class VariableBase
// remove the last point (would be an operator)
array_pop($conditions);
$conditions = implode(' ', $conditions);
$where = count($keywords) === 1 ? $conditions : "($conditions)";
return [$where, $params];
// combine the conditions and return
if (count($params) === 0)
{
return [];
}
else
{
$conditions = implode(' ', $conditions);
$where = count($params) === 1 ? $conditions : "($conditions)";
return [$where, $params];
}
}
}