From ce2c625dccabee0423ab91cb6ba6ba11d367c0a6 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Tue, 19 May 2015 14:37:59 +0200
Subject: [PATCH] included saimod_webcraft_billing_satelite, corrected
 autoloads

---
 .gitmodules                                | 3 +++
 api.php                                    | 2 +-
 index.php                                  | 2 +-
 rhein/{autoload.inc.php => autoload.inc}   | 2 +-
 rhein/sai/autoload.inc                     | 6 ++++++
 rhein/sai/autoload.inc.php                 | 6 ------
 rhein/sai/register_modules.php             | 4 ----
 rhein/sai/saimod_webcraft_billing_satelite | 1 +
 sai.php                                    | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename rhein/{autoload.inc.php => autoload.inc} (86%)
 create mode 100644 rhein/sai/autoload.inc
 delete mode 100644 rhein/sai/autoload.inc.php
 delete mode 100644 rhein/sai/register_modules.php
 create mode 160000 rhein/sai/saimod_webcraft_billing_satelite

diff --git a/.gitmodules b/.gitmodules
index 8220a5c..a9196f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/system"]
 	path = lib/system
 	url = git@mojotrollz.eu:system.git
+[submodule "rhein/sai/saimod_webcraft_billing_satelite"]
+	path = rhein/sai/saimod_webcraft_billing_satelite
+	url = git@mojotrollz.eu:webcraft/saimod_webcraft_billing_satelite.git
diff --git a/api.php b/api.php
index 6f4f33f..948a0aa 100644
--- a/api.php
+++ b/api.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'rhein/autoload.inc.php';                                          //Project Classes
+require_once 'rhein/autoload.inc';                                              //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
diff --git a/index.php b/index.php
index e52475d..c3e68f6 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'rhein/autoload.inc.php';                                          //Project Classes
+require_once 'rhein/autoload.inc';                                              //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
diff --git a/rhein/autoload.inc.php b/rhein/autoload.inc
similarity index 86%
rename from rhein/autoload.inc.php
rename to rhein/autoload.inc
index c4080c4..553dec4 100644
--- a/rhein/autoload.inc.php
+++ b/rhein/autoload.inc
@@ -5,4 +5,4 @@ require_once dirname(__FILE__).'/dbd/autoload.inc.php';
 require_once dirname(__FILE__).'/files/autoload.inc.php';
 require_once dirname(__FILE__).'/api/autoload.inc.php';
 require_once dirname(__FILE__).'/config/autoload.inc.php';
-require_once dirname(__FILE__).'/sai/autoload.inc.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/sai/autoload.inc';
\ No newline at end of file
diff --git a/rhein/sai/autoload.inc b/rhein/sai/autoload.inc
new file mode 100644
index 0000000..d869176
--- /dev/null
+++ b/rhein/sai/autoload.inc
@@ -0,0 +1,6 @@
+<?php
+//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saistart_rhein_sai','');
+require_once dirname(__FILE__).'/saimod_webcraft_billing_satelite/autoload.inc';
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_gallery','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_gallery/qq','DBD');
+\SYSTEM\SAI\sai::register('saimod_webcraft_gallery');
\ No newline at end of file
diff --git a/rhein/sai/autoload.inc.php b/rhein/sai/autoload.inc.php
deleted file mode 100644
index 5cf2e47..0000000
--- a/rhein/sai/autoload.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saistart_rhein_sai','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_billing_satelite','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_gallery','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_gallery/qq','DBD');
-require_once dirname(__FILE__).'/register_modules.php';
\ No newline at end of file
diff --git a/rhein/sai/register_modules.php b/rhein/sai/register_modules.php
deleted file mode 100644
index 72d3c4a..0000000
--- a/rhein/sai/register_modules.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-//\SYSTEM\SAI\sai::register_start('saistart_rhein_sai');
-\SYSTEM\SAI\sai::register('saimod_webcraft_billing_satelite');
-\SYSTEM\SAI\sai::register('saimod_webcraft_gallery');
\ No newline at end of file
diff --git a/rhein/sai/saimod_webcraft_billing_satelite b/rhein/sai/saimod_webcraft_billing_satelite
new file mode 160000
index 0000000..78e98dd
--- /dev/null
+++ b/rhein/sai/saimod_webcraft_billing_satelite
@@ -0,0 +1 @@
+Subproject commit 78e98ddddf1d8b182ffe3315db1326827b32321b
diff --git a/sai.php b/sai.php
index c9f44a1..ae5ef64 100644
--- a/sai.php
+++ b/sai.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'rhein/autoload.inc.php';                                          //Project Classes
+require_once 'rhein/autoload.inc';                                              //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));