beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Replace isset($var) by $var !== null

Browse source
This commit is contained in:
Jakub Vrana 2012-05-13 23:54:07 -07:00
parent 40ad846d20
commit 6591d485e9
24 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adminer/create.inc.php
View file

@ -29,7 +29,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
$after = "FIRST"; $after = "FIRST";
foreach ($_POST["fields"] as $key => $field) { foreach ($_POST["fields"] as $key => $field) {
$foreign_key = $foreign_keys[$field["type"]]; $foreign_key = $foreign_keys[$field["type"]];
$type_field = (isset($foreign_key) ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type $type_field = ($foreign_key !== null ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
if ($field["field"] != "") { if ($field["field"] != "") {
if (!$field["has_default"]) { if (!$field["has_default"]) {
$field["default"] = null; $field["default"] = null;
@ -46,7 +46,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
if ($process_field != process_field($orig_field, $orig_field)) { if ($process_field != process_field($orig_field, $orig_field)) {
$fields[] = array($field["orig"], $process_field, $after); $fields[] = array($field["orig"], $process_field, $after);
} }
if (isset($foreign_key)) { if ($foreign_key !== null) {
$foreign[idf_escape($field["field"])] = ($TABLE != "" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . table($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (ereg("^($on_actions)\$", $field["on_delete"]) ? " ON DELETE $field[on_delete]" : ""); $foreign[idf_escape($field["field"])] = ($TABLE != "" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . table($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (ereg("^($on_actions)\$", $field["on_delete"]) ? " ON DELETE $field[on_delete]" : "");
} }
$after = "AFTER " . idf_escape($field["field"]); $after = "AFTER " . idf_escape($field["field"]);

2
adminer/db.inc.php
View file

@ -67,7 +67,7 @@ if ($adminer->homepage()) {
echo (support("comment") ? '<td>' . lang('Comment') : ''); echo (support("comment") ? '<td>' . lang('Comment') : '');
echo "</thead>\n"; echo "</thead>\n";
foreach ($tables_list as $name => $type) { foreach ($tables_list as $name => $type) {
$view = (isset($type) && !eregi("table", $type)); $view = ($type !== null && !eregi("table", $type));
echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');"); echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
echo '<th><a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>'; echo '<th><a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>';
if ($view) { if ($view) {

2
adminer/drivers/mssql.inc.php
View file

@ -252,7 +252,7 @@ if (isset($_GET["mssql"])) {
} }
function limit($query, $where, $limit, $offset = 0, $separator = " ") { function limit($query, $where, $limit, $offset = 0, $separator = " ") {
return (isset($limit) ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
} }
function limit1($query, $where) { function limit1($query, $where) {

4
adminer/drivers/mysql.inc.php
View file

@ -268,7 +268,7 @@ if (!defined("DRIVER")) {
global $connection; global $connection;
// SHOW DATABASES can take a very long time so it is cached // SHOW DATABASES can take a very long time so it is cached
$return = &get_session("dbs"); $return = &get_session("dbs");
if (!isset($return)) { if ($return === null) {
if ($flush) { if ($flush) {
restart_session(); restart_session();
ob_flush(); ob_flush();
@ -288,7 +288,7 @@ if (!defined("DRIVER")) {
* @return string * @return string
*/ */
function limit($query, $where, $limit, $offset = 0, $separator = " ") { function limit($query, $where, $limit, $offset = 0, $separator = " ") {
return " $query$where" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : ""); return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
} }
/** Formulate SQL modification query with limit 1 /** Formulate SQL modification query with limit 1

2
adminer/drivers/oracle.inc.php
View file

@ -154,7 +154,7 @@ if (isset($_GET["oracle"])) {
function limit($query, $where, $limit, $offset = 0, $separator = " ") { function limit($query, $where, $limit, $offset = 0, $separator = " ") {
return ($offset ? " * FROM (SELECT t.*, rownum AS rnum FROM (SELECT $query$where) t WHERE rownum <= " . ($limit + $offset) . ") WHERE rnum > $offset" return ($offset ? " * FROM (SELECT t.*, rownum AS rnum FROM (SELECT $query$where) t WHERE rownum <= " . ($limit + $offset) . ") WHERE rnum > $offset"
: (isset($limit) ? " * FROM (SELECT $query$where) WHERE rownum <= " . ($limit + $offset) : ($limit !== null ? " * FROM (SELECT $query$where) WHERE rownum <= " . ($limit + $offset)
: " $query$where" : " $query$where"
)); ));
} }

2
adminer/drivers/pgsql.inc.php
View file

@ -174,7 +174,7 @@ if (isset($_GET["pgsql"])) {
} }
function limit($query, $where, $limit, $offset = 0, $separator = " ") { function limit($query, $where, $limit, $offset = 0, $separator = " ") {
return " $query$where" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : ""); return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
} }
function limit1($query, $where) { function limit1($query, $where) {

2
adminer/drivers/sqlite.inc.php
View file

@ -218,7 +218,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
} }
function limit($query, $where, $limit, $offset = 0, $separator = " ") { function limit($query, $where, $limit, $offset = 0, $separator = " ") {
return " $query$where" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : ""); return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
} }
function limit1($query, $where) { function limit1($query, $where) {

6
adminer/edit.inc.php
View file

@ -75,14 +75,14 @@ if ($fields) {
foreach ($fields as $name => $field) { foreach ($fields as $name => $field) {
echo "<tr><th>" . $adminer->fieldName($field); echo "<tr><th>" . $adminer->fieldName($field);
$default = $_GET["set"][bracket_escape($name)]; $default = $_GET["set"][bracket_escape($name)];
$value = (isset($row) $value = ($row !== null
? ($row[$name] != "" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name]) ? ($row[$name] != "" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name])
: (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : (isset($default) ? $default : $field["default"]))) : (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : ($default !== null ? $default : $field["default"])))
); );
if (!$_POST["save"] && is_string($value)) { if (!$_POST["save"] && is_string($value)) {
$value = $adminer->editVal($value, $field); $value = $adminer->editVal($value, $field);
} }
$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL')))); $function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : ($value !== null ? '' : 'NULL'))));
if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") { if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
$value = ""; $value = "";
$function = "now"; $function = "now";

16
adminer/include/adminer.inc.php
View file

@ -117,7 +117,7 @@ username.form['driver'].onchange();
} else { } else {
$links["create"] = lang('Alter table'); $links["create"] = lang('Alter table');
} }
if (isset($set)) { if ($set !== null) {
$links["edit"] = lang('New item'); $links["edit"] = lang('New item');
} }
foreach ($links as $key => $val) { foreach ($links as $key => $val) {
@ -288,7 +288,7 @@ username.form['driver'].onchange();
* @return null * @return null
*/ */
function selectLengthPrint($text_length) { function selectLengthPrint($text_length) {
if (isset($text_length)) { if ($text_length !== null) {
echo "<fieldset><legend>" . lang('Text length') . "</legend><div>"; echo "<fieldset><legend>" . lang('Text length') . "</legend><div>";
echo '<input name="text_length" size="3" value="' . h($text_length) . '">'; echo '<input name="text_length" size="3" value="' . h($text_length) . '">';
echo "</div></fieldset>\n"; echo "</div></fieldset>\n";
@ -477,7 +477,7 @@ username.form['driver'].onchange();
function editInput($table, $field, $attrs, $value) { function editInput($table, $field, $attrs, $value) {
if ($field["type"] == "enum") { if ($field["type"] == "enum") {
return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "") return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
. ($field["null"] ? "<label><input type='radio'$attrs value=''" . (isset($value) || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "") . ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value !== null || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
. enum_input("radio", $attrs, $field, $value, 0) // 0 - empty . enum_input("radio", $attrs, $field, $value, 0) // 0 - empty
; ;
} }
@ -577,12 +577,12 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
$after = ""; $after = "";
foreach (get_rows($query) as $row) { foreach (get_rows($query) as $row) {
$default = $row["COLUMN_DEFAULT"]; $default = $row["COLUMN_DEFAULT"];
$row["default"] = (isset($default) ? q($default) : "NULL"); $row["default"] = ($default !== null ? q($default) : "NULL");
$row["after"] = q($after); //! rgt AFTER lft, lft AFTER id doesn't work $row["after"] = q($after); //! rgt AFTER lft, lft AFTER id doesn't work
$row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"]) $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"])
. " $row[COLUMN_TYPE]" . " $row[COLUMN_TYPE]"
. ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "") . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "")
. (isset($default) ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "") . ($default !== null ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
. ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL") . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
. ($row["EXTRA"] ? " $row[EXTRA]" : "") . ($row["EXTRA"] ? " $row[EXTRA]" : "")
. ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "") . ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "")
@ -667,7 +667,7 @@ DROP PROCEDURE adminer_alter;
$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES"; $insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
} }
foreach ($row as $key => $val) { foreach ($row as $key => $val) {
$row[$key] = (isset($val) ? (ereg('int|float|double|decimal|bit', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions $row[$key] = ($val !== null ? (ereg('int|float|double|decimal|bit', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
} }
$s = implode(",\t", $row); $s = implode(",\t", $row);
if ($style == "INSERT+UPDATE") { if ($style == "INSERT+UPDATE") {
@ -750,7 +750,7 @@ DROP PROCEDURE adminer_alter;
foreach ((array) $_SESSION["pwds"] as $driver => $servers) { foreach ((array) $_SESSION["pwds"] as $driver => $servers) {
foreach ($servers as $server => $usernames) { foreach ($servers as $server => $usernames) {
foreach ($usernames as $username => $password) { foreach ($usernames as $username => $password) {
if (isset($password)) { if ($password !== null) {
if ($first) { if ($first) {
echo "<p onclick='eventStop(event);'>\n"; echo "<p onclick='eventStop(event);'>\n";
$first = false; $first = false;
@ -833,6 +833,6 @@ DROP PROCEDURE adminer_alter;
} }
$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer); $adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
if (!isset($adminer->operators)) { if ($adminer->operators === null) {
$adminer->operators = $operators; $adminer->operators = $operators;
} }

2
adminer/include/auth.inc.php
View file

@ -67,7 +67,7 @@ function auth_error($exception = null) {
$error = lang('Session expired, please login again.'); $error = lang('Session expired, please login again.');
} else { } else {
$password = &get_session("pwds"); $password = &get_session("pwds");
if (isset($password)) { if ($password !== null) {
$error = h($exception ? $exception->getMessage() : (is_string($connection) ? $connection : lang('Invalid credentials.'))); $error = h($exception ? $exception->getMessage() : (is_string($connection) ? $connection : lang('Invalid credentials.')));
$password = null; $password = null;
} }

2
adminer/include/design.inc.php
View file

@ -41,7 +41,7 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
<div id="content"> <div id="content">
<?php <?php
if (isset($breadcrumb)) { if ($breadcrumb !== null) {
$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1); $link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; '; echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1); $link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);

2
adminer/include/editing.inc.php
View file

@ -55,7 +55,7 @@ function select($result, $connection2 = null, $href = "", $orgtables = array())
} }
echo "<tr" . odd() . ">"; echo "<tr" . odd() . ">";
foreach ($row as $key => $val) { foreach ($row as $key => $val) {
if (!isset($val)) { if ($val === null) {
$val = "<i>NULL</i>"; $val = "<i>NULL</i>";
} elseif ($blobs[$key] && !is_utf8($val)) { } elseif ($blobs[$key] && !is_utf8($val)) {
$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download $val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download

18
adminer/include/functions.inc.php
View file

@ -206,7 +206,7 @@ function json_row($key, $val = null) {
echo "{"; echo "{";
} }
if ($key != "") { if ($key != "") {
echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\") . '": ' . (isset($val) ? '"' . addcslashes($val, "\r\n\"\\") . '"' : 'undefined'); echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\") . '"' : 'undefined');
$first = false; $first = false;
} else { } else {
echo "\n}\n"; echo "\n}\n";
@ -228,7 +228,7 @@ function ini_bool($ini) {
*/ */
function sid() { function sid() {
static $return; static $return;
if (!isset($return)) { // restart_session() defines SID if ($return === null) { // restart_session() defines SID
$return = (SID && !($_COOKIE && ini_bool("session.use_cookies"))); // $_COOKIE - don't pass SID with permanent login $return = (SID && !($_COOKIE && ini_bool("session.use_cookies"))); // $_COOKIE - don't pass SID with permanent login
} }
return $return; return $return;
@ -364,7 +364,7 @@ function where_check($val) {
* @return string * @return string
*/ */
function where_link($i, $column, $value, $operator = "=") { function where_link($i, $column, $value, $operator = "=") {
return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode((isset($value) ? $operator : "IS NULL")) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value); return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode(($value !== null ? $operator : "IS NULL")) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value);
} }
/** Set cookie valid for 1 month /** Set cookie valid for 1 month
@ -444,11 +444,11 @@ function is_ajax() {
* @return null * @return null
*/ */
function redirect($location, $message = null) { function redirect($location, $message = null) {
if (isset($message)) { if ($message !== null) {
restart_session(); restart_session();
$_SESSION["messages"][preg_replace('~^[^?]*~', '', (isset($location) ? $location : $_SERVER["REQUEST_URI"]))][] = $message; $_SESSION["messages"][preg_replace('~^[^?]*~', '', ($location !== null ? $location : $_SERVER["REQUEST_URI"]))][] = $message;
} }
if (isset($location)) { if ($location !== null) {
if ($location == "") { if ($location == "") {
$location = "."; $location = ".";
} }
@ -492,7 +492,7 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
function queries($query = null) { function queries($query = null) {
global $connection; global $connection;
static $queries = array(); static $queries = array();
if (!isset($query)) { if ($query === null) {
// return executed queries without parameter // return executed queries without parameter
return implode(";\n", $queries); return implode(";\n", $queries);
} }
@ -668,7 +668,7 @@ function column_foreign_keys($table) {
function enum_input($type, $attrs, $field, $value, $empty = null) { function enum_input($type, $attrs, $field, $value, $empty = null) {
global $adminer; global $adminer;
preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches); preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
$return = (isset($empty) ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : ""); $return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
foreach ($matches[1] as $i => $val) { foreach ($matches[1] as $i => $val) {
$val = stripcslashes(str_replace("''", "'", $val)); $val = stripcslashes(str_replace("''", "'", $val));
$checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val)); $checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
@ -705,7 +705,7 @@ function input($field, $value, $function) {
} }
$onchange = ($first ? " onchange=\"var f = this.form['function[" . h(js_escape(bracket_escape($field["field"]))) . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : ""); $onchange = ($first ? " onchange=\"var f = this.form['function[" . h(js_escape(bracket_escape($field["field"]))) . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : "");
$attrs .= $onchange; $attrs .= $onchange;
echo (count($functions) > 1 ? html_select("function[$name]", $functions, !isset($function) || in_array($function, $functions) || isset($functions[$function]) ? $function : "", "functionChange(this);") : nbsp(reset($functions))) . '<td>'; echo (count($functions) > 1 ? html_select("function[$name]", $functions, $function === null || in_array($function, $functions) || isset($functions[$function]) ? $function : "", "functionChange(this);") : nbsp(reset($functions))) . '<td>';
$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table $input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
if ($input != "") { if ($input != "") {
echo $input; echo $input;

2
adminer/include/lang.inc.php
View file

@ -60,7 +60,7 @@ function lang($idf, $number = null) {
} }
$args = func_get_args(); $args = func_get_args();
array_shift($args); array_shift($args);
return vsprintf((isset($translation) ? $translation : $idf), $args); return vsprintf(($translation !== null ? $translation : $idf), $args);
} }
function switch_lang() { function switch_lang() {

6
adminer/select.inc.php
View file

@ -286,7 +286,7 @@ if (!$columns) {
$unique_array = unique_array($rows[$n], $indexes); $unique_array = unique_array($rows[$n], $indexes);
$unique_idf = ""; $unique_idf = "";
foreach ($unique_array as $key => $val) { foreach ($unique_array as $key => $val) {
$unique_idf .= "&" . (isset($val) ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key)); $unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
} }
echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . (count($group) < count($select) || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>")); echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . (count($group) < count($select) || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>"));
foreach ($row as $key => $val) { foreach ($row as $key => $val) {
@ -351,11 +351,11 @@ if (!$columns) {
} }
$id = h("val[$unique_idf][" . bracket_escape($key) . "]"); $id = h("val[$unique_idf][" . bracket_escape($key) . "]");
$value = $_POST["val"][$unique_idf][bracket_escape($key)]; $value = $_POST["val"][$unique_idf][bracket_escape($key)];
$h_value = h(isset($value) ? $value : $row[$key]); $h_value = h($value !== null ? $value : $row[$key]);
$long = strpos($val, "<i>...</i>"); $long = strpos($val, "<i>...</i>");
$editable = is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key]; $editable = is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
$text = ereg('text|lob', $field["type"]); $text = ereg('text|lob', $field["type"]);
echo (($_GET["modify"] && $editable) || isset($value) echo (($_GET["modify"] && $editable) || $value !== null
? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>") ? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
: "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($long ? ", 2" : ($text ? ", 1" : "")) . ")" : "alert('" . h(lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field) : "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($long ? ", 2" : ($text ? ", 1" : "")) . ")" : "alert('" . h(lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
); );

4
compile.php
View file

@ -26,7 +26,7 @@ function remove_lang($match) {
function lang_ids($match) { function lang_ids($match) {
global $lang_ids; global $lang_ids;
$lang_id = &$lang_ids[stripslashes($match[1])]; $lang_id = &$lang_ids[stripslashes($match[1])];
if (!isset($lang_id)) { if ($lang_id === null) {
$lang_id = count($lang_ids) - 1; $lang_id = count($lang_ids) - 1;
} }
return ($_SESSION["lang"] ? $match[0] : "lang($lang_id$match[2]"); return ($_SESSION["lang"] ? $match[0] : "lang($lang_id$match[2]");
@ -68,7 +68,7 @@ function put_file_lang($match) {
include dirname(__FILE__) . "/adminer/lang/$lang.inc.php"; // assign $translations include dirname(__FILE__) . "/adminer/lang/$lang.inc.php"; // assign $translations
$translation_ids = array_flip($lang_ids); // default translation $translation_ids = array_flip($lang_ids); // default translation
foreach ($translations as $key => $val) { foreach ($translations as $key => $val) {
if (isset($val)) { if ($val !== null) {
$translation_ids[$lang_ids[$key]] = $val; $translation_ids[$lang_ids[$key]] = $val;
} }
} }

6
coverage.php
View file

@ -33,7 +33,7 @@ if (!extension_loaded("xdebug")) {
$filename = $_GET["coverage"]; $filename = $_GET["coverage"];
$coverage = (file_exists($coverage_filename) ? unserialize(file_get_contents($coverage_filename)) : array()); $coverage = (file_exists($coverage_filename) ? unserialize(file_get_contents($coverage_filename)) : array());
$file = explode("<br />", highlight_file($filename, true)); $file = explode("<br />", highlight_file($filename, true));
unset($prev_color); $prev_color = null;
$s = ""; $s = "";
for ($l=0; $l <= count($file); $l++) { for ($l=0; $l <= count($file); $l++) {
$line = $file[$l]; $line = $file[$l];
@ -43,10 +43,10 @@ if (!extension_loaded("xdebug")) {
case -2: $color = "Silver"; break; // dead code case -2: $color = "Silver"; break; // dead code
case null: $color = ""; break; // not executable case null: $color = ""; break; // not executable
} }
if (!isset($prev_color)) { if ($prev_color === null) {
$prev_color = $color; $prev_color = $color;
} }
if ($prev_color != $color || !isset($line)) { if ($prev_color != $color || $line === null) {
echo "<div" . ($prev_color ? " style='background-color: $prev_color;'" : "") . ">$s"; echo "<div" . ($prev_color ? " style='background-color: $prev_color;'" : "") . ">$s";
$open_tags = xhtml_open_tags($s); $open_tags = xhtml_open_tags($s);
foreach (array_reverse($open_tags) as $tag) { foreach (array_reverse($open_tags) as $tag) {

12
editor/include/adminer.inc.php
View file

@ -68,7 +68,7 @@ document.getElementById('username').focus();
function selectLinks($tableStatus, $set = "") { function selectLinks($tableStatus, $set = "") {
$TABLE = $tableStatus["Name"]; $TABLE = $tableStatus["Name"];
if (isset($set)) { if ($set !== null) {
echo '<p class="tabs"><a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . "</a>\n"; echo '<p class="tabs"><a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . "</a>\n";
} }
echo "<a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Last page') . "'>&gt;&gt;</a>\n"; echo "<a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Last page') . "'>&gt;&gt;</a>\n";
@ -181,7 +181,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
} }
function editVal($val, $field) { function editVal($val, $field) {
if (ereg('date|timestamp', $field["type"]) && isset($val)) { if (ereg('date|timestamp', $field["type"]) && $val !== null) {
return preg_replace('~^(\\d{2}(\\d+))-(0?(\\d+))-(0?(\\d+))~', lang('$1-$3-$5'), $val); return preg_replace('~^(\\d{2}(\\d+))-(0?(\\d+))-(0?(\\d+))~', lang('$1-$3-$5'), $val);
} }
return (ereg("binary", $field["type"]) ? reset(unpack("H*", $val)) : $val); return (ereg("binary", $field["type"]) ? reset(unpack("H*", $val)) : $val);
@ -434,7 +434,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
; ;
} }
$options = $this->_foreignKeyOptions($table, $field["field"], $value); $options = $this->_foreignKeyOptions($table, $field["field"], $value);
if (isset($options)) { 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($options) . "' class='jsonly' onkeyup=\"whisper('" . h(ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"])) . "&value=', this);\"><div onclick='return whisperClick(event, this.previousSibling);'></div>" : "<input value='" . h($value) . "'$attrs class='hidden'><input value='" . h($options) . "' class='jsonly' onkeyup=\"whisper('" . h(ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"])) . "&value=', this);\"><div onclick='return whisperClick(event, this.previousSibling);'></div>"
@ -526,7 +526,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
if ($missing == "auth") { if ($missing == "auth") {
$first = true; $first = true;
foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) { foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) {
if (isset($password)) { if ($password !== null) {
if ($first) { if ($first) {
echo "<p onclick='eventStop(event);'>\n"; echo "<p onclick='eventStop(event);'>\n";
$first = false; $first = false;
@ -580,11 +580,11 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
global $connection; global $connection;
if (list($target, $id, $name) = $this->_foreignColumn(column_foreign_keys($table), $column)) { if (list($target, $id, $name) = $this->_foreignColumn(column_foreign_keys($table), $column)) {
$return = &$this->_values[$target]; $return = &$this->_values[$target];
if (!isset($return)) { if ($return === null) {
$table_status = table_status($target); $table_status = table_status($target);
$return = ($table_status["Rows"] > 1000 ? "" : array("" => "") + get_key_vals("SELECT $id, $name FROM " . table($target) . " ORDER BY 2")); $return = ($table_status["Rows"] > 1000 ? "" : array("" => "") + get_key_vals("SELECT $id, $name FROM " . table($target) . " ORDER BY 2"));
} }
if (!$return && isset($value)) { if (!$return && $value !== null) {
return $connection->result("SELECT $name FROM " . table($target) . " WHERE $id = " . q($value)); return $connection->result("SELECT $name FROM " . table($target) . " WHERE $id = " . q($value));
} }
return $return; return $return;

2
plugins/edit-foreign.php
View file

@ -11,7 +11,7 @@ class AdminerEditForeign {
static $foreignTables = array(); static $foreignTables = array();
static $values = array(); static $values = array();
$foreignKeys = &$foreignTables[$table]; $foreignKeys = &$foreignTables[$table];
if (!isset($foreignKeys)) { if ($foreignKeys === null) {
$foreignKeys = column_foreign_keys($table); $foreignKeys = column_foreign_keys($table);
} }
foreach ((array) $foreignKeys[$field["field"]] as $foreignKey) { foreach ((array) $foreignKeys[$field["field"]] as $foreignKey) {

2
plugins/enum-option.php
View file

@ -16,7 +16,7 @@ class AdminerEnumOption {
} }
if ($field["null"]) { if ($field["null"]) {
$options[""][""] = "NULL"; $options[""][""] = "NULL";
if (!isset($value) && !isset($_GET["select"])) { if ($value === null && !isset($_GET["select"])) {
$selected = ""; $selected = "";
} }
} }

2
plugins/file-upload.php
View file

@ -17,7 +17,7 @@ class AdminerFileUpload {
*/ */
function AdminerFileUpload($uploadPath = "../static/data/", $displayPath = null, $extensions = "[a-zA-Z0-9]+") { function AdminerFileUpload($uploadPath = "../static/data/", $displayPath = null, $extensions = "[a-zA-Z0-9]+") {
$this->uploadPath = $uploadPath; $this->uploadPath = $uploadPath;
$this->displayPath = (isset($displayPath) ? $displayPath : $uploadPath); $this->displayPath = ($displayPath !== null ? $displayPath : $uploadPath);
$this->extensions = $extensions; $this->extensions = $extensions;
} }

4
plugins/plugin.php
View file

@ -20,7 +20,7 @@ class AdminerPlugin extends Adminer {
* @param array object instances or null to register all classes starting by 'Adminer' * @param array object instances or null to register all classes starting by 'Adminer'
*/ */
function AdminerPlugin($plugins) { function AdminerPlugin($plugins) {
if (!isset($plugins)) { if ($plugins === null) {
$plugins = array(); $plugins = array();
foreach (get_declared_classes() as $class) { foreach (get_declared_classes() as $class) {
if (preg_match('~^Adminer.~i', $class) && strcasecmp($this->_findRootClass($class), 'Adminer')) { // can use interface since PHP 5 if (preg_match('~^Adminer.~i', $class) && strcasecmp($this->_findRootClass($class), 'Adminer')) { // can use interface since PHP 5
@ -54,7 +54,7 @@ class AdminerPlugin extends Adminer {
case 4: $return = $plugin->$function($args[0], $args[1], $args[2], $args[3]); break; case 4: $return = $plugin->$function($args[0], $args[1], $args[2], $args[3]); break;
default: trigger_error('Too many parameters.', E_USER_WARNING); default: trigger_error('Too many parameters.', E_USER_WARNING);
} }
if (isset($return)) { if ($return !== null) {
return $return; return $return;
} }
} }

4
plugins/slugify.php
View file

@ -21,7 +21,7 @@ class AdminerSlugify {
function editInput($table, $field, $attrs, $value) { function editInput($table, $field, $attrs, $value) {
static $slugify; static $slugify;
if (!$_GET["select"] && !$_GET["where"]) { if (!$_GET["select"] && !$_GET["where"]) {
if (!isset($slugify)) { if ($slugify === null) {
$slugify = array(); $slugify = array();
$prev = null; $prev = null;
foreach (fields($table) as $name => $val) { foreach (fields($table) as $name => $val) {
@ -32,7 +32,7 @@ class AdminerSlugify {
} }
} }
$slug = $slugify[$field["field"]]; $slug = $slugify[$field["field"]];
if (isset($slug)) { if ($slug !== null) {
return "<input value='" . h($value) . "' maxlength='$field[length]' size='40'$attrs onchange=\"var find = '$this->from'; var repl = '$this->to'; this.form['fields[$slug]'].value = this.value.toLowerCase().replace(new RegExp('[' + find + ']', 'g'), function (str) { return repl[find.indexOf(str)]; }).replace(/[^a-z0-9_]+/g, '-').replace(/^-|-\$/g, '').substr(0, $field[length]);\">"; return "<input value='" . h($value) . "' maxlength='$field[length]' size='40'$attrs onchange=\"var find = '$this->from'; var repl = '$this->to'; this.form['fields[$slug]'].value = this.value.toLowerCase().replace(new RegExp('[' + find + ']', 'g'), function (str) { return repl[find.indexOf(str)]; }).replace(/[^a-z0-9_]+/g, '-').replace(/^-|-\$/g, '').substr(0, $field[length]);\">";
} }
} }

6
plugins/translation.php
View file

@ -19,17 +19,17 @@ class AdminerTranslation {
function _translate($idf) { function _translate($idf) {
static $translations, $lang; static $translations, $lang;
if (!isset($lang)) { if ($lang === null) {
$lang = get_lang(); $lang = get_lang();
} }
if ($idf == "" || $lang == "en") { if ($idf == "" || $lang == "en") {
return $idf; return $idf;
} }
if (!isset($translations)) { if ($translations === null) {
$translations = get_key_vals("SELECT idf, translation FROM translation WHERE language_id = " . q($lang)); $translations = get_key_vals("SELECT idf, translation FROM translation WHERE language_id = " . q($lang));
} }
$return = &$translations[$idf]; $return = &$translations[$idf];
if (!isset($return)) { if ($return === null) {
$return = $idf; $return = $idf;
$connection = connection(); $connection = connection();
$connection->query("INSERT INTO translation (language_id, idf, translation) VALUES (" . q($lang) . ", " . q($idf) . ", " . q($idf) . ")"); $connection->query("INSERT INTO translation (language_id, idf, translation) VALUES (" . q($lang) . ", " . q($idf) . ", " . q($idf) . ")");