From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Mon, 15 Oct 2007 18:47:40 +0000 (+0000)
Subject: move loaders to inc
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=b73a1397f3845eb2fa78eba6019be876eebedd61;p=web%2Fkonrad%2Fsmoke.git

move loaders to inc

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@53 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/www/.htaccess b/www/.htaccess
index 82ada0c..97e51a5 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -1,6 +1,3 @@
-<Files loader*.php>
- Deny from all
-</Files>
 <Files config.php*>
  Deny from all
 </Files>
diff --git a/www/admin.php b/www/admin.php
index 612c861..6f25a81 100644
--- a/www/admin.php
+++ b/www/admin.php
@@ -1,5 +1,5 @@
 <?
-include('loader.php');
+include('inc/loader.php');
 
 if(!$db->canAdministrate())
 	die("Administration is turned off. Sorry.");
diff --git a/www/loader.php b/www/inc/loader.php
similarity index 59%
rename from www/loader.php
rename to www/inc/loader.php
index 26c9f65..de7fce0 100644
--- a/www/loader.php
+++ b/www/inc/loader.php
@@ -2,10 +2,10 @@
 //internal info: server version
 $MAGICSMOKEVERSION="0.1 alpha";
 //load DB drivers
-include('inc/db.php');
-include('inc/db_mysql.php');
-include('config.php');
-include('inc/db_scheme.php');
+include('./inc/db.php');
+include('./inc/db_mysql.php');
+include('./config.php');
+include('./inc/db_scheme.php');
 //try to connect
 $db->tryConnect();
 //move on in loader_nonadmin.php (or admin.php)
diff --git a/www/loader_nonadmin.php b/www/inc/loader_nonadmin.php
similarity index 57%
rename from www/loader_nonadmin.php
rename to www/inc/loader_nonadmin.php
index 1df82e8..df76c9b 100644
--- a/www/loader_nonadmin.php
+++ b/www/inc/loader_nonadmin.php
@@ -3,6 +3,7 @@
 if(!$db->canUseDb())
 	die("Database is not correctly configured. Giving up.");
 //load class-files
-include('inc/event.php');
-include('inc/room.php');
+include('./inc/event.php');
+include('./inc/room.php');
+include("./inc/random.php");
 ?>
\ No newline at end of file
diff --git a/www/index.php b/www/index.php
index ab06ff9..fd3ac43 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,7 +1,7 @@
 <? 
 //basics
-include('loader.php');
-include('loader_nonadmin.php');
+include('inc/loader.php');
+include('inc/loader_nonadmin.php');
 //include display scripts
 include('inc/event_listing.php');
 include('inc/parser.php');
diff --git a/www/machine.php b/www/machine.php
index a129079..d2b28b1 100644
--- a/www/machine.php
+++ b/www/machine.php
@@ -33,7 +33,7 @@ if(isset($HTTP_RAW_POST_DATA)){
 }
 
 //initialize basics
-include("loader.php");
+include("inc/loader.php");
 
 // server info can be answered without performing any more initialization
 if($SMOKEREQUEST=="serverinfo"){
@@ -43,10 +43,9 @@ if($SMOKEREQUEST=="serverinfo"){
 }
 
 //initialize DB
-include("loader_nonadmin.php");
+include("inc/loader_nonadmin.php");
 
 //load machine interface
-include("inc/random.php");
 include("inc/session.php");
 
 // request to start a session