mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-22 22:23:19 +02:00
Code Issues Releases Wiki Activity

Use HTTP protocol if possible - adminer.org certificate is missing in Opera

Browse Source
This commit is contained in:
Jakub Vrana
2010-05-06 17:24:02 +02:00
parent c1f8382515
commit 4c47d354e7
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adminer/include/design.inc.php
View File

@@ -11,6 +11,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
header("Content-Type: text/html; charset=utf-8");
header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox NoScript plugin
$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
$protocol = ($_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off") ? "https" : "http");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="<?php echo $LANG; ?>">
@@ -24,7 +25,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<link rel="stylesheet" type="text/css" href="adminer.css">
<?php } ?>
<body onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion();"); ?>">
<body onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
<script type="text/javascript" src="../adminer/static/functions.js"></script>
<script type="text/javascript" src="static/editing.js"></script>

3
adminer/static/editing.js
View File

@@ -2,8 +2,9 @@
/** Load syntax highlighting
* @param string first three characters of database system version
* @param string 'http' or 'https' - used after compilation
*/
function bodyLoad(version) {
function bodyLoad(version, protocol) {
var jushRoot = '../externals/jush/';
var script = document.createElement('script');
script.src = jushRoot + 'jush.js';

5
adminer/static/functions.js
View File

@@ -23,11 +23,12 @@ function cookie(assign, days, params) {
}
/** Verify current Adminer version
* @param string 'http' or 'https'
*/
function verifyVersion() {
function verifyVersion(protocol) {
cookie('adminer_version=0', 1);
var script = document.createElement('script');
script.src = 'https://www.adminer.org/version.php';
script.src = protocol + '://www.adminer.org/version.php';
document.body.appendChild(script);
}