From ab3c3661c633128a5e01052bbec3d91399288abd Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Wed, 23 Sep 2009 09:56:07 +0000
Subject: [PATCH] Separate static files

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1131 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/database.inc.php          |   2 +-
 adminer/include/bootstrap.inc.php |  16 ++++++++--------
 adminer/include/design.inc.php    |   8 ++++----
 adminer/include/editing.inc.php   |  10 +++++-----
 adminer/schema.inc.php            |   2 +-
 adminer/{ => static}/arrow.gif    | Bin
 adminer/{ => static}/cross.gif    | Bin
 adminer/{ => static}/default.css  |   0
 adminer/{ => static}/down.gif     | Bin
 adminer/{ => static}/editing.js   |   0
 adminer/{ => static}/favicon.ico  | Bin
 adminer/{ => static}/functions.js |   0
 adminer/{ => static}/plus.gif     | Bin
 adminer/{ => static}/up.gif       | Bin
 compile.php                       |   4 ++--
 editor/include/adminer.inc.php    |   2 +-
 editor/{ => static}/editing.js    |   0
 17 files changed, 22 insertions(+), 22 deletions(-)
 rename adminer/{ => static}/arrow.gif (100%)
 rename adminer/{ => static}/cross.gif (100%)
 rename adminer/{ => static}/default.css (100%)
 rename adminer/{ => static}/down.gif (100%)
 rename adminer/{ => static}/editing.js (100%)
 rename adminer/{ => static}/favicon.ico (100%)
 rename adminer/{ => static}/functions.js (100%)
 rename adminer/{ => static}/plus.gif (100%)
 rename adminer/{ => static}/up.gif (100%)
 rename editor/{ => static}/editing.js (100%)

diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 9d67f162..ba106772 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -79,7 +79,7 @@ if ($_POST) {
 if (strlen(DB)) {
 	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
 } elseif (!$_POST["add_x"]) {
-	echo "<input type='image' name='add' src='../adminer/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
+	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }
 ?>
 </form>
diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 8062d733..c407354b 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -19,21 +19,21 @@ if (isset($_GET["file"])) {
 	header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
 	if ($_GET["file"] == "favicon.ico") {
 		header("Content-Type: image/x-icon");
-		echo base64_decode("compile_file('../adminer/favicon.ico', 'base64_encode');");
+		echo base64_decode("compile_file('../adminer/static/favicon.ico', 'base64_encode');");
 	} elseif ($_GET["file"] == "default.css") {
 		header("Content-Type: text/css");
-		?>compile_file('../adminer/default.css', 'minify_css');<?php
+		?>compile_file('../adminer/static/default.css', 'minify_css');<?php
 	} elseif ($_GET["file"] == "functions.js") {
 		header("Content-Type: text/javascript");
-		?>compile_file('../adminer/functions.js', 'JSMin::minify');compile_file('editing.js', 'JSMin::minify');<?php
+		?>compile_file('../adminer/static/functions.js', 'JSMin::minify');compile_file('static/editing.js', 'JSMin::minify');<?php
 	} else {
 		header("Content-Type: image/gif");
 		switch ($_GET["file"]) {
-			case "plus.gif": echo base64_decode("compile_file('../adminer/plus.gif', 'base64_encode');"); break;
-			case "cross.gif": echo base64_decode("compile_file('../adminer/cross.gif', 'base64_encode');"); break;
-			case "up.gif": echo base64_decode("compile_file('../adminer/up.gif', 'base64_encode');"); break;
-			case "down.gif": echo base64_decode("compile_file('../adminer/down.gif', 'base64_encode');"); break;
-			case "arrow.gif": echo base64_decode("compile_file('../adminer/arrow.gif', 'base64_encode');"); break;
+			case "plus.gif": echo base64_decode("compile_file('../adminer/static/plus.gif', 'base64_encode');"); break;
+			case "cross.gif": echo base64_decode("compile_file('../adminer/static/cross.gif', 'base64_encode');"); break;
+			case "up.gif": echo base64_decode("compile_file('../adminer/static/up.gif', 'base64_encode');"); break;
+			case "down.gif": echo base64_decode("compile_file('../adminer/static/down.gif', 'base64_encode');"); break;
+			case "arrow.gif": echo base64_decode("compile_file('../adminer/static/arrow.gif', 'base64_encode');"); break;
 		}
 	}
 	exit;
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index b003ad39..bd63286e 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -10,15 +10,15 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <meta http-equiv="Content-Script-Type" content="text/javascript">
 <meta name="robots" content="noindex">
 <title><?php echo $title_all . (strlen($_GET["server"]) && $_GET["server"] != "localhost" ? h("- $_GET[server]") : "") . " - " . $adminer->name(); ?></title>
-<link rel="shortcut icon" type="image/x-icon" href="../adminer/favicon.ico">
-<link rel="stylesheet" type="text/css" href="../adminer/default.css<?php // Ondrej Valka, http://valka.info ?>">
+<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
+<link rel="stylesheet" type="text/css" href="../adminer/static/default.css<?php // Ondrej Valka, http://valka.info ?>">
 <?php if (file_exists("adminer.css")) { ?>
 <link rel="stylesheet" type="text/css" href="adminer.css">
 <?php } ?>
 
 <body onload="body_load();<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verify_version();"); ?>">
-<script type="text/javascript" src="../adminer/functions.js"></script>
-<script type="text/javascript" src="editing.js"></script>
+<script type="text/javascript" src="../adminer/static/functions.js"></script>
+<script type="text/javascript" src="static/editing.js"></script>
 
 <div id="content">
 <?php
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 7355f0b1..967abd9f 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -164,7 +164,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 <td class="hidden"><?php echo lang('Default values'); ?>
 <td<?php echo ($column_comments ? "" : " class='hidden'"); ?>><?php echo lang('Comment'); ?>
 <?php } ?>
