From 24e4696750474af552659606c42856de40795e7c Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 9 Oct 2014 04:40:45 +0200
Subject: [PATCH] system fix uvote

---
 config.php                                          |  11 +++++------
 system                                              |   1 +
 uVote/autoload.inc.php                              |   2 +-
 uVote/files/autoload.inc.php                        |   4 ++++
 uVote/{img => files}/frontend_logos/background.png  | Bin
 uVote/{img => files}/frontend_logos/bild_8.png      | Bin
 uVote/{img => files}/frontend_logos/chrome.png      | Bin
 uVote/{img => files}/frontend_logos/chrome.psd      | Bin
 uVote/{img => files}/frontend_logos/contra.png      | Bin
 uVote/{img => files}/frontend_logos/cover.png       | Bin
 uVote/{img => files}/frontend_logos/cover.psd       | Bin
 uVote/{img => files}/frontend_logos/cover2.png      | Bin
 uVote/{img => files}/frontend_logos/enth.png        | Bin
 uVote/{img => files}/frontend_logos/icon_bt.png     | Bin
 uVote/{img => files}/frontend_logos/icon_cdu.png    | Bin
 uVote/{img => files}/frontend_logos/icon_cdu1.png   | Bin
 uVote/{img => files}/frontend_logos/icon_csu.png    | Bin
 uVote/{img => files}/frontend_logos/icon_csu1.png   | Bin
 uVote/{img => files}/frontend_logos/icon_gruene.png | Bin
 .../{img => files}/frontend_logos/icon_gruene1.png  | Bin
 uVote/{img => files}/frontend_logos/icon_linke.png  | Bin
 uVote/{img => files}/frontend_logos/icon_linke1.png | Bin
 uVote/{img => files}/frontend_logos/icon_party.psd  | Bin
 uVote/{img => files}/frontend_logos/icon_spd.png    | Bin
 uVote/{img => files}/frontend_logos/icon_spd1.png   | Bin
 .../{img => files}/frontend_logos/icon_urn_con.png  | Bin
 .../{img => files}/frontend_logos/icon_urn_ent.png  | Bin
 .../{img => files}/frontend_logos/icon_urn_open.png | Bin
 .../{img => files}/frontend_logos/icon_urn_pro.png  | Bin
 uVote/{img => files}/frontend_logos/logo.jpg        | Bin
 uVote/{img => files}/frontend_logos/logo2.png       | Bin
 uVote/{img => files}/frontend_logos/pro.png         | Bin
 .../frontend_logos/vote_background.psd              | Bin
 .../register_img.php => files/register_files.php}   |   0
 uVote/img/autoload.inc.php                          |   3 ---
 35 files changed, 11 insertions(+), 10 deletions(-)
 create mode 160000 system
 create mode 100644 uVote/files/autoload.inc.php
 rename uVote/{img => files}/frontend_logos/background.png (100%)
 rename uVote/{img => files}/frontend_logos/bild_8.png (100%)
 rename uVote/{img => files}/frontend_logos/chrome.png (100%)
 rename uVote/{img => files}/frontend_logos/chrome.psd (100%)
 rename uVote/{img => files}/frontend_logos/contra.png (100%)
 rename uVote/{img => files}/frontend_logos/cover.png (100%)
 rename uVote/{img => files}/frontend_logos/cover.psd (100%)
 rename uVote/{img => files}/frontend_logos/cover2.png (100%)
 rename uVote/{img => files}/frontend_logos/enth.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_bt.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_cdu.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_cdu1.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_csu.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_csu1.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_gruene.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_gruene1.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_linke.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_linke1.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_party.psd (100%)
 rename uVote/{img => files}/frontend_logos/icon_spd.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_spd1.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_urn_con.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_urn_ent.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_urn_open.png (100%)
 rename uVote/{img => files}/frontend_logos/icon_urn_pro.png (100%)
 rename uVote/{img => files}/frontend_logos/logo.jpg (100%)
 rename uVote/{img => files}/frontend_logos/logo2.png (100%)
 rename uVote/{img => files}/frontend_logos/pro.png (100%)
 rename uVote/{img => files}/frontend_logos/vote_background.psd (100%)
 rename uVote/{img/register_img.php => files/register_files.php} (100%)
 delete mode 100644 uVote/img/autoload.inc.php

diff --git a/config.php b/config.php
index 5675419..ea6d6f6 100644
--- a/config.php
+++ b/config.php
@@ -1,7 +1,7 @@
 <?php
 
 $uvote_config = array(  array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,      E_ALL | E_STRICT),
