Allow own code in <head> (thanks to Nikolaj Vasilcuk)

This commit is contained in:
Jakub Vrana 2011-03-23 11:57:35 +01:00
parent 2e6ad2037f
commit d8cba0eb5d
5 changed files with 19 additions and 2 deletions

View file

@ -40,6 +40,13 @@ class Adminer {
header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
} }
/** Print HTML code inside <head>
* @return bool true to link adminer.css if exists
*/
function head() {
return true;
}
/** Print login form /** Print login form
* @return null * @return null
*/ */

View file

@ -24,7 +24,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<title><?php echo $title_page; ?></title> <title><?php echo $title_page; ?></title>
<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico" id="favicon"> <link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico" id="favicon">
<link rel="stylesheet" type="text/css" href="../adminer/static/default.css"> <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
<?php if (file_exists("adminer.css")) { ?> <?php if ($adminer->head() && file_exists("adminer.css")) { ?>
<link rel="stylesheet" type="text/css" href="adminer.css"> <link rel="stylesheet" type="text/css" href="adminer.css">
<?php } ?> <?php } ?>

View file

@ -7,15 +7,16 @@ Send forms by Ctrl+Enter on <select>
Enum editor and textarea Ctrl+Enter working in IE Enum editor and textarea Ctrl+Enter working in IE
AJAX forms in Google Chrome AJAX forms in Google Chrome
Parse UTF-16 and UTF-8 BOM in all text uploads Parse UTF-16 and UTF-8 BOM in all text uploads
Display ; in history (thanks to Jan Cerny)
Use DELIMITER in history Use DELIMITER in history
Show databases even with skip_show_database in MySQL 5 (thanks to Radoslaw Kowalewski) Show databases even with skip_show_database in MySQL 5 (thanks to Radoslaw Kowalewski)
Set MySQL time zone by PHP setting Set MySQL time zone by PHP setting
Disable maxlength with functions in edit Disable maxlength with functions in edit
Better placement of AJAX icon Better placement of AJAX icon
Display ; in history (thanks to Jan Cerny)
Table header in CSV export (Editor) Table header in CSV export (Editor)
Time format hint (Editor) Time format hint (Editor)
Respect order after search (Editor) Respect order after search (Editor)
Allow own code in <head> (customization)
Polish translation Polish translation
Adminer 3.2.0 (released 2011-02-24): Adminer 3.2.0 (released 2011-02-24):

View file

@ -31,6 +31,10 @@ class Adminer {
header("X-XSS-Protection: 0"); header("X-XSS-Protection: 0");
} }
function head() {
return true;
}
function loginForm() { function loginForm() {
?> ?>
<table cellspacing="0"> <table cellspacing="0">

View file

@ -89,6 +89,11 @@ class AdminerPlugin extends Adminer {
return $this->_applyPlugin(__FUNCTION__, $args); return $this->_applyPlugin(__FUNCTION__, $args);
} }
function head() {
$args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args);
}
function loginForm() { function loginForm() {
$args = func_get_args(); $args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args); return $this->_applyPlugin(__FUNCTION__, $args);