-<td><?php echo "<input type='image' name='add[0]' src='../adminer/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
+<td><?php echo "<input type='image' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
 </thead>
 <?php
 	foreach ($fields as $i => $field) {
@@ -182,10 +182,10 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 <td<?php echo ($column_comments ? "" : " class='hidden'"); ?>><input name="fields[<?php echo $i; ?>][comment]" value="<?php echo h($field["comment"]); ?>" maxlength="255">
 <?php } ?>
 <?php
-		echo "<td class='nowrap'><input type='image' name='add[$i]' src='../adminer/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='var x = editing_add_row(this, $allowed); if (x) { x.focus(); x.onchange = function () { }; } return !x;'>";
-		echo "&nbsp;<input type='image' name='drop_col[$i]' src='../adminer/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editing_remove_row(this);'>";
-		echo "&nbsp;<input type='image' name='up[$i]' src='../adminer/up.gif' alt='^' title='" . lang('Move up') . "'>";
-		echo "&nbsp;<input type='image' name='down[$i]' src='../adminer/down.gif' alt='v' title='" . lang('Move down') . "'>";
+		echo "<td class='nowrap'><input type='image' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='var x = editing_add_row(this, $allowed); if (x) { x.focus(); x.onchange = function () { }; } return !x;'>";
+		echo "&nbsp;<input type='image' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editing_remove_row(this);'>";
+		echo "&nbsp;<input type='image' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>";
+		echo "&nbsp;<input type='image' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>";
 		echo "\n\n";
 	}
 	return $column_comments;
diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 6aedd66f..df932067 100644
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -79,7 +79,7 @@ foreach ($schema as $name => $table) {
 			$left1 = $left - $table_pos[$name][1];
 			$i = 0;
 			foreach ($columns as $target) {
-				echo "<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/arrow.gif) no-repeat right center;'><div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>\n";
+				echo "<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'><div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>\n";
 			}
 		}
 	}
diff --git a/adminer/arrow.gif b/adminer/static/arrow.gif
similarity index 100%
rename from adminer/arrow.gif
rename to adminer/static/arrow.gif
diff --git a/adminer/cross.gif b/adminer/static/cross.gif
similarity index 100%
rename from adminer/cross.gif
rename to adminer/static/cross.gif
diff --git a/adminer/default.css b/adminer/static/default.css
similarity index 100%
rename from adminer/default.css
rename to adminer/static/default.css
diff --git a/adminer/down.gif b/adminer/static/down.gif
similarity index 100%
rename from adminer/down.gif
rename to adminer/static/down.gif
diff --git a/adminer/editing.js b/adminer/static/editing.js
similarity index 100%
rename from adminer/editing.js
rename to adminer/static/editing.js
diff --git a/adminer/favicon.ico b/adminer/static/favicon.ico
similarity index 100%
rename from adminer/favicon.ico
rename to adminer/static/favicon.ico
diff --git a/adminer/functions.js b/adminer/static/functions.js
similarity index 100%
rename from adminer/functions.js
rename to adminer/static/functions.js
diff --git a/adminer/plus.gif b/adminer/static/plus.gif
similarity index 100%
rename from adminer/plus.gif
rename to adminer/static/plus.gif
diff --git a/adminer/up.gif b/adminer/static/up.gif
similarity index 100%
rename from adminer/up.gif
rename to adminer/static/up.gif
diff --git a/compile.php b/compile.php
index 5e0e82aa..6a539052 100644
--- a/compile.php
+++ b/compile.php
@@ -190,8 +190,8 @@ if ($_SESSION["lang"]) {
 $file = str_replace('<script type="text/javascript" src="editing.js"></script>' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
 $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"])) . "?file=\\1&amp;version=' . $VERSION;
-$file = preg_replace('~\\.\\./adminer/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
-$file = preg_replace('~\\.\\./adminer/((plus|cross|up|down|arrow)\\.gif)~', '" . ' . $replace, $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/", "https://jush.svn.sourceforge.net/svnroot/jush/trunk/", $file); // mixed-content warning if Adminer runs on HTTPS and external files on HTTP
 $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 18ac631b..60fb4ad6 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -118,7 +118,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
 			}
 		}
 		if ($field["full_type"] == "tinyint(1)" && $return != "&nbsp;") { // bool
-			$return = '<img src="' . ($val ? "../adminer/plus.gif" : "../adminer/cross.gif") . '" alt="' . h($val) . '">';
+			$return = '<img src="' . ($val ? "../adminer/static/plus.gif" : "../adminer/static/cross.gif") . '" alt="' . h($val) . '">';
 		}
 		return ($link ? "<a href='$link'>$return</a>" : $return);
 	}
diff --git a/editor/editing.js b/editor/static/editing.js
similarity index 100%
rename from editor/editing.js
rename to editor/static/editing.js