-                        array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,        'http://www.mojotrollz.eu/web/uVote/'),
+                        array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,        'http://www.u-vote.eu/'),
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,       '/home/web/webdir/uVote/'),
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT,      SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT_JSON),
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,             SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
@@ -11,10 +11,9 @@ $uvote_config = array(  array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTIN
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,         'dsjgfasudzfsvad'),
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,           'host_uVote'),
                         array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG,         '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL,        'http://mojotrollz.eu/web/uVote/sai.php?'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE,          'mojotrollz - Admin Area'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT,      '<a href="http://www.mojotrollz.eu/web/uVote/" target="_blank">uVote</a>, &copy; WebCraft Media 2013'),
-                        
+                        array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG,         '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
+                        array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL,        'http://www.u-vote.eu/sai.php?'),
+                        array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE,          'mojotrollz - Admin Area'),
+                        array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT,      '<a href="http://www.u-vote.eu/" target="_blank">uVote</a>, &copy; WebCraft Media 2013'),                        
                         array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,              array('deDE', 'enUS')),
                         array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG,       'deDE'));   
\ No newline at end of file
diff --git a/system b/system
new file mode 160000
index 0000000..c61ed75
--- /dev/null
+++ b/system
@@ -0,0 +1 @@
+Subproject commit c61ed753e0b7150c61852ea7e470676153f8654b
diff --git a/uVote/autoload.inc.php b/uVote/autoload.inc.php
index 97a9de5..3aa2250 100644
--- a/uVote/autoload.inc.php
+++ b/uVote/autoload.inc.php
@@ -4,5 +4,5 @@
 require_once dirname(__FILE__).'/path/register_path_classes.php';
 require_once dirname(__FILE__).'/page/register_page_classes.php';
 require_once dirname(__FILE__).'/dbd/autoload.inc.php';
-require_once dirname(__FILE__).'/img/autoload.inc.php';
+require_once dirname(__FILE__).'/files/autoload.inc.php';
 require_once dirname(__FILE__).'/api/autoload.inc.php';
