Fixed formatting

This commit is contained in:
Roman Kelesidis 2023-08-15 15:22:49 +07:00
parent 709433b282
commit b929aebdb1
4 changed files with 65 additions and 66 deletions

View File

@ -549,9 +549,9 @@ function get_var($var_name, $default, $multibyte = false)
{ {
foreach ($default as $key_type => $type) foreach ($default as $key_type => $type)
{ {
$key_type = gettype($key_type); $key_type = gettype($key_type);
$type = gettype($type); $type = gettype($type);
} }
} }
if (is_array($var)) if (is_array($var))
@ -689,4 +689,4 @@ function attach_mod_sql_build_array($query, $assoc_ary = false)
} }
return $query; return $query;
} }

View File

@ -545,7 +545,7 @@ class SphinxClient extends cache_common
$this->_mbenc = mb_internal_encoding(); $this->_mbenc = mb_internal_encoding();
mb_internal_encoding ( "latin1" ); mb_internal_encoding ( "latin1" );
} }
} }
/// leave mbstring workaround mode /// leave mbstring workaround mode
function _MBPop () function _MBPop ()
@ -947,9 +947,9 @@ class SphinxClient extends cache_common
/// clear all attribute value overrides (for multi-queries) /// clear all attribute value overrides (for multi-queries)
function ResetOverrides () 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 $ // $Id: sphinxapi.php 2055 2009-11-06 23:09:58Z shodan $
// //

View File

@ -489,33 +489,33 @@ class sql_db
{ {
switch ($clause) switch ($clause)
{ {
case 'SELECT': case 'SELECT':
$sql .= ($ary) ? ' SELECT '. join(' ', $sql_ary['select_options']) .' '. join(', ', $ary) : ''; $sql .= ($ary) ? ' SELECT '. join(' ', $sql_ary['select_options']) .' '. join(', ', $ary) : '';
break; break;
case 'FROM': case 'FROM':
$sql .= ($ary) ? ' FROM '. join(', ', $ary) : ''; $sql .= ($ary) ? ' FROM '. join(', ', $ary) : '';
break; break;
case 'INNER JOIN': case 'INNER JOIN':
$sql .= ($ary) ? ' INNER JOIN '. join(' INNER JOIN ', $ary) : ''; $sql .= ($ary) ? ' INNER JOIN '. join(' INNER JOIN ', $ary) : '';
break; break;
case 'LEFT JOIN': case 'LEFT JOIN':
$sql .= ($ary) ? ' LEFT JOIN '. join(' LEFT JOIN ', $ary) : ''; $sql .= ($ary) ? ' LEFT JOIN '. join(' LEFT JOIN ', $ary) : '';
break; break;
case 'WHERE': case 'WHERE':
$sql .= ($ary) ? ' WHERE '. join(' AND ', $ary) : ''; $sql .= ($ary) ? ' WHERE '. join(' AND ', $ary) : '';
break; break;
case 'GROUP BY': case 'GROUP BY':
$sql .= ($ary) ? ' GROUP BY '. join(', ', $ary) : ''; $sql .= ($ary) ? ' GROUP BY '. join(', ', $ary) : '';
break; break;
case 'HAVING': case 'HAVING':
$sql .= ($ary) ? ' HAVING '. join(' AND ', $ary) : ''; $sql .= ($ary) ? ' HAVING '. join(' AND ', $ary) : '';
break; break;
case 'ORDER BY': case 'ORDER BY':
$sql .= ($ary) ? ' ORDER BY '. join(', ', $ary) : ''; $sql .= ($ary) ? ' ORDER BY '. join(', ', $ary) : '';
break; break;
case 'LIMIT': case 'LIMIT':
$sql .= ($ary) ? ' LIMIT '. join(', ', $ary) : ''; $sql .= ($ary) ? ' LIMIT '. join(', ', $ary) : '';
break; break;
} }
} }
@ -924,7 +924,7 @@ class sql_db
switch ($mode) switch ($mode)
{ {
case 'start': case 'start':
$this->explain_hold = ''; $this->explain_hold = '';
// TODO: добавить поддержку многотабличных запросов // TODO: добавить поддержку многотабличных запросов
if (preg_match('#UPDATE ([a-z0-9_]+).*?WHERE(.*)/#', $query, $m)) if (preg_match('#UPDATE ([a-z0-9_]+).*?WHERE(.*)/#', $query, $m))

View File

@ -2032,38 +2032,37 @@ if (!function_exists('array_combine'))
* @since PHP 5.0.2 * @since PHP 5.0.2
*/ */
if (!function_exists('array_intersect_key')) { if (!function_exists('array_intersect_key')) {
function array_intersect_key() function array_intersect_key()
{ {
$args = func_get_args(); $args = func_get_args();
if (count($args) < 2) { if (count($args) < 2) {
user_error('Wrong parameter count for array_intersect_key()', E_USER_WARNING); user_error('Wrong parameter count for array_intersect_key()', E_USER_WARNING);
return; return;
} }
// Check arrays // Check arrays
$array_count = count($args); $array_count = count($args);
for ($i = 0; $i !== $array_count; $i++) { for ($i = 0; $i !== $array_count; $i++) {
if (!is_array($args[$i])) { if (!is_array($args[$i])) {
user_error('array_intersect_key() Argument #' . user_error('array_intersect_key() Argument #' . ($i + 1) . ' is not an array', E_USER_WARNING);
($i + 1) . ' is not an array', E_USER_WARNING); return;
return; }
} }
}
// Compare entries // Compare entries
$result = array(); $result = array();
foreach ($args[0] as $key1 => $value1) { foreach ($args[0] as $key1 => $value1) {
for ($i = 1; $i !== $array_count; $i++) { for ($i = 1; $i !== $array_count; $i++) {
foreach ($args[$i] as $key2 => $value2) { foreach ($args[$i] as $key2 => $value2) {
if ((string) $key1 === (string) $key2) { if ((string)$key1 === (string)$key2) {
$result[$key1] = $value1; $result[$key1] = $value1;
} }
} }
} }
} }
return $result; return $result;
} }
} }
function clear_dl_list ($topics_csv) function clear_dl_list ($topics_csv)