Fixed some bugs from Sateserver v05

1 files changed, 4 insertions, 19 deletions

diff --git a/modules/sysconfig/addmodule.inc.php b/modules/sysconfig/addmodule.inc.php
index 883c196f..5af43c20 100644
--- a/modules/sysconfig/addmodule.inc.php
+++ b/modules/sysconfig/addmodule.inc.php
@@ -8,27 +8,11 @@ abstract class AddModule_Base
 {
 
 	/**
-	 * Holds all the known configuration modules, with title, description, start class for their wizard, etc.
-	 * @var array
-	 */
-	protected static $moduleTypes = array();
-	
-	/**
 	 * Holds the instance for the currently executing step
 	 * @var \AddModule_Base
 	 */
 	private static $instance = false;
 
-	public static function addModule($id, $startClass, $title, $description, $sortOrder = 0)
-	{
-		self::$moduleTypes[] = array(
-			'startClass' => $startClass,
-			'title' => $title,
-			'description' => $description,
-			'sortOrder' => $sortOrder
-		);
-	}
-
 	/**
 	 * 
 	 * @param type $step
@@ -125,12 +109,13 @@ class AddModule_Start extends AddModule_Base
 	protected function renderInternal()
 	{
 		$title = $order = array();
-		foreach (AddModule_Base::$moduleTypes as $module) {
+		$mods = Page_SysConfig::getModuleTypes();
+		foreach ($mods as $module) {
 			$title[] = $module['title'];
 			$order[] = $module['sortOrder'];
 		}
-		array_multisort($order, SORT_ASC, $title, SORT_ASC, self::$moduleTypes);
-		Render::addDialog('Modul hinzufügen', false, 'sysconfig/start', array('modules' => self::$moduleTypes));
+		array_multisort($order, SORT_ASC, $title, SORT_ASC, $mods);
+		Render::addDialog('Modul hinzufügen', false, 'sysconfig/start', array('modules' => array_values($mods)));
 	}
 
 }