\ No newline at end of file
diff --git a/uVote/files/autoload.inc.php b/uVote/files/autoload.inc.php
new file mode 100644
index 0000000..d5d86c0
--- /dev/null
+++ b/uVote/files/autoload.inc.php
@@ -0,0 +1,4 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/frontend_logos/','frontend_logos','*.png');
\ No newline at end of file
diff --git a/uVote/img/frontend_logos/background.png b/uVote/files/frontend_logos/background.png
similarity index 100%
rename from uVote/img/frontend_logos/background.png
rename to uVote/files/frontend_logos/background.png
diff --git a/uVote/img/frontend_logos/bild_8.png b/uVote/files/frontend_logos/bild_8.png
similarity index 100%
rename from uVote/img/frontend_logos/bild_8.png
rename to uVote/files/frontend_logos/bild_8.png
diff --git a/uVote/img/frontend_logos/chrome.png b/uVote/files/frontend_logos/chrome.png
similarity index 100%
rename from uVote/img/frontend_logos/chrome.png
rename to uVote/files/frontend_logos/chrome.png
diff --git a/uVote/img/frontend_logos/chrome.psd b/uVote/files/frontend_logos/chrome.psd
similarity index 100%
rename from uVote/img/frontend_logos/chrome.psd
rename to uVote/files/frontend_logos/chrome.psd
diff --git a/uVote/img/frontend_logos/contra.png b/uVote/files/frontend_logos/contra.png
similarity index 100%
rename from uVote/img/frontend_logos/contra.png
rename to uVote/files/frontend_logos/contra.png
diff --git a/uVote/img/frontend_logos/cover.png b/uVote/files/frontend_logos/cover.png
similarity index 100%
rename from uVote/img/frontend_logos/cover.png
rename to uVote/files/frontend_logos/cover.png
diff --git a/uVote/img/frontend_logos/cover.psd b/uVote/files/frontend_logos/cover.psd
similarity index 100%
rename from uVote/img/frontend_logos/cover.psd
rename to uVote/files/frontend_logos/cover.psd
diff --git a/uVote/img/frontend_logos/cover2.png b/uVote/files/frontend_logos/cover2.png
similarity index 100%
rename from uVote/img/frontend_logos/cover2.png
rename to uVote/files/frontend_logos/cover2.png
diff --git a/uVote/img/frontend_logos/enth.png b/uVote/files/frontend_logos/enth.png
similarity index 100%
rename from uVote/img/frontend_logos/enth.png
rename to uVote/files/frontend_logos/enth.png
diff --git a/uVote/img/frontend_logos/icon_bt.png b/uVote/files/frontend_logos/icon_bt.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_bt.png
rename to uVote/files/frontend_logos/icon_bt.png
diff --git a/uVote/img/frontend_logos/icon_cdu.png b/uVote/files/frontend_logos/icon_cdu.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_cdu.png
rename to uVote/files/frontend_logos/icon_cdu.png
diff --git a/uVote/img/frontend_logos/icon_cdu1.png b/uVote/files/frontend_logos/icon_cdu1.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_cdu1.png
rename to uVote/files/frontend_logos/icon_cdu1.png
diff --git a/uVote/img/frontend_logos/icon_csu.png b/uVote/files/frontend_logos/icon_csu.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_csu.png
rename to uVote/files/frontend_logos/icon_csu.png
diff --git a/uVote/img/frontend_logos/icon_csu1.png b/uVote/files/frontend_logos/icon_csu1.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_csu1.png
rename to uVote/files/frontend_logos/icon_csu1.png
diff --git a/uVote/img/frontend_logos/icon_gruene.png b/uVote/files/frontend_logos/icon_gruene.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_gruene.png
rename to uVote/files/frontend_logos/icon_gruene.png
diff --git a/uVote/img/frontend_logos/icon_gruene1.png b/uVote/files/frontend_logos/icon_gruene1.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_gruene1.png
rename to uVote/files/frontend_logos/icon_gruene1.png
diff --git a/uVote/img/frontend_logos/icon_linke.png b/uVote/files/frontend_logos/icon_linke.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_linke.png
rename to uVote/files/frontend_logos/icon_linke.png
diff --git a/uVote/img/frontend_logos/icon_linke1.png b/uVote/files/frontend_logos/icon_linke1.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_linke1.png
rename to uVote/files/frontend_logos/icon_linke1.png
diff --git a/uVote/img/frontend_logos/icon_party.psd b/uVote/files/frontend_logos/icon_party.psd
similarity index 100%
rename from uVote/img/frontend_logos/icon_party.psd
rename to uVote/files/frontend_logos/icon_party.psd
diff --git a/uVote/img/frontend_logos/icon_spd.png b/uVote/files/frontend_logos/icon_spd.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_spd.png
rename to uVote/files/frontend_logos/icon_spd.png
diff --git a/uVote/img/frontend_logos/icon_spd1.png b/uVote/files/frontend_logos/icon_spd1.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_spd1.png
rename to uVote/files/frontend_logos/icon_spd1.png
diff --git a/uVote/img/frontend_logos/icon_urn_con.png b/uVote/files/frontend_logos/icon_urn_con.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_urn_con.png
rename to uVote/files/frontend_logos/icon_urn_con.png
diff --git a/uVote/img/frontend_logos/icon_urn_ent.png b/uVote/files/frontend_logos/icon_urn_ent.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_urn_ent.png
rename to uVote/files/frontend_logos/icon_urn_ent.png
diff --git a/uVote/img/frontend_logos/icon_urn_open.png b/uVote/files/frontend_logos/icon_urn_open.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_urn_open.png
rename to uVote/files/frontend_logos/icon_urn_open.png
diff --git a/uVote/img/frontend_logos/icon_urn_pro.png b/uVote/files/frontend_logos/icon_urn_pro.png
similarity index 100%
rename from uVote/img/frontend_logos/icon_urn_pro.png
rename to uVote/files/frontend_logos/icon_urn_pro.png
diff --git a/uVote/img/frontend_logos/logo.jpg b/uVote/files/frontend_logos/logo.jpg
similarity index 100%
rename from uVote/img/frontend_logos/logo.jpg
rename to uVote/files/frontend_logos/logo.jpg
diff --git a/uVote/img/frontend_logos/logo2.png b/uVote/files/frontend_logos/logo2.png
similarity index 100%
rename from uVote/img/frontend_logos/logo2.png
rename to uVote/files/frontend_logos/logo2.png
diff --git a/uVote/img/frontend_logos/pro.png b/uVote/files/frontend_logos/pro.png
similarity index 100%
rename from uVote/img/frontend_logos/pro.png
rename to uVote/files/frontend_logos/pro.png
diff --git a/uVote/img/frontend_logos/vote_background.psd b/uVote/files/frontend_logos/vote_background.psd
similarity index 100%
rename from uVote/img/frontend_logos/vote_background.psd
rename to uVote/files/frontend_logos/vote_background.psd
diff --git a/uVote/img/register_img.php b/uVote/files/register_files.php
similarity index 100%
rename from uVote/img/register_img.php
rename to uVote/files/register_files.php
diff --git a/uVote/img/autoload.inc.php b/uVote/img/autoload.inc.php
deleted file mode 100644
index e137e6a..0000000
--- a/uVote/img/autoload.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-require_once dirname(__FILE__).'/register_img.php';
\ No newline at end of file