Refactoring (Part I)

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

diff --git a/www/inc/cart.php b/www/inc/classes/cart.php
similarity index 100%
rename from www/inc/cart.php
rename to www/inc/classes/cart.php

diff --git a/www/inc/config_manager.php b/www/inc/classes/config_manager.php
similarity index 100%
rename from www/inc/config_manager.php
rename to www/inc/classes/config_manager.php

diff --git a/www/inc/customer.php b/www/inc/classes/customer.php
similarity index 100%
rename from www/inc/customer.php
rename to www/inc/classes/customer.php

diff --git a/www/inc/error.php b/www/inc/classes/error.php
similarity index 100%
rename from www/inc/error.php
rename to www/inc/classes/error.php

diff --git a/www/inc/event.php b/www/inc/classes/event.php
similarity index 100%
rename from www/inc/event.php
rename to www/inc/classes/event.php

diff --git a/www/inc/language_manager.php b/www/inc/classes/language_manager.php
similarity index 100%
rename from www/inc/language_manager.php
rename to www/inc/classes/language_manager.php

diff --git a/www/inc/order.php b/www/inc/classes/order.php
similarity index 100%
rename from www/inc/order.php
rename to www/inc/classes/order.php

diff --git a/www/inc/parser.php b/www/inc/classes/parser.php
similarity index 100%
rename from www/inc/parser.php
rename to www/inc/classes/parser.php

diff --git a/www/inc/random.php b/www/inc/classes/random.php
similarity index 100%
rename from www/inc/random.php
rename to www/inc/classes/random.php

diff --git a/www/inc/room.php b/www/inc/classes/room.php
similarity index 100%
rename from www/inc/room.php
rename to www/inc/classes/room.php

diff --git a/www/inc/ticket.php b/www/inc/classes/ticket.php
similarity index 100%
rename from www/inc/ticket.php
rename to www/inc/classes/ticket.php

diff --git a/www/inc/db.php b/www/inc/db/db.php
similarity index 100%
rename from www/inc/db.php
rename to www/inc/db/db.php

diff --git a/www/inc/db_mysql.php b/www/inc/db/db_mysql.php
similarity index 100%
rename from www/inc/db_mysql.php
rename to www/inc/db/db_mysql.php

diff --git a/www/inc/db_scheme.php b/www/inc/db/db_scheme.php
similarity index 100%
rename from www/inc/db_scheme.php
rename to www/inc/db/db_scheme.php

diff --git a/www/inc/loader.php b/www/inc/loader.php
index de7fce0..263cbf4 100644 (file)
--- a/www/inc/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('./inc/db/db.php');
+include('./inc/db/db_mysql.php');
 include('./config.php');
-include('./inc/db_scheme.php');
+include('./inc/db/db_scheme.php');
 //try to connect
 $db->tryConnect();
 //move on in loader_nonadmin.php (or admin.php)

diff --git a/www/inc/loader_nonadmin.php b/www/inc/loader_nonadmin.php
index fe7b5a0..664579b 100644 (file)
--- a/www/inc/loader_nonadmin.php
+++ b/www/inc/loader_nonadmin.php
@@ -3,17 +3,17 @@
 if(!$db->canUseDb())
        die("Database is not correctly configured. Giving up.");
 //load class-files
-include('./inc/event.php');
-include('./inc/room.php');
-include("./inc/random.php");
-include("./inc/order.php");
-include("./inc/ticket.php");
-include("./inc/cart.php");
-include('./inc/error.php');
-include('./inc/language_manager.php');
-include('./inc/parser.php');
-include('./inc/config_manager.php');
-include('./inc/customer.php');
+include('./inc/classes/event.php');
+include('./inc/classes/room.php');
+include("./inc/classes/random.php");
+include("./inc/classes/order.php");
+include("./inc/classes/ticket.php");
+include("./inc/classes/cart.php");
+include('./inc/classes/error.php');
+include('./inc/classes/language_manager.php');
+include('./inc/classes/parser.php');
+include('./inc/classes/config_manager.php');
+include('./inc/classes/customer.php');
 //load hash lib
 include("./inc/cauth_".$HashLib.".php");
 

diff --git a/www/inc/cart_listing.php b/www/inc/rendering/cart_listing.php
similarity index 100%
rename from www/inc/cart_listing.php
rename to www/inc/rendering/cart_listing.php

diff --git a/www/inc/event_listing.php b/www/inc/rendering/event_listing.php
similarity index 100%
rename from www/inc/event_listing.php
rename to www/inc/rendering/event_listing.php

diff --git a/www/inc/order_listing.php b/www/inc/rendering/order_listing.php
similarity index 100%
rename from www/inc/order_listing.php
rename to www/inc/rendering/order_listing.php

diff --git a/www/inc/submit.php b/www/inc/rendering/submit.php
similarity index 100%
rename from www/inc/submit.php
rename to www/inc/rendering/submit.php

diff --git a/www/index.php b/www/index.php
index e51c800..439258b 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -5,12 +5,12 @@ include('inc/loader_nonadmin.php');
 include('inc/global_variables.php');
 
 //include process script
-include('inc/submit.php');
+include('inc/rendering/submit.php');
 
 //include display scripts
-include('inc/event_listing.php');
-include('inc/cart_listing.php');
-include('inc/order_listing.php');
+include('inc/rendering/event_listing.php');
+include('inc/rendering/cart_listing.php');
+include('inc/rendering/order_listing.php');
 
 //set common basics
 $mode="index";