Fix whitespace
This commit is contained in:
parent
48ed20323f
commit
923c0ffc87
|
@ -17,7 +17,7 @@ if (isset($_GET["elastic"])) {
|
||||||
*/
|
*/
|
||||||
function rootQuery($path, $content = array(), $method = 'GET') {
|
function rootQuery($path, $content = array(), $method = 'GET') {
|
||||||
@ini_set('track_errors', 1); // @ - may be disabled
|
@ini_set('track_errors', 1); // @ - may be disabled
|
||||||
$file = @file_get_contents($this->_url . '/' . ltrim($path, '/'), false, stream_context_create(array('http' => array(
|
$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
|
||||||
'method' => $method,
|
'method' => $method,
|
||||||
'content' => $content === null ? $content : json_encode($content),
|
'content' => $content === null ? $content : json_encode($content),
|
||||||
'header' => 'Content-Type: application/json',
|
'header' => 'Content-Type: application/json',
|
||||||
|
@ -157,7 +157,7 @@ if (isset($_GET["elastic"])) {
|
||||||
foreach ($search['hits']['hits'] as $hit) {
|
foreach ($search['hits']['hits'] as $hit) {
|
||||||
$row = array();
|
$row = array();
|
||||||
if ($select == array("*")) {
|
if ($select == array("*")) {
|
||||||
$row["_id"] = $hit["_id"];
|
$row["_id"] = $hit["_id"];
|
||||||
}
|
}
|
||||||
$fields = $hit['_source'];
|
$fields = $hit['_source'];
|
||||||
if ($select != array("*")) {
|
if ($select != array("*")) {
|
||||||
|
|
|
@ -314,7 +314,7 @@ if (isset($_GET["mssql"])) {
|
||||||
|
|
||||||
function db_collation($db, $collations) {
|
function db_collation($db, $collations) {
|
||||||
global $connection;
|
global $connection;
|
||||||
return $connection->result("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
|
return $connection->result("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
|
||||||
}
|
}
|
||||||
|
|
||||||
function engines() {
|
function engines() {
|
||||||
|
|
|
@ -713,8 +713,8 @@ AND typelem = 0"
|
||||||
function trigger_sql($table, $style) {
|
function trigger_sql($table, $style) {
|
||||||
$return = "";
|
$return = "";
|
||||||
//foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
|
//foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
|
||||||
// $return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
|
// $return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
|
||||||
// . "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
|
// . "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
|
||||||
//}
|
//}
|
||||||
//return $return;
|
//return $return;
|
||||||
|
|
||||||
|
|
|
@ -317,7 +317,7 @@ class Adminer {
|
||||||
" name='columns[$i][col]'",
|
" name='columns[$i][col]'",
|
||||||
$columns,
|
$columns,
|
||||||
$val["col"],
|
$val["col"],
|
||||||
($key !== "" ? "selectFieldChange" : "selectAddRow")
|
($key !== "" ? "selectFieldChange" : "selectAddRow")
|
||||||
);
|
);
|
||||||
echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
|
echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
|
||||||
. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
|
. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
|
||||||
|
|
|
@ -531,7 +531,7 @@ function db_size($db) {
|
||||||
* @return null
|
* @return null
|
||||||
*/
|
*/
|
||||||
function set_utf8mb4($create) {
|
function set_utf8mb4($create) {
|
||||||
global $connection;
|
global $connection;
|
||||||
static $set = false;
|
static $set = false;
|
||||||
if (!$set && preg_match('~\butf8mb4~i', $create)) { // possible false positive
|
if (!$set && preg_match('~\butf8mb4~i', $create)) { // possible false positive
|
||||||
$set = true;
|
$set = true;
|
||||||
|
|
|
@ -38,7 +38,7 @@ function escape_string($val) {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function number($val) {
|
function number($val) {
|
||||||
return preg_replace('~[^0-9]+~', '', $val);
|
return preg_replace('~[^0-9]+~', '', $val);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Disable magic_quotes_gpc
|
/** Disable magic_quotes_gpc
|
||||||
|
@ -791,7 +791,7 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function format_number($val) {
|
function format_number($val) {
|
||||||
return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
|
return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Generate friendly URL
|
/** Generate friendly URL
|
||||||
|
@ -915,7 +915,7 @@ function input($field, $value, $function) {
|
||||||
echo $input;
|
echo $input;
|
||||||
} elseif (preg_match('~bool~', $field["type"])) {
|
} elseif (preg_match('~bool~', $field["type"])) {
|
||||||
echo "<input type='hidden'$attrs value='0'>" .
|
echo "<input type='hidden'$attrs value='0'>" .
|
||||||
"<input type='checkbox'" . (in_array(strtolower($value), array('1', 't', 'true', 'y', 'yes', 'on')) ? " checked='checked'" : "") . "$attrs value='1'>";
|
"<input type='checkbox'" . (in_array(strtolower($value), array('1', 't', 'true', 'y', 'yes', 'on')) ? " checked='checked'" : "") . "$attrs value='1'>";
|
||||||
} elseif ($field["type"] == "set") { //! 64 bits
|
} elseif ($field["type"] == "set") { //! 64 bits
|
||||||
preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
|
preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
|
||||||
foreach ($matches[1] as $i => $val) {
|
foreach ($matches[1] as $i => $val) {
|
||||||
|
|
|
@ -36,7 +36,7 @@ $langs = array(
|
||||||
'sl' => 'Slovenski', // Matej Ferlan - www.itdinamik.com, matej.ferlan@itdinamik.com
|
'sl' => 'Slovenski', // Matej Ferlan - www.itdinamik.com, matej.ferlan@itdinamik.com
|
||||||
'sr' => 'Српски', // Nikola Radovanović - cobisimo@gmail.com
|
'sr' => 'Српски', // Nikola Radovanović - cobisimo@gmail.com
|
||||||
'ta' => 'தமிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
|
'ta' => 'தமிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
|
||||||
'th' => 'ภาษาไทย', // Panya Saraphi, elect.tu@gmail.com - http://www.opencart2u.com/
|
'th' => 'ภาษาไทย', // Panya Saraphi, elect.tu@gmail.com - http://www.opencart2u.com/
|
||||||
'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com
|
'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com
|
||||||
'uk' => 'Українська', // Valerii Kryzhov
|
'uk' => 'Українська', // Valerii Kryzhov
|
||||||
'vi' => 'Tiếng Việt', // Giang Manh @ manhgd google mail
|
'vi' => 'Tiếng Việt', // Giang Manh @ manhgd google mail
|
||||||
|
|
|
@ -283,6 +283,6 @@ $translations = array(
|
||||||
'Saving' => 'Speichere',
|
'Saving' => 'Speichere',
|
||||||
'yes' => 'ja',
|
'yes' => 'ja',
|
||||||
'no' => 'nein',
|
'no' => 'nein',
|
||||||
'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/" target="_blank">Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
|
'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/" target="_blank">Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
|
||||||
'%d / ' => '%d / ',
|
'%d / ' => '%d / ',
|
||||||
);
|
);
|
||||||
|
|
|
@ -149,7 +149,7 @@ $translations = array(
|
||||||
'Table' => 'Πίνακας',
|
'Table' => 'Πίνακας',
|
||||||
'No tables.' => 'Χωρίς πίνακες.',
|
'No tables.' => 'Χωρίς πίνακες.',
|
||||||
'Alter table' => 'Τροποποίηση πίνακα',
|
'Alter table' => 'Τροποποίηση πίνακα',
|
||||||
'Create table' => 'Δημιουργία πίνακα',
|
'Create table' => 'Δημιουργία πίνακα',
|
||||||
'Table has been dropped.' => 'Ο πίνακας διαγράφηκε.',
|
'Table has been dropped.' => 'Ο πίνακας διαγράφηκε.',
|
||||||
'Tables have been dropped.' => 'Οι πινακες διαγράφηκαν.',
|
'Tables have been dropped.' => 'Οι πινακες διαγράφηκαν.',
|
||||||
'Tables have been optimized.' => 'Οι πίνακες βελτιστοποιήθηκαν.',
|
'Tables have been optimized.' => 'Οι πίνακες βελτιστοποιήθηκαν.',
|
||||||
|
|
|
@ -281,7 +281,7 @@ $translations = array(
|
||||||
'Full table scan' => 'סריקה טבלה מלאה',
|
'Full table scan' => 'סריקה טבלה מלאה',
|
||||||
'Too many unsuccessful logins, try again in %d minute(s).' => 'יותר מידי נסיונות כניסה נכשלו, אנא נסה עוד %d דקות',
|
'Too many unsuccessful logins, try again in %d minute(s).' => 'יותר מידי נסיונות כניסה נכשלו, אנא נסה עוד %d דקות',
|
||||||
'Thanks for using Adminer, consider <a href="%s">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="%s">לתרום</a>.',
|
'Thanks for using Adminer, consider <a href="%s">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="%s">לתרום</a>.',
|
||||||
'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'סיסמת המאסטר פגה <a href="https://www.adminer.org/en/extension/" target="_blank">התקן תוסף</a> על מנת להפוך את זה לתמידי',
|
'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'סיסמת המאסטר פגה <a href="https://www.adminer.org/en/extension/" target="_blank">התקן תוסף</a> על מנת להפוך את זה לתמידי',
|
||||||
'If you did not send this request from Adminer then close this page.' => 'אם לא אתה שלחת בקשה ל-Adminer הינך יכול לסגור חלון זה',
|
'If you did not send this request from Adminer then close this page.' => 'אם לא אתה שלחת בקשה ל-Adminer הינך יכול לסגור חלון זה',
|
||||||
'You can upload a big SQL file via FTP and import it from server.' => 'ניתן לעלות קבצים ב-FTP ואז למשוך אותם מהשרת',
|
'You can upload a big SQL file via FTP and import it from server.' => 'ניתן לעלות קבצים ב-FTP ואז למשוך אותם מהשרת',
|
||||||
'Size' => 'גודל',
|
'Size' => 'גודל',
|
||||||
|
|
|
@ -231,8 +231,8 @@ $translations = array(
|
||||||
'%d row(s)' => array('%d ред', '%d реда', '%d редова'),
|
'%d row(s)' => array('%d ред', '%d реда', '%d редова'),
|
||||||
'Page' => 'Страна',
|
'Page' => 'Страна',
|
||||||
'last' => 'последња',
|
'last' => 'последња',
|
||||||
'Loading' => 'Учитавам',
|
'Loading' => 'Учитавам',
|
||||||
'Load more data' => 'Учитавам још података',
|
'Load more data' => 'Учитавам још података',
|
||||||
'whole result' => 'цео резултат',
|
'whole result' => 'цео резултат',
|
||||||
'%d byte(s)' => array('%d бајт', '%d бајта', '%d бајтова'),
|
'%d byte(s)' => array('%d бајт', '%d бајта', '%d бајтова'),
|
||||||
|
|
||||||
|
|
|
@ -461,7 +461,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
if ($options !== null) {
|
if ($options !== null) {
|
||||||
return (is_array($options)
|
return (is_array($options)
|
||||||
? "<select$attrs>" . optionlist($options, $value, true) . "</select>"
|
? "<select$attrs>" . optionlist($options, $value, true) . "</select>"
|
||||||
: "<input value='" . h($value) . "'$attrs class='hidden'>"
|
: "<input value='" . h($value) . "'$attrs class='hidden'>"
|
||||||
. "<input value='" . h($options) . "' class='jsonly'>"
|
. "<input value='" . h($options) . "' class='jsonly'>"
|
||||||
. "<div></div>"
|
. "<div></div>"
|
||||||
. script("qsl('input').oninput = partial(whisper, '" . ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"]) . "&value=');
|
. script("qsl('input').oninput = partial(whisper, '" . ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"]) . "&value=');
|
||||||
|
|
|
@ -39,7 +39,7 @@ class AdminerLoginServers {
|
||||||
?>
|
?>
|
||||||
<table cellspacing="0">
|
<table cellspacing="0">
|
||||||
<tr><th><?php echo lang('Server'); ?><td><input type="hidden" name="auth[driver]" value="<?php echo $this->driver; ?>"><select name="auth[server]"><?php echo optionlist($this->servers, SERVER); ?></select>
|
<tr><th><?php echo lang('Server'); ?><td><input type="hidden" name="auth[driver]" value="<?php echo $this->driver; ?>"><select name="auth[server]"><?php echo optionlist($this->servers, SERVER); ?></select>
|
||||||
<tr><th><?php echo lang('Username'); ?><td><input id="username" name="auth[username]" value="<?php echo h($_GET["username"]); ?>">
|
<tr><th><?php echo lang('Username'); ?><td><input id="username" name="auth[username]" value="<?php echo h($_GET["username"]); ?>">
|
||||||
<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
|
<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
|
||||||
</table>
|
</table>
|
||||||
<p><input type="submit" value="<?php echo lang('Login'); ?>">
|
<p><input type="submit" value="<?php echo lang('Login'); ?>">
|
||||||
|
|
Loading…
Reference in a new issue