Permalink
Browse files

Utilize location.protocol

  • Loading branch information...
1 parent 15715b3 commit e4deeb61ba3b4a2a5c0ea7624858da4254ff2b8a @vrana committed Feb 15, 2011
Showing with 7 additions and 10 deletions.
  1. +2 −3 adminer/include/design.inc.php
  2. +1 −2 adminer/static/editing.js
  3. +2 −3 adminer/static/functions.js
  4. +1 −1 compile.php
  5. +1 −1 editor/static/editing.js
View
5 adminer/include/design.inc.php
@@ -7,15 +7,14 @@
* @return null
*/
function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
- global $LANG, $HTTPS, $adminer, $connection, $drivers;
+ global $LANG, $adminer, $connection, $drivers;
header("Content-Type: text/html; charset=utf-8");
$adminer->headers();
$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
$title_page = $title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name();
if (is_ajax()) {
header("X-AJAX-Title: " . rawurlencode($title_page));
} else {
- $protocol = ($HTTPS ? "https" : "http");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
@@ -29,7 +28,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<link rel="stylesheet" type="text/css" href="adminer.css">
<?php } ?>
-<body class="<?php echo lang('ltr'); ?>" onclick="return bodyClick(event, '<?php echo js_escape(DB); ?>', '<?php echo js_escape($_GET["ns"]); ?>');" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
+<body class="<?php echo lang('ltr'); ?>" onclick="return bodyClick(event, '<?php echo js_escape(DB); ?>', '<?php echo js_escape($_GET["ns"]); ?>');" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?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>
View
3 adminer/static/editing.js
@@ -2,9 +2,8 @@
/** Load syntax highlighting
* @param string first three characters of database system version
-* @param string 'http' or 'https' - used after compilation
*/
-function bodyLoad(version, protocol) {
+function bodyLoad(version) {
var jushRoot = '../externals/jush/';
var script = document.createElement('script');
script.src = jushRoot + 'jush.js';
View
5 adminer/static/functions.js
@@ -23,12 +23,11 @@ function cookie(assign, days) {
}
/** Verify current Adminer version
-* @param string 'http' or 'https'
*/
-function verifyVersion(protocol) {
+function verifyVersion() {
cookie('adminer_version=0', 1);
var script = document.createElement('script');
- script.src = protocol + '://www.adminer.org/version.php';
+ script.src = location.protocol + '//www.adminer.org/version.php';
document.body.appendChild(script);
}
View
2 compile.php
@@ -265,7 +265,7 @@ function compile_file($match) {
$file = preg_replace('~\\.\\./adminer/static/(loader\\.gif)~', "'+location.pathname+'?file=\\1&amp;version=$VERSION", $file);
$file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
$file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);
- $file = str_replace("'../externals/jush/'", "protocol + '://www.adminer.org/static/'", $file);
+ $file = str_replace("'../externals/jush/'", "location.protocol + '//www.adminer.org/static/'", $file);
$file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
$file = php_shrink($file);
View
2 editor/static/editing.js
@@ -1,4 +1,4 @@
// Editor specific functions
-function bodyLoad(version, protocol) {
+function bodyLoad(version) {
}

0 comments on commit e4deeb6

Please sign in to comment.