From 2a7683d50913391f423094c8bc45195869922830 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

---
 uVote/api/autoload.inc.php           |  8 ++------
 uVote/dbd/autoload.inc.php           |  7 ++-----
 uVote/page/register_page_classes.php | 13 +++++--------
 uVote/path/register_path_classes.php |  5 +----
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/uVote/api/autoload.inc.php b/uVote/api/autoload.inc.php
index a345682..3fced9b 100644
--- a/uVote/api/autoload.inc.php
+++ b/uVote/api/autoload.inc.php
@@ -1,7 +1,3 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
-$autoload->registerFolder(dirname(__FILE__).'/votes','');
-
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/votes','');
\ No newline at end of file
diff --git a/uVote/dbd/autoload.inc.php b/uVote/dbd/autoload.inc.php
index d87380a..91ed195 100644
--- a/uVote/dbd/autoload.inc.php
+++ b/uVote/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/uVote/page/register_page_classes.php b/uVote/page/register_page_classes.php
index 751c739..d5fe93b 100644
--- a/uVote/page/register_page_classes.php
+++ b/uVote/page/register_page_classes.php
@@ -1,9 +1,6 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
-$autoload->registerFolder(dirname(__FILE__).'/default_page','');
-$autoload->registerFolder(dirname(__FILE__).'/default_myvote','');
-$autoload->registerFolder(dirname(__FILE__).'/default_register','');
-$autoload->registerFolder(dirname(__FILE__).'/default_openinfo','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_myvote','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_openinfo','');
diff --git a/uVote/path/register_path_classes.php b/uVote/path/register_path_classes.php
index 36d9a01..d94a324 100644
--- a/uVote/path/register_path_classes.php
+++ b/uVote/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