From b929aebdb1ec0332cb26ab0cd3228b23df1454ba Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Tue, 15 Aug 2023 15:22:49 +0700 Subject: [PATCH] Fixed formatting --- .../attach_mod/includes/functions_attach.php | 8 +-- library/includes/api/sphinx.php | 10 ++-- library/includes/core/mysql.php | 56 +++++++++--------- library/includes/functions.php | 57 +++++++++---------- 4 files changed, 65 insertions(+), 66 deletions(-) diff --git a/library/attach_mod/includes/functions_attach.php b/library/attach_mod/includes/functions_attach.php index 497ffd54..50238a4b 100644 --- a/library/attach_mod/includes/functions_attach.php +++ b/library/attach_mod/includes/functions_attach.php @@ -549,9 +549,9 @@ function get_var($var_name, $default, $multibyte = false) { foreach ($default as $key_type => $type) { - $key_type = gettype($key_type); - $type = gettype($type); - } + $key_type = gettype($key_type); + $type = gettype($type); + } } if (is_array($var)) @@ -689,4 +689,4 @@ function attach_mod_sql_build_array($query, $assoc_ary = false) } return $query; -} \ No newline at end of file +} diff --git a/library/includes/api/sphinx.php b/library/includes/api/sphinx.php index 68b29869..71c8bb63 100644 --- a/library/includes/api/sphinx.php +++ b/library/includes/api/sphinx.php @@ -545,7 +545,7 @@ class SphinxClient extends cache_common $this->_mbenc = mb_internal_encoding(); mb_internal_encoding ( "latin1" ); } - } + } /// leave mbstring workaround mode function _MBPop () @@ -947,9 +947,9 @@ class SphinxClient extends cache_common /// clear all attribute value overrides (for multi-queries) function ResetOverrides () - { - $this->_overrides = array (); - } + { + $this->_overrides = array (); + } ////////////////////////////////////////////////////////////////////////////// @@ -1650,4 +1650,4 @@ class SphinxClient extends cache_common // // $Id: sphinxapi.php 2055 2009-11-06 23:09:58Z shodan $ -// \ No newline at end of file +// diff --git a/library/includes/core/mysql.php b/library/includes/core/mysql.php index 5668291b..406048dc 100644 --- a/library/includes/core/mysql.php +++ b/library/includes/core/mysql.php @@ -489,33 +489,33 @@ class sql_db { switch ($clause) { - case 'SELECT': - $sql .= ($ary) ? ' SELECT '. join(' ', $sql_ary['select_options']) .' '. join(', ', $ary) : ''; - break; - case 'FROM': - $sql .= ($ary) ? ' FROM '. join(', ', $ary) : ''; - break; - case 'INNER JOIN': - $sql .= ($ary) ? ' INNER JOIN '. join(' INNER JOIN ', $ary) : ''; - break; - case 'LEFT JOIN': - $sql .= ($ary) ? ' LEFT JOIN '. join(' LEFT JOIN ', $ary) : ''; - break; - case 'WHERE': - $sql .= ($ary) ? ' WHERE '. join(' AND ', $ary) : ''; - break; - case 'GROUP BY': - $sql .= ($ary) ? ' GROUP BY '. join(', ', $ary) : ''; - break; - case 'HAVING': - $sql .= ($ary) ? ' HAVING '. join(' AND ', $ary) : ''; - break; - case 'ORDER BY': - $sql .= ($ary) ? ' ORDER BY '. join(', ', $ary) : ''; - break; - case 'LIMIT': - $sql .= ($ary) ? ' LIMIT '. join(', ', $ary) : ''; - break; + case 'SELECT': + $sql .= ($ary) ? ' SELECT '. join(' ', $sql_ary['select_options']) .' '. join(', ', $ary) : ''; + break; + case 'FROM': + $sql .= ($ary) ? ' FROM '. join(', ', $ary) : ''; + break; + case 'INNER JOIN': + $sql .= ($ary) ? ' INNER JOIN '. join(' INNER JOIN ', $ary) : ''; + break; + case 'LEFT JOIN': + $sql .= ($ary) ? ' LEFT JOIN '. join(' LEFT JOIN ', $ary) : ''; + break; + case 'WHERE': + $sql .= ($ary) ? ' WHERE '. join(' AND ', $ary) : ''; + break; + case 'GROUP BY': + $sql .= ($ary) ? ' GROUP BY '. join(', ', $ary) : ''; + break; + case 'HAVING': + $sql .= ($ary) ? ' HAVING '. join(' AND ', $ary) : ''; + break; + case 'ORDER BY': + $sql .= ($ary) ? ' ORDER BY '. join(', ', $ary) : ''; + break; + case 'LIMIT': + $sql .= ($ary) ? ' LIMIT '. join(', ', $ary) : ''; + break; } } @@ -924,7 +924,7 @@ class sql_db switch ($mode) { - case 'start': + case 'start': $this->explain_hold = ''; // TODO: добавить поддержку многотабличных запросов if (preg_match('#UPDATE ([a-z0-9_]+).*?WHERE(.*)/#', $query, $m)) diff --git a/library/includes/functions.php b/library/includes/functions.php index b4a66e62..d7df49c3 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -2032,38 +2032,37 @@ if (!function_exists('array_combine')) * @since PHP 5.0.2 */ if (!function_exists('array_intersect_key')) { - function array_intersect_key() - { - $args = func_get_args(); - if (count($args) < 2) { - user_error('Wrong parameter count for array_intersect_key()', E_USER_WARNING); - return; - } + function array_intersect_key() + { + $args = func_get_args(); + if (count($args) < 2) { + user_error('Wrong parameter count for array_intersect_key()', E_USER_WARNING); + return; + } - // Check arrays - $array_count = count($args); - for ($i = 0; $i !== $array_count; $i++) { - if (!is_array($args[$i])) { - user_error('array_intersect_key() Argument #' . - ($i + 1) . ' is not an array', E_USER_WARNING); - return; - } - } + // Check arrays + $array_count = count($args); + for ($i = 0; $i !== $array_count; $i++) { + if (!is_array($args[$i])) { + user_error('array_intersect_key() Argument #' . ($i + 1) . ' is not an array', E_USER_WARNING); + return; + } + } - // Compare entries - $result = array(); - foreach ($args[0] as $key1 => $value1) { - for ($i = 1; $i !== $array_count; $i++) { - foreach ($args[$i] as $key2 => $value2) { - if ((string) $key1 === (string) $key2) { - $result[$key1] = $value1; - } - } - } - } + // Compare entries + $result = array(); + foreach ($args[0] as $key1 => $value1) { + for ($i = 1; $i !== $array_count; $i++) { + foreach ($args[$i] as $key2 => $value2) { + if ((string)$key1 === (string)$key2) { + $result[$key1] = $value1; + } + } + } + } - return $result; - } + return $result; + } } function clear_dl_list ($topics_csv)