From 24647f9909c5f6885429633863b50ba8ffca7e6b Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Tue, 19 May 2015 15:01:19 +0200
Subject: [PATCH] saimod_webcraft_billing_satelite, saimod_webcraft_gallery as
 submodule, corrected autoloads

---
 .gitmodules                                      | 6 ++++++
 api.php                                          | 2 +-
 friseurteam/{autoload.inc.php => autoload.inc}   | 3 +--
 friseurteam/sai/autoload.inc                     | 3 +++
 friseurteam/sai/autoload.inc.php                 | 3 ---
 friseurteam/sai/register_modules.php             | 3 ---
 friseurteam/sai/saimod_webcraft_billing_satelite | 1 +
 friseurteam/sai/saimod_webcraft_gallery          | 1 +
 index.php                                        | 2 +-
 sai.php                                          | 2 +-
 10 files changed, 15 insertions(+), 11 deletions(-)
 rename friseurteam/{autoload.inc.php => autoload.inc} (75%)
 create mode 100644 friseurteam/sai/autoload.inc
 delete mode 100644 friseurteam/sai/autoload.inc.php
 delete mode 100644 friseurteam/sai/register_modules.php
 create mode 160000 friseurteam/sai/saimod_webcraft_billing_satelite
 create mode 160000 friseurteam/sai/saimod_webcraft_gallery

diff --git a/.gitmodules b/.gitmodules
index 8220a5c..0e6112e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "lib/system"]
 	path = lib/system
 	url = git@mojotrollz.eu:system.git
+[submodule "friseurteam/sai/saimod_webcraft_billing_satelite"]
+	path = friseurteam/sai/saimod_webcraft_billing_satelite
+	url = git@mojotrollz.eu:webcraft/saimod_webcraft_billing_satelite.git
+[submodule "friseurteam/sai/saimod_webcraft_gallery"]
+	path = friseurteam/sai/saimod_webcraft_gallery
+	url = git@mojotrollz.eu:webcraft/saimod_webcraft_gallery.git
diff --git a/api.php b/api.php
index d8de0b9..ba0e122 100644
--- a/api.php
+++ b/api.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'friseurteam/autoload.inc.php';                                    //Project Classes
+require_once 'friseurteam/autoload.inc';                                        //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
diff --git a/friseurteam/autoload.inc.php b/friseurteam/autoload.inc
similarity index 75%
rename from friseurteam/autoload.inc.php
rename to friseurteam/autoload.inc
index 530eaca..24db696 100644
--- a/friseurteam/autoload.inc.php
+++ b/friseurteam/autoload.inc
@@ -4,6 +4,5 @@ require_once dirname(__FILE__).'/page/autoload.inc.php';
 require_once dirname(__FILE__).'/config/autoload.inc.php';
 require_once dirname(__FILE__).'/dbd/autoload.inc.php';
 require_once dirname(__FILE__).'/api/autoload.inc.php';
-require_once dirname(__FILE__).'/sai/autoload.inc.php';
-require_once dirname(__FILE__).'/sai/register_modules.php';
+require_once dirname(__FILE__).'/sai/autoload.inc';
 require_once dirname(__FILE__).'/files/autoload.inc.php';
\ No newline at end of file
diff --git a/friseurteam/sai/autoload.inc b/friseurteam/sai/autoload.inc
new file mode 100644
index 0000000..7734ba4
--- /dev/null
+++ b/friseurteam/sai/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+require_once dirname(__FILE__).'/saimod_webcraft_billing_satelite/autoload.inc';
+require_once dirname(__FILE__).'/saimod_webcraft_gallery/autoload.inc';
\ No newline at end of file
diff --git a/friseurteam/sai/autoload.inc.php b/friseurteam/sai/autoload.inc.php
deleted file mode 100644
index 6950d6b..0000000
--- a/friseurteam/sai/autoload.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_billing_satelite','');
-require_once dirname(__FILE__).'/saimod_webcraft_gallery/autoload.inc.php';
\ No newline at end of file
diff --git a/friseurteam/sai/register_modules.php b/friseurteam/sai/register_modules.php
deleted file mode 100644
index 591ff79..0000000
--- a/friseurteam/sai/register_modules.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-\SYSTEM\SAI\sai::register('saimod_webcraft_billing_satelite');
-\SYSTEM\SAI\sai::register('saimod_webcraft_gallery');
diff --git a/friseurteam/sai/saimod_webcraft_billing_satelite b/friseurteam/sai/saimod_webcraft_billing_satelite
new file mode 160000
index 0000000..78e98dd
--- /dev/null
+++ b/friseurteam/sai/saimod_webcraft_billing_satelite
@@ -0,0 +1 @@
+Subproject commit 78e98ddddf1d8b182ffe3315db1326827b32321b
diff --git a/friseurteam/sai/saimod_webcraft_gallery b/friseurteam/sai/saimod_webcraft_gallery
new file mode 160000
index 0000000..a162689
--- /dev/null
+++ b/friseurteam/sai/saimod_webcraft_gallery
@@ -0,0 +1 @@
+Subproject commit a162689684bac3d462bff101b57656bd6c679ea1
diff --git a/index.php b/index.php
index 665178a..0c46f8d 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'friseurteam/autoload.inc.php';                                          //Project Classes
+require_once 'friseurteam/autoload.inc';                                        //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
diff --git a/sai.php b/sai.php
index 5c1fe45..211a97f 100644
--- a/sai.php
+++ b/sai.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'friseurteam/autoload.inc.php';                                    //Project Classes
+require_once 'friseurteam/autoload.inc';                                        //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));