Separate include

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@623 7c3ca157-0c34-0410-bff1-cbf682f78f5c
vrana · May 29, 2009 · 041fb2e · 041fb2e
1 parent 18d744a
commit 041fb2e
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git a/_compile.php b/_compile.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__) . "/version.inc.php";
+include dirname(__FILE__) . "/include/version.inc.php";
 include dirname(__FILE__) . "/externals/jsmin-php/jsmin.php";
 
 function add_apo_slashes($s) {
@@ -52,7 +52,7 @@ function put_file($match) {
 		return "switch (\$LANG) {\n$return}\n";
 	}
 	$return = file_get_contents(dirname(__FILE__) . "/$match[3]");
-	if ($match[3] == "./lang.inc.php" && $_COOKIE["lang"] && (preg_match("~case '$_COOKIE[lang]': (.*) break;~", $return, $match2) || preg_match("~default: (.*)~", $return, $match2))) {
+	if ($match[3] == "./include/lang.inc.php" && $_COOKIE["lang"] && (preg_match("~case '$_COOKIE[lang]': (.*) break;~", $return, $match2) || preg_match("~default: (.*)~", $return, $match2))) {
 		return "$match[1]\nfunction lang(\$ar, \$number) {\n\t$match2[1]\n\treturn sprintf(\$ar[\$pos], \$number);\n}\n$match[4]";
 	}
 	$return = preg_replace("~\\?>\n?\$~", '', $return);
@@ -151,7 +151,7 @@ function php_shrink($input) {
 error_reporting(E_ALL & ~E_NOTICE);
 if ($_SERVER["argc"] > 1) {
 	$_COOKIE["lang"] = $_SERVER["argv"][1];
-	include dirname(__FILE__) . "/lang.inc.php";
+	include dirname(__FILE__) . "/include/lang.inc.php";
 	if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) {
 		echo "Usage: php _compile.php [lang]\nPurpose: Compile phpMinAdmin[-lang].php from index.php.\n";
 		exit(1);

diff --git a/auth.inc.php → include/auth.inc.php b/auth.inc.php → include/auth.inc.php
diff --git a/connect.inc.php → include/connect.inc.php b/connect.inc.php → include/connect.inc.php
diff --git a/design.inc.php → include/design.inc.php b/design.inc.php → include/design.inc.php
diff --git a/editing.inc.php → include/editing.inc.php b/editing.inc.php → include/editing.inc.php
diff --git a/export.inc.php → include/export.inc.php b/export.inc.php → include/export.inc.php
diff --git a/functions.inc.php → include/functions.inc.php b/functions.inc.php → include/functions.inc.php
diff --git a/lang.inc.php → include/lang.inc.php b/lang.inc.php → include/lang.inc.php
diff --git a/mysql.inc.php → include/mysql.inc.php b/mysql.inc.php → include/mysql.inc.php
diff --git a/pdo.inc.php → include/pdo.inc.php b/pdo.inc.php → include/pdo.inc.php
diff --git a/version.inc.php → include/version.inc.php b/version.inc.php → include/version.inc.php
diff --git a/index.php b/index.php
@@ -46,17 +46,17 @@ function save_coverage() {
 set_magic_quotes_runtime(false);
 $SELF = preg_replace('~^[^?]*/([^?]*).*~', '\\1?', $_SERVER["REQUEST_URI"]) . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : '');
 
-include "./version.inc.php";
-include "./functions.inc.php";
-include "./lang.inc.php";
+include "./include/version.inc.php";
+include "./include/functions.inc.php";
+include "./include/lang.inc.php";
 include "./lang/$LANG.inc.php";
-include "./pdo.inc.php";
-include "./mysql.inc.php";
-include "./design.inc.php";
-include "./auth.inc.php";
-include "./connect.inc.php";
-include "./editing.inc.php";
-include "./export.inc.php";
+include "./include/pdo.inc.php";
+include "./include/mysql.inc.php";
+include "./include/design.inc.php";
+include "./include/auth.inc.php";
+include "./include/connect.inc.php";
+include "./include/editing.inc.php";
+include "./include/export.inc.php";
 
 if (isset($_GET["download"])) {
 	include "./download.inc.php";