mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-16 03:24:01 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ajax

Browse Source
This commit is contained in:
Jakub Vrana
2010-10-18 07:50:03 +02:00
parent 28f494783f f7d4587880
commit a1f2769309
22 changed files with 138 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/include/adminer.inc.php
View File

@@ -26,6 +26,10 @@ class Adminer {
);
}
function headers() {
header("X-Frame-Options: deny");
}
function loginForm() {
?>
<table cellspacing="0">
@@ -412,7 +416,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
$return = ($match["p1"] != "" ? $match["p1"] : ($match["p2"] != "" ? ($match["p2"] < 70 ? 20 : 19) . $match["p2"] : gmdate("Y"))) . "-$match[p3]$match[p4]-$match[p5]$match[p6]" . end($match);
}
$return = q($return);
if (!ereg('varchar|text', $field["type"]) && $field["full_type"] != "tinyint(1)" && $value == "") {
if (!ereg('char|text', $field["type"]) && $field["full_type"] != "tinyint(1)" && $value == "") {
$return = "NULL";
} elseif (ereg('^(md5|sha1)$', $function)) {
$return = "$function($return)";
@@ -460,7 +464,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
</p>
</form>
<?php
if ($missing != "db") {
if ($missing != "db" && $missing != "ns") {
$table_status = table_status();
if (!$table_status) {
echo "<p class='message'>" . lang('No tables.') . "\n";