From 5706cbcf4db3101e982587ad17a4f15075c3f34a Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 1 Aug 2013 14:59:17 +0200
Subject: [PATCH] updated system reference, corrected autoloads to match new
 system requirements

---
 danube/api/autoload.inc.php           |  7 ++-----
 danube/dbd/autoload.inc.php           |  7 ++-----
 danube/page/register_page_classes.php | 23 ++++++++++-------------
 danube/path/register_path_classes.php |  5 +----
 danube/sai/autoload.inc.php           |  6 ++----
 5 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/danube/api/autoload.inc.php b/danube/api/autoload.inc.php
index 6d442e2..2b7cd28 100644
--- a/danube/api/autoload.inc.php
+++ b/danube/api/autoload.inc.php
@@ -1,6 +1,3 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
-$autoload->registerFolder(dirname(__FILE__).'/picfolder','');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/picfolder','');
\ No newline at end of file
diff --git a/danube/dbd/autoload.inc.php b/danube/dbd/autoload.inc.php
index d87380a..91ed195 100644
--- a/danube/dbd/autoload.inc.php
+++ b/danube/dbd/autoload.inc.php
@@ -1,9 +1,6 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
-$autoload->registerFolder(dirname(__FILE__).'/tbl/','DBD');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');
\ No newline at end of file
diff --git a/danube/page/register_page_classes.php b/danube/page/register_page_classes.php
index e630a6e..b09808a 100644
--- a/danube/page/register_page_classes.php
+++ b/danube/page/register_page_classes.php
@@ -1,14 +1,11 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
-$autoload->registerFolder(dirname(__FILE__).'/default_page','');
-$autoload->registerFolder(dirname(__FILE__).'/googlemaps','');
-$autoload->registerFolder(dirname(__FILE__).'/default_prices','');
-$autoload->registerFolder(dirname(__FILE__).'/osm','');
-$autoload->registerFolder(dirname(__FILE__).'/default_contact','');
-$autoload->registerFolder(dirname(__FILE__).'/default_partners','');
-$autoload->registerFolder(dirname(__FILE__).'/default_certificates','');
-$autoload->registerFolder(dirname(__FILE__).'/default_introduction','');
-$autoload->registerFolder(dirname(__FILE__).'/default_impressions','');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/googlemaps','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_prices','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/osm','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_contact','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_partners','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_certificates','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_introduction','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_impressions','');
\ No newline at end of file
diff --git a/danube/path/register_path_classes.php b/danube/path/register_path_classes.php
index 36d9a01..8fd92c5 100644
--- a/danube/path/register_path_classes.php
+++ b/danube/path/register_path_classes.php
@@ -1,5 +1,2 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file
diff --git a/danube/sai/autoload.inc.php b/danube/sai/autoload.inc.php
index a744e2f..95f5607 100644
--- a/danube/sai/autoload.inc.php
+++ b/danube/sai/autoload.inc.php
@@ -1,5 +1,3 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-$autoload->registerFolder(dirname(__FILE__).'','');
-$autoload->registerFolder(dirname(__FILE__).'/saimod_dasense_quality_management','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_dasense_quality_management','');