[eStudy-svn] [eStudy-GIT] branch, staging, updated. Christoph Thelen

[Gitorious U. <kla...@mn...>]

The branch, staging has been updated

Summary of changes:
 setup/application/controllers/IndexController.php  |   27 +-
 unit-tests/AllTests.php                            |    1 +
 web/admin/PortalAdministration.mkf                 |  295 +++++++++-----------
 web/admin/classes/class.interpreter.inc.php        |   77 ++++--
 web/admin/tests/class.interpretermodultest.inc.php |   66 +++++
 web/announcement/Schwarzes_Brett.mkf               |   30 +--
 web/anonymisieren/Anonymisieren.mkf                |   10 +-
 web/calendar/Gruppenterminkalender.mkf             |   50 ++--
 web/common/classes/class.menu.inc.php              |   55 +++--
 web/common/mkf/estudy.sql                          |    1 +
 web/communication/Kommunikation.mkf                |   36 +--
 web/courses/Kursangebot.mkf                        |  114 +++------
 web/courses/Kursorganisation.mkf                   |  172 +++++-------
 web/externaltools/Tools.mkf                        |   74 ++----
 web/forum/Diskussionsforum.mkf                     |  198 ++++++--------
 web/gallery/Visitenkarten.mkf                      |   26 +-
 web/lerntagebuch/Lerntagebuch.mkf                  |   41 +--
 web/literatur/Literatur.mkf                        |   62 ++---
 web/mapdesigner/MapDesigner.mkf                    |   40 +--
 web/messaging/Private_Nachrichten.mkf              |   56 +---
 web/news/News.mkf                                  |   30 +--
 web/pdf/Export.mkf                                 |   12 +-
 web/photogallery/FotoForum.mkf                     |  174 +++++-------
 web/phpmosaic/Mosaic_Creator.mkf                   |   44 ++--
 web/planspiel/Planspiel.mkf                        |   90 +++----
 web/quiz/Selbststudium.mkf                         |   50 ++--
 web/ressourcen/Ressourcen.mkf                      |   60 ++---
 web/roleplay/Rollenspiel.mkf                       |   70 ++---
 web/soziomat/Soziomat.mkf                          |   70 +++---
 web/statistics/Statistiken.mkf                     |  190 ++++++-------
 web/suchmaschine/Suchmaschine.mkf                  |   26 +--
 web/teams/Teams.mkf                                |   72 ++---
 web/user/Profil.mkf                                |  294 ++++++++++----------
 web/voting/Umfragen.mkf                            |   84 +++----
 web/wizard/Zur_Orientierung.mkf                    |   30 +--
 35 files changed, 1185 insertions(+), 1542 deletions(-)
 create mode 100644 web/admin/tests/class.interpretermodultest.inc.php

...from  1ba508fffcb6f02ba3194b58f4301920e49be561 (commit) to (b36432ceea4a96e785f43e4057681c2999cb1f27)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ebf95ea8a514c6b390dff2f3eec2fd33b100fe64
Author: Christoph Thelen <chr...@mn...>
Date:   Mon Mar 5 10:36:17 2012 +0100

    Added missing setting which was only found in migration #6412

commit 14cb2d333ce21597462d574fed1c1887e8dd9ac2
Author: Christoph Thelen <chr...@mn...>
Date:   Mon Mar 5 10:51:47 2012 +0100

    Fixed some coding standards violations

commit 5d6680de4ddce9b5ee9cabfc4447f04812428252
Author: Christoph Thelen <chr...@mn...>
Date:   Mon Mar 5 18:29:19 2012 +0100

    Support portal_type in 'lang' section of MKF files.

commit cac0e456539f86f0d32e7cd95d8db548a40f280d
Author: Christoph Thelen <chr...@mn...>
Date:   Mon Mar 5 21:37:31 2012 +0100

    Correctly store portal type for base language de_DE

commit b36432ceea4a96e785f43e4057681c2999cb1f27
Author: Christoph Thelen <chr...@mn...>
Date:   Mon Mar 5 21:38:19 2012 +0100

    Updated makefiles to reflect addition of portal type to lang section. General menu layout now is like on production again.

-----------------------------------------------------------------------

Complete Diff

diff --git a/setup/application/controllers/IndexController.php b/setup/application/controllers/IndexController.php
index 959fdf4..f611f62 100644
--- a/setup/application/controllers/IndexController.php
+++ b/setup/application/controllers/IndexController.php
@@ -333,6 +333,7 @@ class IndexController extends Zend_Controller_Action {
 			'additionalDescription' => $this->getRequest()->getParam('additionalDescription'), 
 			'additionalCoverPage' => $this->getRequest()->getParam('additionalCoverPage'), 
 			'additionalPolicy' => $this->getRequest()->getParam('additionalPolicy'), 
+			'additionalPolicyDirectory' => $this->getRequest()->getParam('additionalPolicyDirectory'),
 			'additionalHttps' => $this->getRequest()->getParam('additionalHttps')
 		);
 		
diff --git a/unit-tests/AllTests.php b/unit-tests/AllTests.php
index 7a7d84f..ccf679d 100644
--- a/unit-tests/AllTests.php
+++ b/unit-tests/AllTests.php
@@ -59,6 +59,7 @@ class AllTests {
 		// Admin
 		$suite->addTestFile(PATH_TO_ROOT . "admin/tests/class.autoupdatetest.inc.php");
 		$suite->addTestFile(PATH_TO_ROOT . "admin/tests/class.autoupdatefilefindertest.inc.php");
+		$suite->addTestFile(PATH_TO_ROOT . "admin/tests/class.interpretermodultest.inc.php");
 		
 		// Test-Helfer
 		$suite->addTestFile(__DIR__ . "/tests/PropertyImporterTest.php");
diff --git a/web/admin/PortalAdministration.mkf b/web/admin/PortalAdministration.mkf
dissimilarity index 68%
index 5f1a31a..02bdba9 100644
--- a/web/admin/PortalAdministration.mkf
+++ b/web/admin/PortalAdministration.mkf
@@ -1,268 +1,241 @@
-Info eStudy-Makefile
-
-##Automatisch generierte Datei
-##Tool: .mkf-Export V1.2
-##File: PortalAdministration.mkf
-##Date: 20.05.2010
-##Modulgruppe: Portal-Administration
-
-
-#Modulgruppe
-define Portal-Administration:admin:0
-
-sql admin/admin.sql
-
-#MODUL: Registrierung
-name Registrierung
-modul admin/waitinglist.php
-lang en_GB enrolment
-lang hi_IN एगिस्त्रिएरुन्गेन
-lang en_GB enrolment
-lang hi_IN एगिस्त्रिएरुन्गेन
-lang en_GB enrolment
-lang hi_IN एगिस्त्रिएरुन्गेन
-show 1
-type top:-3
-access_foyer 0
-access_course 0
-show_order 1
-apply
-
-#MODUL: Systemwartung
-name Systemwartung
-modul admin/index.php
-lang en_GB attendance
-lang hi_IN वार्तुंग
-lang en_GB attendance
-lang hi_IN वार्तुंग
-lang en_GB attendance
-lang hi_IN वार्तुंग
-show 1
-type top:-3
-access_foyer 0
-access_course 0
-show_order 6
-apply
-
-#MODUL: phpinfo()-Script
-name phpinfo()-Script
-modul admin/php-umgebung.php
-lang en_GB phpinfo()-script
-lang hi_IN phpinfo()-स्क्रिप्ट
-lang en_GB phpinfo()-script
-lang hi_IN phpinfo()-स्क्रिप्ट
-lang en_GB phpinfo()-script
-lang hi_IN phpinfo()-स्क्रिप्ट
-show 0
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 
-apply
-
-#MODUL: Neues Mitglied
-name Neues Mitglied
-modul user/newuser.php
-lang en_GB New member
-lang hi_IN नयूएस मिट्ग्लिएद
-lang en_GB New member
-lang hi_IN नयूएस मिट्ग्लिएद
-lang en_GB New member
-lang hi_IN नयूएस मिट्ग्लिएद
-show 1
-type admin/waitinglist.php
-access_foyer 0
-access_course 0
-show_order 1
-apply
-
-#MODUL: Sperrliste
-name Sperrliste
-modul user/userbanning.php
-lang en_GB Banned Users
-lang hi_IN गेस्पेर्रते मिट्ग्लिएदर
-lang en_GB Banned Users
-lang hi_IN गेस्पेर्रते मिट्ग्लिएदर
-lang en_GB Banned Users
-lang hi_IN गेस्पेर्रते मिट्ग्लिएदर
-show 1
-type admin/waitinglist.php
-access_foyer 0
-access_course 0
-show_order 2
-apply
-
-#MODUL: Cacheinformation
-name Cacheinformation
-modul admin/cacheinfo.php
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 2
-apply
-
-#MODUL: PHP-Umgebung
-name PHP-Umgebung
-modul admin/php-info.php
-lang en_GB PHP-enviroment
-lang hi_IN प्प-उम्गेबुंग
-lang en_GB PHP-enviroment
-lang hi_IN प्प-उम्गेबुंग
-lang en_GB PHP-enviroment
-lang hi_IN प्प-उम्गेबुंग
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 3
-apply
-
-#MODUL: ZendEnvironment
-name ZendEnivronment
-modul admin/php_zend-env.php
-lang en_GB ZendEnvironment
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 4
-apply
-
-#MODUL: Einstellungen
-name Einstellungen
-modul admin/settings.php
-lang en_GB Settings
-lang hi_IN एंस्तेल्लुन्गें
-lang en_GB Settings
-lang hi_IN एंस्तेल्लुन्गें
-lang en_GB Settings
-lang hi_IN एंस्तेल्लुन्गें
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 5
-apply
-
-#MODUL: Portal-Zertifikat
-name Portal-Zertifikat
-modul admin/secureEmail.php
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 6
-apply
-
-#MODUL: Automation anstoßen
-name Automation ansto&szlig;en
-modul admin/daily.php
-lang en_GB Initiate automation 
-lang hi_IN ऑटोमेशन अन्स्तोस्सें
-lang en_GB Initiate automation 
-lang hi_IN ऑटोमेशन अन्स्तोस्सें
-lang en_GB Initiate automation 
-lang hi_IN ऑटोमेशन अन्स्तोस्सें
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 7
-apply
-
-#MODUL: Module
-name Module
-modul admin/moduleadmin.php
-lang en_GB Module
-lang hi_IN मॉड्यूल
-lang en_GB Module
-lang hi_IN मॉड्यूल
-lang en_GB Module
-lang hi_IN मॉड्यूल
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 8
-apply
-
-#MODUL: Startmodule
-name Startmodule
-modul admin/usergroupadmin.php
-lang en_GB User groups
-lang hi_IN बेनुत्ज़र्ग्रुप्पें
-lang en_GB User groups
-lang hi_IN बेनुत्ज़र्ग्रुप्पें
-lang en_GB User groups
-lang hi_IN बेनुत्ज़र्ग्रुप्पें
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 9
-apply
-
-#MODUL: Modulgruppen
-name Modulgruppen
-modul admin/modulegroupsadmin.php
-lang en_GB Modulgroups
-lang hi_IN मोदुल्ग्रुप्पें
-lang en_GB Modulgroups
-lang hi_IN मोदुल्ग्रुप्पें
-lang en_GB Modulgroups
-lang hi_IN मोदुल्ग्रुप्पें
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 10
-apply
-
-#MODUL: Menü-Links
-name Men&uuml;-Links
-modul admin/externallinks.php
-lang en_GB Menu-Links
-lang hi_IN मेनुए-लिंक्स
-lang en_GB Menu-Links
-lang hi_IN मेनुए-लिंक्स
-lang en_GB Menu-Links
-lang hi_IN मेनुए-लिंक्स
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 11
-apply
-
-#MODUL: Login-Seite
-name Login-Seite
-modul admin/infoadmin.php
-lang en_GB Login-Site
-lang hi_IN लोगिन-सीते
-lang en_GB Login-Site
-lang hi_IN लोगिन-सीते
-lang en_GB Login-Site
-lang hi_IN लोगिन-सीते
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 15
-apply
-
-#MODUL: Kurswolkenindex aktualisieren
-name Kurswolkenindex aktualisieren
-modul coursecloud/createindex.php
-lang en_GB Refresh CourseCloudIndex
-lang hi_IN कुर्स्वोल्केनिन्देक्स अक्तुअलिसिएरेन
-lang en_GB Refresh CourseCloudIndex
-lang hi_IN कुर्स्वोल्केनिन्देक्स अक्तुअलिसिएरेन
-lang en_GB Refresh CourseCloudIndex
-lang hi_IN कुर्स्वोल्केनिन्देक्स अक्तुअलिसिएरेन
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 17
-apply
+Info eStudy-Makefile
+
+##Automatisch generierte Datei
+##Tool: .mkf-Export V1.2
+##File: PortalAdministration.mkf
+##Date: 05.03.2012
+##Modulgruppe: Portal-Administration
+
+
+#Modulgruppe
+define Portal-Administration:admin:0
+
+sql admin/admin.sql
+
+#MODUL: Registrierung
+name Registrierung
+modul admin/waitinglist.php
+lang learning en_GB enrolment
+lang learning hi_IN एगिस्त्रिएरुन्गेन
+lang collaboration en_GB enrolment
+lang collaboration hi_IN एगिस्त्रिएरुन्गेन
+show 1
+type top:-3
+access_foyer 0
+access_course 0
+show_order 1
+apply
+
+#MODUL: QA
+name QA
+modul admin/index.php
+lang learning en_GB attendance
+lang learning hi_IN वार्तुंग
+lang collaboration en_GB attendance
+lang collaboration hi_IN वार्तुंग
+show 1
+type top:-3
+access_foyer 0
+access_course 0
+show_order 2
+apply
+
+#MODUL: System
+name System
+modul admin/settings.php
+lang learning en_GB Settings
+lang learning hi_IN एंस्तेल्लुन्गें
+lang collaboration en_GB Settings
+lang collaboration hi_IN एंस्तेल्लुन्गें
+show 1
+type top:-3
+access_foyer 0
+access_course 0
+show_order 3
+apply
+
+#MODUL: Lotse
+name Lotse
+modul admin/lotse.php
+show 0
+type admin/settings.php
+access_foyer 63
+access_course 63
+show_order 
+apply
+
+#MODUL: LotsenAdmin
+name LotsenAdmin
+modul admin/lotseAdmin.php
+show 0
+type admin/settings.php
+access_foyer 0
+access_course 0
+show_order 
+apply
+
+#MODUL: phpinfo()-Script
+name phpinfo()-Script
+modul admin/php-umgebung.php
+lang learning en_GB phpinfo()-script
+lang learning hi_IN phpinfo()-स्क्रिप्ट
+lang collaboration en_GB phpinfo()-script
+lang collaboration hi_IN phpinfo()-स्क्रिप्ट
+show 0
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 
+apply
+
+#MODUL: phpsec()-Script
+name phpsec()-Script
+modul admin/php_sec-umgebung.php
+lang learning en_GB phpsec()-script
+lang learning hi_IN phpsec()-स्क्रिप्ट
+lang collaboration en_GB phpsec()-script
+lang collaboration hi_IN phpsec()-स्क्रिप्ट
+show 0
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 
+apply
+
+#MODUL: Neues Mitglied
+name Neues Mitglied
+modul user/newuser.php
+lang learning en_GB New member
+lang learning hi_IN नयूएस मिट्ग्लिएद
+lang collaboration en_GB New member
+lang collaboration hi_IN नयूएस मिट्ग्लिएद
+show 1
+type admin/waitinglist.php
+access_foyer 0
+access_course 0
+show_order 1
+apply
+
+#MODUL: Logging
+name Logging
+modul admin/logging.php
+show 1
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 1
+apply
+
+#MODUL: Portalzertifikat
+name Portalzertifikat
+modul admin/secureEmail.php
+show 1
+type admin/settings.php
+access_foyer 0
+access_course 0
+show_order 1
+apply
+
+#MODUL: Module
+name Module
+modul admin/moduleadmin.php
+lang learning en_GB Module
+lang learning hi_IN मॉड्यूल
+lang collaboration en_GB Module
+lang collaboration hi_IN मॉड्यूल
+show 1
+type admin/settings.php
+access_foyer 0
+access_course 0
+show_order 2
+apply
+
+#MODUL: Modulgruppen
+name Modulgruppen
+modul admin/modulegroupsadmin.php
+lang learning en_GB Modulgroups
+lang learning hi_IN मोदुल्ग्रुप्पें
+lang collaboration en_GB Modulgroups
+lang collaboration hi_IN मोदुल्ग्रुप्पें
+show 1
+type admin/settings.php
+access_foyer 0
+access_course 0
+show_order 3
+apply
+
+#MODUL: Sicherheit
+name Sicherheit
+modul admin/php_zend-env.php
+show 1
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 3
+apply
+
+#MODUL: PHP-Info
+name PHP-Info
+modul admin/php-info.php
+lang learning en_GB PHP-enviroment
+lang learning hi_IN प्प-उम्गेबुंग
+lang collaboration en_GB PHP-enviroment
+lang collaboration hi_IN प्प-उम्गेबुंग
+show 1
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 4
+apply
+
+#MODUL: eStudy-Menü
+name eStudy-Menü
+modul admin/infoadmin.php
+lang learning en_GB Login-Site
+lang learning hi_IN लोगिन-सीते
+lang collaboration en_GB Login-Site
+lang collaboration hi_IN लोगिन-सीते
+show 1
+type admin/settings.php
+access_foyer 0
+access_course 0
+show_order 5
+apply
+
+#MODUL: Cache-Info
+name Cache-Info
+modul admin/cacheinfo.php
+show 1
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 5
+apply
+
+#MODUL: Automation anstoßen
+name Automation ansto&szlig;en
+modul admin/daily.php
+lang learning en_GB Initiate automation 
+lang learning hi_IN ऑटोमेशन अन्स्तोस्सें
+lang collaboration en_GB Initiate automation 
+lang collaboration hi_IN ऑटोमेशन अन्स्तोस्सें
+show 1
+type admin/index.php
+access_foyer 0
+access_course 0
+show_order 6
+apply
+
+#MODUL: Menü-Links
+name Menü-Links
+modul admin/externallinks.php
+lang learning en_GB Menu-Links
+lang learning hi_IN मेनुए-लिंक्स
+lang collaboration en_GB Menu-Links
+lang collaboration hi_IN मेनुए-लिंक्स
+show 1
+type externaltools/externaltool.admin.php
+access_foyer 0
+access_course 0
+show_order 11
+apply
diff --git a/web/admin/classes/class.interpreter.inc.php b/web/admin/classes/class.interpreter.inc.php
index 8dd4955..2342224 100644
--- a/web/admin/classes/class.interpreter.inc.php
+++ b/web/admin/classes/class.interpreter.inc.php
@@ -232,10 +232,10 @@
  * Informationskommentare sollen informationen über das emF enthalten, damit diese später
  * von der Methode {@link Interpreter::getInfo() <strong>getInfo()</strong>} extrahiert werden können.<br />
  *
- * lang locale Name des Moduls in dieser Sprache
- * lang en_GB Commana is King
- * Fuegt dem Modulnamen eine englische Uebersetzung bei.
- * Der Wert unter dem Befehl "name" ist immer die Uebersetzung fuer de_DE!!
+ * lang portal_type locale Name des Moduls in dieser Widmung und Sprache
+ * lang learning en_GB Commana is King
+ * Fuegt dem Modulnamen für die Portalart 'learing' eine englische Uebersetzung bei.
+ * Der Wert unter dem Befehl "name" ist immer die Uebersetzung fuer 'learning' de_DE!!
  *
  * @package eStudy.admin
  * @subpackage interpreter
@@ -319,7 +319,6 @@ class Interpreter_Modul {
 
 	/**
 	 * Zusaetzliche Uebersetzungsstrings fuer den Modulnamen
-	 * Locale => Name
 	 *
 	 * @var array
 	 */
@@ -355,6 +354,21 @@ class Interpreter_Modul {
 		}
 		return implode(" ", $string);
 	}
+	
+	public function fillRequiredPortalTypes(array $portaltypes) {
+		foreach ($portaltypes as $type) {
+			$hastype = false;
+			foreach ($this->lang as $lang) {
+				if ($lang->PortalType === $type && $lang->Locale === 'de_DE') {
+					$hastype = true;
+					break;
+				}
+			}
+			if (!$hastype) {
+				$this->lang[] = (object)array('PortalType' => $type, 'Locale' => 'de_DE', 'Name' => $this->name);
+			}
+		}
+	}
 }
 /**
  * Interpretiert Files im eStudy-Makefile Format
@@ -1001,16 +1015,18 @@ class Interpreter {
 
 					case 'lang':
 						$command = 'lang';
-						if ($anzahl < 3) {
-							$error = "Benutzung: 'lang Locale Name des Moduls'";
+						if ($anzahl < 4) {
+							$error = "Benutzung: 'lang PortalType Locale Name des Moduls'";
 							break;
 						}
-						array_shift($tokens);
+						array_shift($tokens); // command
+						$portaltype = array_shift($tokens);
 						$string = implode(" ", $tokens);
 						if (! preg_match("/[a-z]{2}_[A-Z]{2}/", $tokens[0])) {
 							$error = "Locale muss die Form haben: xx_XX Bsp: de_DE";
 							break;
 						}
+						array_unshift($tokens, $portaltype);
 						array_unshift($tokens, $command);
 						break;
 
@@ -1085,15 +1101,15 @@ class Interpreter {
 				$query.= "VALUES";
 				$query.= "('$i','$modulegroupID','$module->access_foyer','$module->access_course','$module->modul','$type','$module->show',$module->show_order)";
 				$db->query($query);
-				$portalTypes = array("learning", "community", "collaboration");
-				foreach ($portalTypes as $portalType) {
+				
+				$module->fillRequiredPortalTypes(array('learning', 'collaboration'));
 					$sql = "INSERT IGNORE INTO modules_lang (`Script`, `PortalType`, `Locale`, `Name`)";
-					$sql .= " VALUES ('$module->modul', '$portalType', 'de_DE', '$module->name')";
-					foreach($module->lang as $locale => $name) {
-						$sql .= ",('$module->modul', '$portalType', '$locale', '$name')";
+				$sql .= " VALUES ('$module->modul', 'learning', 'de_DE', '$module->name')";
+				foreach($module->lang as $lang) {
+					$sql .= ",('$module->modul', '$lang->PortalType', '$lang->Locale', '$lang->Name')";
 					}
 					$db->query($sql);
-				}
+				
 				if ($settings["db_lock_rights"]) $db->query("UNLOCK TABLES");
 				if (count($EZSQL_ERROR) == $errorCount) return true;
 				$this->errorString = "Eintrag in die Datenbank fehlgeschlagen!";
@@ -1566,17 +1582,20 @@ class Interpreter {
 				break;
 
 			case 'lang':
-				/*  in $param steht etwas wie "de_DE Name des Moduls"
-				 *  hole zunaechst de_DE raus:
-				 */
+				// in $param steht etwas wie "learning de_DE Name des Moduls"
 				$tokens = explode(" ", $param);
-				$locale = $tokens[0];
-				array_shift($tokens);
-				// setze den namen wieder zusammen
+				// $tokens enthaelt jetzt ["learning", "de_DE", "Name", "des", "Moduls"]
+				$portaltype = array_shift($tokens);
+				$locale = array_shift($tokens);
+				// Nun ist nur noch der Name uebrig. Setze ihn wieder zusammen.
 				$name = implode(" ", $tokens);
 					
-				$this->workingModul->lang += array($locale => $name);
-					
+				$lang = array(
+						"PortalType" => $portaltype,
+						"Locale" => $locale,
+						"Name" => $name,
+				);
+				$this->workingModul->lang[] = (object)$lang;
 				break;
 
 			default:
@@ -1685,7 +1704,7 @@ class Interpreter {
 			$modules = $module;
 			$module = array();
 			foreach($modules as $modul) {
-				$modul->translations = $db->get_results("SELECT Locale, Name FROM modules_lang WHERE Script = '".Data::toMysql($modul->Script, false)."' AND Locale != 'de_DE'");
+				$modul->translations = $db->get_results("SELECT PortalType, Locale, Name FROM modules_lang WHERE Script = '".Data::toMysql($modul->Script, false)."' AND Locale != 'de_DE'");
 				$module[$modul->ID] = $modul;
 			}
 			//topmodule
@@ -1698,7 +1717,7 @@ class Interpreter {
 					fwrite($fp, "modul ".$modul->Script."\n");
 					if (is_array($modul->translations)) {
 						foreach($modul->translations as $lang) {
-							fwrite($fp, "lang " . $lang->Locale . " " . $lang->Name . "\n");
+							fwrite($fp, "lang " . $lang->PortalType . " " . $lang->Locale . " " . $lang->Name . "\n");
 						}
 					}
 					fwrite($fp, "show ".$modul->ShowInMenu."\n");
@@ -1719,7 +1738,7 @@ class Interpreter {
 					fwrite($fp, "modul ".$modul->Script."\n");
 					if (is_array($modul->translations)) {
 						foreach($modul->translations as $lang) {
-							fwrite($fp, "lang " . $lang->Locale . " " . $lang->Name . "\n");
+							fwrite($fp, "lang " . $lang->PortalType . " " . $lang->Locale . " " . $lang->Name . "\n");
 						}
 					}
 					fwrite($fp, "show ".$modul->ShowInMenu."\n");
@@ -1745,7 +1764,7 @@ class Interpreter {
 		fwrite($fp, "modul ".$modul->Script."\n");
 		if (is_array($modul->translations)) {
 			foreach($modul->translations as $lang) {
-				fwrite($fp, "lang " . $lang->Locale . " " . $lang->Name . "\n");
+				fwrite($fp, "lang " . $lang->PortalType . " " . $lang->Locale . " " . $lang->Name . "\n");
 			}
 		}
 		fwrite($fp, "show ".$modul->ShowInMenu."\n");
diff --git a/web/admin/tests/class.interpretermodultest.inc.php b/web/admin/tests/class.interpretermodultest.inc.php
new file mode 100644
index 0000000..1389624
--- /dev/null
+++ b/web/admin/tests/class.interpretermodultest.inc.php
@@ -0,0 +1,66 @@
+<?php
+/*--------------------------------------------------------------------------+
+ This file is part of eStudy.
+ - Modulgruppe:  admin
+ - Autor(en):    Christoph Thelen <chr...@mn...>
+ +---------------------------------------------------------------------------+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or any later version.
+ +---------------------------------------------------------------------------+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ +--------------------------------------------------------------------------*/
+
+if (! defined("PATH_TO_ROOT")) define("PATH_TO_ROOT", "../../");
+
+require_once PATH_TO_ROOT . "admin/classes/class.interpreter.inc.php";
+
+class InterpreterModulTest extends PHPUnit_Framework_TestCase {
+	
+	public function testShouldInsertAllMissingPortalTypeTranslations() {
+		$module = new Interpreter_Modul();
+		$module->name = "Test";
+		
+		$module->fillRequiredPortalTypes(array('type1', 'type2'));
+		$expected[] = $this->createLangEntry('type1');
+		$expected[] = $this->createLangEntry('type2');
+		
+		$this->assertEquals($expected, $module->lang);
+	}
+	
+	public function testShouldAmendExistingPortalTypeTranslations() {
+		$module = new Interpreter_Modul();
+		$module->name = "Test";
+		$module->lang[] = $this->createLangEntry('type1');
+		
+		$module->fillRequiredPortalTypes(array('type1', 'type2'));
+		$expected[] = $this->createLangEntry('type1');
+		$expected[] = $this->createLangEntry('type2');
+		
+		$this->assertEquals($expected, $module->lang);
+	}
+	
+	public function testShouldAlwaysAmendGermanForAllPortalTypes() {
+		$module = new Interpreter_Modul();
+		$module->name = "Test";
+		$module->lang[] = $this->createLangEntry('type1', 'en_GB');
+		
+		$module->fillRequiredPortalTypes(array('type1', 'type2'));
+		$expected[] = $this->createLangEntry('type1', 'en_GB');
+		$expected[] = $this->createLangEntry('type1');
+		$expected[] = $this->createLangEntry('type2');
+		
+		$this->assertEquals($expected, $module->lang);
+	}
+	
+	private function createLangEntry($type, $locale = 'de_DE', $name = "Test") {
+		return (object)array('PortalType' => $type, 'Locale' => $locale, 'Name' => $name);
+	}
+}
\ No newline at end of file
diff --git a/web/announcement/Schwarzes_Brett.mkf b/web/announcement/Schwarzes_Brett.mkf
index 3ac9c27..2bb7df4 100644
--- a/web/announcement/Schwarzes_Brett.mkf
+++ b/web/announcement/Schwarzes_Brett.mkf
@@ -15,12 +15,10 @@ sql announcement/announcement.sql
 #MODUL: Aushang
 name Aushang
 modul announcement/announcement.php
-lang en_GB Messages
-lang hi_IN मिट्तेइलुन्गें
-lang en_GB Messages
-lang hi_IN मिट्तेइलुन्गें
-lang en_GB Messages
-lang hi_IN मिट्तेइलुन्गें
+lang learning en_GB Messages
+lang learning hi_IN मिट्तेइलुन्गें
+lang collaboration en_GB Messages
+lang collaboration hi_IN मिट्तेइलुन्गें
 show 3
 type top:-1
 access_foyer 63
@@ -31,12 +29,10 @@ apply
 #MODUL: Aushang editieren
 name Aushang editieren
 modul announcement/modify.php
-lang en_GB Edit messages
-lang hi_IN मित्तेइलुंग बार्बितें
-lang en_GB Edit messages
-lang hi_IN मित्तेइलुंग बार्बितें
-lang en_GB Edit messages
-lang hi_IN मित्तेइलुंग बार्बितें
+lang learning en_GB Edit messages
+lang learning hi_IN मित्तेइलुंग बार्बितें
+lang collaboration en_GB Edit messages
+lang collaboration hi_IN मित्तेइलुंग बार्बितें
 show 0
 type announcement/announcement.php
 access_foyer 0
@@ -57,12 +53,10 @@ apply
 #MODUL: Neuer Aushang
 name Neuer Aushang
 modul announcement/create.php
-lang en_GB New messages
-lang hi_IN नुए मित्तेइलुंग
-lang en_GB New messages
-lang hi_IN नुए मित्तेइलुंग
-lang en_GB New messages
-lang hi_IN नुए मित्तेइलुंग
+lang learning en_GB New messages
+lang learning hi_IN नुए मित्तेइलुंग
+lang collaboration en_GB New messages
+lang collaboration hi_IN नुए मित्तेइलुंग
 show 3
 type announcement/announcement.php
 access_foyer 0
diff --git a/web/anonymisieren/Anonymisieren.mkf b/web/anonymisieren/Anonymisieren.mkf
index c1aa2d2..b6d683e 100644
--- a/web/anonymisieren/Anonymisieren.mkf
+++ b/web/anonymisieren/Anonymisieren.mkf
@@ -13,12 +13,10 @@ define Anonymisieren:anonymisierung:1
 #MODUL: Anonymisieren
 name Anonymisieren
 modul anonymisieren/anonym.php
-lang en_GB to make anonymous
-lang hi_IN अनोंय्मिसिएरें
-lang en_GB to make anonymous
-lang hi_IN अनोंय्मिसिएरें
-lang en_GB to make anonymous
-lang hi_IN अनोंय्मिसिएरें
+lang learning en_GB to make anonymous
+lang learning hi_IN अनोंय्मिसिएरें
+lang collaboration en_GB to make anonymous
+lang collaboration hi_IN अनोंय्मिसिएरें
 show 1
 type top:-3
 access_foyer 0
diff --git a/web/calendar/Gruppenterminkalender.mkf b/web/calendar/Gruppenterminkalender.mkf
index 72aa1e9..66f68bd 100644
--- a/web/calendar/Gruppenterminkalender.mkf
+++ b/web/calendar/Gruppenterminkalender.mkf
@@ -15,12 +15,10 @@ sql calendar/calendar.sql
 #MODUL: Termine
 name Termine
 modul calendar/calendar.php
-lang en_GB Calendar
-lang hi_IN कलेंडर
-lang en_GB Calendar
-lang hi_IN कलेंडर
-lang en_GB Calendar
-lang hi_IN कलेंडर
+lang learning en_GB Calendar
+lang learning hi_IN कलेंडर
+lang collaboration en_GB Calendar
+lang collaboration hi_IN कलेंडर
 show 3
 type top:-2
 access_foyer 63
@@ -31,12 +29,10 @@ apply
 #MODUL: Kalender-Anzeige filtern
 name Kalender-Anzeige filtern
 modul calendar/filter.php
-lang en_GB Filter Calendar-view
-lang hi_IN कलेंडर-अन्ज़इगे फिल्तेर्ण
-lang en_GB Filter Calendar-view
-lang hi_IN कलेंडर-अन्ज़इगे फिल्तेर्ण
-lang en_GB Filter Calendar-view
-lang hi_IN कलेंडर-अन्ज़इगे फिल्तेर्ण
+lang learning en_GB Filter Calendar-view
+lang learning hi_IN कलेंडर-अन्ज़इगे फिल्तेर्ण
+lang collaboration en_GB Filter Calendar-view
+lang collaboration hi_IN कलेंडर-अन्ज़इगे फिल्तेर्ण
 show 0
 type calendar/calendar.php
 access_foyer 63
@@ -47,12 +43,10 @@ apply
 #MODUL: Termin anzeigen
 name Termin anzeigen
 modul calendar/showevent.php
-lang en_GB Show date
-lang hi_IN तेर्मिन अन्ज़इगें
-lang en_GB Show date
-lang hi_IN तेर्मिन अन्ज़इगें
-lang en_GB Show date
-lang hi_IN तेर्मिन अन्ज़इगें
+lang learning en_GB Show date
+lang learning hi_IN तेर्मिन अन्ज़इगें
+lang collaboration en_GB Show date
+lang collaboration hi_IN तेर्मिन अन्ज़इगें
 show 0
 type calendar/calendar.php
 access_foyer 63
@@ -63,12 +57,10 @@ apply
 #MODUL: Gruppenzeiten organisieren
 name Gruppenzeiten organisieren
 modul calendar/grouptimesorganisation.php
-lang en_GB Manage Grouptimes
-lang hi_IN ग़्रुप्पेन्ज़ेइतेन ओर्गानिसिएरें
-lang en_GB Manage Grouptimes
-lang hi_IN ग़्रुप्पेन्ज़ेइतेन ओर्गानिसिएरें
-lang en_GB Manage Grouptimes
-lang hi_IN ग़्रुप्पेन्ज़ेइतेन ओर्गानिसिएरें
+lang learning en_GB Manage Grouptimes
+lang learning hi_IN ग़्रुप्पेन्ज़ेइतेन ओर्गानिसिएरें
+lang collaboration en_GB Manage Grouptimes
+lang collaboration hi_IN ग़्रुप्पेन्ज़ेइतेन ओर्गानिसिएरें
 show 0
 type calendar/calendar.php
 access_foyer 63
@@ -79,12 +71,10 @@ apply
 #MODUL: Neuer Termin
 name Neuer Termin
 modul calendar/newcevent.php
-lang en_GB Create date
-lang hi_IN तेर्मिन एंत्रगें
-lang en_GB Create date
-lang hi_IN तेर्मिन एंत्रगें
-lang en_GB Create date
-lang hi_IN तेर्मिन एंत्रगें
+lang learning en_GB Create date
+lang learning hi_IN तेर्मिन एंत्रगें
+lang collaboration en_GB Create date
+lang collaboration hi_IN तेर्मिन एंत्रगें
 show 3
 type calendar/calendar.php
 access_foyer 63
diff --git a/web/common/classes/class.menu.inc.php b/web/common/classes/class.menu.inc.php
index bef8f97..89a1c12 100644
--- a/web/common/classes/class.menu.inc.php
+++ b/web/common/classes/class.menu.inc.php
@@ -656,22 +656,31 @@ class Menu {
 		foreach ($items as $topItem) {
 			$topItem->Name = Data :: toHTML($topItem->Name, false);
 			
-			if ($topItem->Path . "/index.php" == str_replace("infos/", '', SCRIPT_NAME))
+			if ($topItem->Path . "/index.php" == str_replace("infos/", '', SCRIPT_NAME)) {
 				echo "<li class='menuSelected'>";
-			else
+			} else {
 				echo "<li>";
-			echo "<a href='" . PATH_TO_ROOT . "infos/{$topItem->Path}/index.php' " . "title=\"" . sprintf($this->translate->_("Gehe zu %s"), $topItem->Name) . "\">{$topItem->Name}</a></li>\n";
+			}
 			
-			$sub =  $this->db->get_results("SELECT * FROM infosub WHERE infotopID='" . $topItem->ID . "'
-															AND ShowInMenu ='1' ORDER BY ShowOrder, Name");
+			$title = sprintf($this->translate->_("Gehe zu %s"), $topItem->Name);
+			echo "<a href='" . PATH_TO_ROOT . "infos/{$topItem->Path}/index.php' title='$title'>$topItem->Name</a></li>\n";
+			
+			$sub = $this->db->get_results(
+				"SELECT * FROM infosub WHERE infotopID='" . $topItem->ID . "' AND ShowInMenu ='1' ORDER BY ShowOrder, Name"
+			);
 			if(!empty($sub)) {
 				echo "<li class='menuSub'><ul>\n";
 				foreach ($sub as $subItem) {
-					if ($subItem->Script == str_replace("infos/", '', SCRIPT_NAME))
+					$subItem->Name = Data::toHTML($subItem->Name, false);
+					
+					if ($subItem->Script == str_replace("infos/", '', SCRIPT_NAME)) {
 						echo "<li class='menuSelected'>";
-					else
+					} else {
 						echo "<li>";
-					echo "<a href='" . PATH_TO_ROOT . "infos/{$subItem->Script}' title=\"" . sprintf($this->translate->_("Gehe zu %s"), $subItem->Name) . "\">$subItem->Name</a></li>\n";
+					}
+					
+					$title = sprintf($this->translate->_("Gehe zu %s"), $subItem->Name);
+					echo "<a href='" . PATH_TO_ROOT . "infos/{$subItem->Script}' title='$title'>$subItem->Name</a></li>\n";
 				}
 				echo "</ul></li>\n";
 			}
diff --git a/web/common/mkf/estudy.sql b/web/common/mkf/estudy.sql
index ddc6212..0bd8670 100644
--- a/web/common/mkf/estudy.sql
+++ b/web/common/mkf/estudy.sql
@@ -565,6 +565,7 @@ INSERT INTO `helptexts` (`ID`, `Caption`, `Helptext`) VALUES
 INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('int_version', ' ', '20061003');
 INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('timelimit', 'i', '45');
 INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('info_path', 's', 'infos/');
+INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('index_page', 's', '');
 INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('upload_path', 's', '../upload/');
 INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('maintenance_disallow_login', 'b', 'false');
 INSERT INTO `settings` (`name`, `type`, `value`) VALUES ('maintenance_disallow_mobile', 'b', 'false');
diff --git a/web/communication/Kommunikation.mkf b/web/communication/Kommunikation.mkf
index 10c2f3b..9c74ced 100644
--- a/web/communication/Kommunikation.mkf
+++ b/web/communication/Kommunikation.mkf
@@ -13,30 +13,26 @@ define Kommunikation:communication:0
 #MODUL: Mitglieder
 name Mitglieder
 modul user/memberlist.php
-lang en_GB Member
-lang hi_IN मिट्ग्लिएदर
-lang en_GB Member
-lang hi_IN मिट्ग्लिएदर
-lang en_GB Member
-lang hi_IN मिट्ग्लिएदर
+lang learning en_GB Member
+lang learning hi_IN मिट्ग्लिएदर
+lang collaboration en_GB Member
+lang collaboration hi_IN मिट्ग्लिएदर
 show 3
 type top:-1
 access_foyer 63
 access_course 63
-show_order 4
+show_order 5
 apply
 
 #MODUL: Chaträume
 name Chatr&auml;ume
 modul chat/index.php
-lang en_GB Chat
-lang hi_IN चाट
-lang en_GB Chat
-lang hi_IN चाट
-lang en_GB Chat
-lang hi_IN चाट
+lang learning en_GB Chat
+lang learning hi_IN चाट
+lang collaboration en_GB Chat
+lang collaboration hi_IN चाट
 show 0
-type user/favourites.php
+type user/overview.php
 access_foyer 63
 access_course 63
 show_order 
@@ -45,14 +41,12 @@ apply
 #MODUL: Chatinfo
 name Chatinfo
 modul chat/chatinfo.php
-lang en_GB Chatinfo
-lang hi_IN चातिन्फो
-lang en_GB Chatinfo
-lang hi_IN चातिन्फो
-lang en_GB Chatinfo
-lang hi_IN चातिन्फो
+lang learning en_GB Chatinfo
+lang learning hi_IN चातिन्फो
+lang collaboration en_GB Chatinfo
+lang collaboration hi_IN चातिन्फो
 show 0
-type user/favourites.php
+type user/overview.php
 access_foyer 63
 access_course 63
 show_order 
diff --git a/web/courses/Kursangebot.mkf b/web/courses/Kursangebot.mkf
dissimilarity index 66%
index 3796be6..ae39efb 100644
--- a/web/courses/Kursangebot.mkf
+++ b/web/courses/Kursangebot.mkf
@@ -1,183 +1,135 @@
-Info eStudy-Makefile
-
-##Automatisch generierte Datei
-##Tool: .mkf-Export V1.2
-##File: Kursangebot.mkf
-##Date: 10.06.2011
-##Modulgruppe: Kursangebot
-
-
-#Modulgruppe
-define Kursangebot:courses:0
-
-sql courses/courses.sql
-
-#MODUL: Kurse & Communities
-name Kurse &amp; Communities
-modul courses/facetview.php
-show 3
-type top:-1
-access_foyer 63
-access_course 63
-show_order 2
-apply
-
-#MODUL: Vom Kurs abmelden
-name Vom Kurs abmelden
-modul courses/leave.php
-lang en_GB Leave course
-lang hi_IN वोम कुर्स अब्मेल्दें
-lang en_GB Leave course
-lang hi_IN वोम कुर्स अब्मेल्दें
-lang en_GB Leave course
-lang hi_IN वोम कुर्स अब्मेल्दें
-show 0
-type courses/facetview.php
-access_foyer 63
-access_course 63
-show_order 
-apply
-
-#MODUL: Zum Kurs anmelden
-name Zum Kurs anmelden
-modul courses/register.php
-lang en_GB Join Course
-lang hi_IN जम कुर्स अन्मेल्दें
-lang en_GB Join Course
-lang hi_IN जम कुर्स अन्मेल्दें
-lang en_GB Join Course
-lang hi_IN जम कुर्स अन्मेल्दें
-show 0
-type courses/facetview.php
-access_foyer 63
-access_course 63
-show_order 
-apply
-
-#MODUL: Kurs anlegen
-name Kurs anlegen
-modul courses/createcourse.php
-lang en_GB Create course
-lang hi_IN कुर्स अन्लेगें
-lang en_GB Create course
-lang hi_IN कुर्स अन्लेगें
-lang en_GB Create course
-lang hi_IN कुर्स अन्लेगें
-show 0
-type courses/facetview.php
-access_foyer 6
-access_course 6
-show_order 
-apply
-
-#MODUL: CourseCloud-Weiterleitung
-name CourseCloud-Weiterleitung
-modul coursecloud/credentials.php
-lang en_GB CourseCloud-forwarding
-lang hi_IN कोउर्सेक्लौद-एइतेर्लेइतुन्ग
-lang en_GB CourseCloud-forwarding
-lang hi_IN कोउर्सेक्लौद-एइतेर्लेइतुन्ग
-lang en_GB CourseCloud-forwarding
-lang hi_IN कोउर्सेक्लौद-एइतेर्लेइतुन्ग
-show 0
-type courses/facetview.php
-access_foyer 63
-access_course 63
-show_order 
-apply
-
-#MODUL: Warteliste
-name Warteliste
-modul courses/course.waitinglist.php
-lang en_GB Waitinglist
-lang hi_IN वार्तेलिस्ते
-lang en_GB Waitinglist
-lang hi_IN वार्तेलिस्ते
-lang en_GB Waitinglist
-lang hi_IN वार्तेलिस्ते
-show 2
-type courses/settings.php
-access_foyer 0
-access_course 2
-show_order 1
-apply
-
-#MODUL: eCommunity löschstop
-name eCommunity l&ouml;schstop
-modul courses/cancelecomdel.php
-lang en_GB eCommunity delete-stop
-lang hi_IN एकोम्मुनिटी लोएस्च्स्तोप
-lang en_GB eCommunity delete-stop
-lang hi_IN एकोम्मुनिटी लोएस्च्स्तोप
-lang en_GB eCommunity delete-stop
-lang hi_IN एकोम्मुनिटी लोएस्च्स्तोप
-show 0
-type courses/facetview.php
-access_foyer 63
-access_course 0
-show_order 2
-apply
-
-#MODUL: Info
-name Info
-modul courses/courseinfo.php
-lang en_GB Info
-lang hi_IN इन्फो
-lang en_GB Info
-lang hi_IN इन्फो
-lang en_GB Info
-lang hi_IN इन्फो
-show 2
-type announcement/announcement.php
-access_foyer 63
-access_course 63
-show_order 3
-apply
-
-#MODUL: eCommunity organisieren
-name eCommunity organisieren
-modul courses/settingsecom.php
-lang en_GB Manage eCommunity
-lang hi_IN एकोम्मुनिटी ओर्गानिसिएरें
-lang en_GB Manage eCommunity
-lang hi_IN एकोम्मुनिटी ओर्गानिसिएरें
-lang en_GB Manage eCommunity
-lang hi_IN एकोम्मुनिटी ओर्गानिसिएरें
-show 0
-type courses/facetview.php
-access_foyer 63
-access_course 0
-show_order 3
-apply
-
-#MODUL: Konfektionierung
-name Konfektionierung
-modul courses/assemblyadmin.php
-lang en_GB Assemble Courses
-lang hi_IN ख़ोन्फ़ेक्तिओनिएर्ते कुरसे
-lang en_GB Assemble Courses
-lang hi_IN ख़ोन्फ़ेक्तिओनिएर्ते कुरसे
-lang en_GB Assemble Courses
-lang hi_IN ख़ोन्फ़ेक्तिओनिएर्ते कुरसे
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 16
-apply
-
-#MODUL: Modulbeschreibungen
-name Modulbeschreibungen
-modul admin/xmlImport.php
-lang en_GB Import modul description
-lang hi_IN ंओदुल्बेस्च्रेइबुन्गेन इम्पोर्तिएरें
-lang en_GB Import modul description
-lang hi_IN ंओदुल्बेस्च्रेइबुन्गेन इम्पोर्तिएरें
-lang en_GB Import modul description
-lang hi_IN ंओदुल्बेस्च्रेइबुन्गेन इम्पोर्तिएरें
-show 1
-type admin/index.php
-access_foyer 0
-access_course 0
-show_order 18
-apply
+Info eStudy-Makefile
+
+##Automatisch generierte Datei
+##Tool: .mkf-Export V1.2
+##File: Kursangebot.mkf
+##Date: 10.06.2011
+##Modulgruppe: Kursangebot
+
+
+#Modulgruppe
+define Kursangebot:courses:0
+
+sql courses/courses.sql
+
+#MODUL: Kurse & Communities
+name Kurse &amp; Communities
+modul courses/facetview.php
+show 3
+type top:-1
+access_foyer 63
+access_course 63
+show_order 2
+apply
+
+#MODUL: Vom Kurs abmelden
+name Vom Kurs abmelden
+modul courses/leave.php
+lang learning en_GB Leave course
+lang learning hi_IN वोम कुर्स अब्मेल्दें
+lang collaboration en_GB Leave course
+lang collaboration hi_IN वोम कुर्स अब्मेल्दें
+show 0
+type courses/facetview.php
+access_foyer 63
+access_course 63
+show_order 
+apply
+
+#MODUL: Zum Kurs anmelden
+name Zum Kurs anmelden
+modul courses/register.php
+lang learning en_GB Join Course
+lang learning hi_IN जम कुर्स अन्मेल्दें
+lang collaboration en_GB Join Course
+lang collaboration hi_IN जम कुर्स अन्मेल्दें
+show 0
+type courses/facetview.php
+access_foyer 63
+access_course 63
+show_order 
+apply
+
+#MODUL: Kurs anlegen
+name Kurs anlegen
+modul courses/createcourse.php
+lang learning en_GB Create course
+lang learning hi_IN कुर्स अन्लेगें
+lang collaboration en_GB Create course
+lang collaboration hi_IN कुर्स अन्लेगें
+show 0
+type courses/facetview.php
+access_foyer 6
+access_course 6
+show_order 
+apply
+
+#MODUL: CourseCloud-Weiterleitung
+name CourseCloud-Weiterleitung
+modul coursecloud/credentials.php
+lang learning en_GB CourseCloud-forwarding
+lang learning hi_IN कोउर्सेक्लौद-एइतेर्लेइतुन्ग
+lang collaboration en_GB CourseCloud-forwarding
+lang collaboration hi_IN कोउर्सेक्लौद-एइतेर्लेइतुन्ग
+show 0
+type courses/facetview.php
+access_foyer 63
+access_course 63
+show_order 
+apply
+
+#MODUL: Warteliste
+name Warteliste
+modul courses/course.waitinglist.php
+lang learning en_GB Waitinglist
+lang learning hi_IN वार्तेलिस्ते
+lang collaboration en_GB Waitinglist
+lang collaboration hi_IN वार्तेलिस्ते
+show 2
+type courses/settings.php
+access_foyer 0
+access_course 2
+show_order 1
+apply
+
+#MODUL: eCommunity löschstop
+name eCommunity l&ouml;schstop
+modul courses/cancelecomdel.php
+lang learning en_GB eCommunity delete-stop
+lang learning hi_IN एकोम्मुनिटी लोएस्च्स्तोप
+lang collaboration en_GB eCommunity delete-stop
+lang collaboration hi_IN एकोम्मुनिटी लोएस्च्स्तोप
+show 0
+type courses/facetview.php
+access_foyer 63
+access_course 0
+show_order 2
+apply
+
+#MODUL: Info
+name Info
+modul courses/courseinfo.php
+lang learning en_GB Info
+lang learning hi_IN इन्फो
+lang collaboration en_GB Info
+lang collaboration hi_IN इन्फो
+show 2
+type announcement/announcement.php
+access_foyer 63
+access_course 63
+show_order 2
+apply
+
+#MODUL: eCommunity organisieren
+name eCommunity organisieren
+modul courses/settingsecom.php
+lang learning en_GB Manage eCommunity
+lang learning hi_IN एकोम्मुनिटी ओर्गानिसिएरें
+lang collaboration en_GB Manage eCommunity
+lang collaboration hi_IN एकोम्मुनिटी ओर्गानिसिएरें
+show 0
+type courses/facetview.php
+access_foyer 63
+access_course 0
+show_order 3
+apply
diff --git a/web/courses/Kursorganisation.mkf b/web/courses/Kursorganisation.mkf
dissimilarity index 61%
index e73db88..039ec0c 100644
--- a/web/courses/Kursorganisation.mkf
+++ b/web/courses/Kursorganisation.mkf
@@ -1,213 +1,189 @@
-Info eStudy-Makefile
-
-##Automatisch generierte Datei
-##Tool: .mkf-Export V1.2
-##File: Kursorganisation.mkf
-##Date: 10.06.2011
-##Modulgruppe: Kursorganisation
-
-
-#Modulgruppe
-define Kursorganisation:course_admin:0
-
-#MODUL: Organisation
-name Organisation
-modul courses/settings.php
-lang en_GB Course/eCom organising
-lang hi_IN कुर्स/एकाम ओर्गानिसिएरें
-lang en_GB Course/eCom organising
-lang hi_IN कुर्स/एकाम ओर्गानिसिएरें
-lang en_GB Course/eCom organising
-lang hi_IN कुर्स/एकाम ओर्गानिसिएरें
-show 2
-type top:-3
-access_foyer 0
-access_course 6
-show_order 3
-apply
-
-#MODUL: Kursplanung
-name Kursplanung
-modul courses/courseannouncement.php
-show 3
-type top:-3
-access_foyer 6
-access_course 6
-show_order 7
-apply
-
-#MODUL: Kurs archivieren
-name Kurs archivieren
-modul courses/coursearchive.php
-lang en_GB Course archive
-lang hi_IN कुर्स अर्चिविएरें
-lang en_GB Course archive
-lang hi_IN कुर्स अर्चिविएरें
-lang en_GB Course archive
-lang hi_IN कुर्स अर्चिविएरें
-show 0
-type courses/settings.php
-access_foyer 3
-access_course 3
-show_order 
-apply
-
-#MODUL: Teilnahmevereinbarung
-name Teilnahmevereinbarung
-modul courses/policy.php
-lang en_GB Policy
-lang hi_IN पॉलिसी
-lang en_GB Policy
-lang hi_IN पॉलिसी
-lang en_GB Policy
-lang hi_IN पॉलिसी
-show 0
-type courses/settings.php
-access_foyer 63
-access_course 63
-show_order 
-apply
-
-#MODUL: Kurs-FAQ
-name Kurs-FAQ
-modul courses/faq.php
-lang en_GB Course-FAQ
-lang hi_IN कुर्स-फक
-lang en_GB Course-FAQ
-lang hi_IN कुर्स-फक
-lang en_GB Course-FAQ
-lang hi_IN कुर्स-फक
-show 0
-type courses/settings.php
-access_foyer 63
-access_course 63
-show_order 
-apply
-
-#MODUL: Benutzergruppen
-name Benutzergruppen
-modul courses/groupoverview.php
-lang en_GB Group overview
-lang hi_IN ग़्रुप्पेनुएबेर्सिच्त
-lang en_GB Group overview
-lang hi_IN ग़्रुप्पेनुएबेर्सिच्त
-lang en_GB Group overview
-lang hi_IN ग़्रुप्पेनुएबेर्सिच्त
-show 0
-type user/memberlist.php
-access_foyer 0
-access_course 0
-show_order 
-apply
-
-#MODUL: Mitgliederliste
-name Mitgliederliste
-modul user/userlistexport.php
-lang en_GB Memberlist
-lang hi_IN ंइत्ग्लिएदेर्लिस्ते
-lang en_GB Memberlist
-lang hi_IN ंइत्ग्लिएदेर्लिस्ते
-lang en_GB Memberlist
-lang hi_IN ंइत्ग्लिएदेर्लिस्ते
-show 3
-type user/memberlist.php
-access_foyer 0
-access_course 6
-show_order 1
-apply
-
-#MODUL: Menü-Links
-name Men&uuml;-Links
-modul courses/externallinks.php
-lang en_GB Menu-Links
-lang hi_IN मेनुए-लिंक्स
-lang en_GB Menu-Links
-lang hi_IN मेनुए-लिंक्स
-lang en_GB Menu-Links
-lang hi_IN मेनुए-लिंक्स
-show 2
-type externaltools/externaltool.admin.php
-access_foyer 0
-access_course 2
-show_order 2
-apply
-
-#MODUL: Vereinbarung
-name Vereinbarung
-modul courses/policyadmin.php
-lang en_GB Course-Policy
-lang hi_IN कुर्स-पॉलिसी
-lang en_GB Course-Policy
-lang hi_IN कुर्स-पॉलिसी
-lang en_GB Course-Policy
-lang hi_IN कुर्स-पॉलिसी
-show 2
-type courses/settings.php
-access_foyer 0
-access_course 2
-show_order 5
-apply
-
-#MODUL: Notenliste
-name Notenliste
-modul user/notenliste.php
-lang en_GB Note export
-lang hi_IN नोतेनेक्स्पोर्ट
-lang en_GB Note export
-lang hi_IN नोतेनेक्स्पोर्ट
-lang en_GB Note export
-lang hi_IN नोतेनेक्स्पोर्ट
-show 2
-type courses/settings.php
-access_foyer 0
-access_course 2
-show_order 6
-apply
-
-#MODUL: Module aktivieren
-name Module aktivieren
-modul courses/modulegroupConfig.php
-lang en_GB Activate module
-lang hi_IN मॉड्यूल अक्तिविएरें
-lang en_GB Activate module
-lang hi_IN मॉड्यूल अक्तिविएरें
-lang en_GB Activate module
-lang hi_IN मॉड्यूल अक्तिविएरें
-show 2
-type courses/settings.php
-access_foyer 0
-access_course 0
-show_order 7
-apply
-
-#MODUL: Aktivitätsindikator
-name Aktivit&auml;tsindikator
-modul statistics/editindikator.php
-lang en_GB Activity indicator
-lang hi_IN अक्तिवितेत्सिंदिकाटर
-lang en_GB Activity indicator
-lang hi_IN अक्तिवितेत्सिंदिकाटर
-lang en_GB Activity indicator
-lang hi_IN अक्तिवितेत्सिंदिकाटर
-show 2
-type courses/settings.php
-access_foyer 0
-access_course 0
-show_order 8
-apply
-
-#MODUL: Benutzerrechte
-name Benutzerrechte
-modul courses/groupassignment.php
-lang en_GB Usergroups
-lang hi_IN बेनुत्ज़र्ग्रुप्पें
-lang en_GB Usergroups
-lang hi_IN बेनुत्ज़र्ग्रुप्पें
-lang en_GB Usergroups
-lang hi_IN बेनुत्ज़र्ग्रुप्पें
-show 2
-type courses/settings.php
-access_foyer 0
-access_course 0
-show_order 9
-apply
+Info eStudy-Makefile
+
+##Automatisch generierte Datei
+##Tool: .mkf-Export V1.2
+##File: Kursorganisation.mkf
+##Date: 10.06.2011
+##Modulgruppe: Kursorganisation
+
+
+#Modulgruppe
+define Kursorganisation:course_admin:0
+
+#MODUL: Organisation
+name Organisation
+modul courses/settings.php
+lang learning en_GB Course/eCom organising
+lang learning hi_IN कुर्स/एकाम ओर्गानिसिएरें
+lang collaboration en_GB Course/eCom organising
+lang collaboration hi_IN कुर्स/एकाम ओर्गानिसिएरें
+show 2
+type top:-3
+access_foyer 0
+access_course 6
+show_order 4
+apply
+
+#MODUL: Menü-Links
+name Menü-Links
+modul courses/externallinks.php
+lang learning en_GB Menu-Links
+lang learning hi_IN मेनुए-लिंक्स
+lang collaboration en_GB Menu-Links
+lang collaboration hi_IN मेनुए-लिंक्स
+show 2
+type top:-3
+access_foyer 0
+access_course 2
+show_order 5
+apply
+
+#MODUL: Kurs archivieren
+name Kurs archivieren
+modul courses/coursearchive.php
+lang learning en_GB Course archive
+lang learning hi_IN कुर्स अर्चिविएरें
+lang collaboration en_GB Course archive
+lang collaboration hi_IN कुर्स अर्चिविएरें
+show 0
+type courses/settings.php
+access_foyer 7
+access_course 7
+show_order 
+apply
+
+#MODUL: Teilnahmevereinbarung
+name Teilnahmevereinbarung
+modul courses/policy.php
+lang learning en_GB Policy
+lang learning hi_IN पॉलिसी
+lang collaboration en_GB Policy
+lang collaboration hi_IN पॉलिसी
+show 0
+type courses/settings.php
+access_foyer 63
+access_course 63
+show_order 
+apply
+
+#MODUL: Kurs-FAQ
+name Kurs-FAQ
+modul courses/faq.php
+lang learning en_GB Course-FAQ
+lang learning hi_IN कुर्स-फक
+lang collaboration en_GB Course-FAQ
+lang collaboration hi_IN कुर्स-फक
+show 0
+type courses/settings.php
+access_foyer 63
+access_course 63
+show_order 
+apply
+
+#MODUL: Benutzergruppen
+name Benutzergruppen
+modul courses/groupoverview.php
+lang learning en_GB Group overview
+lang learning hi_IN ग़्रुप्पेनुएबेर्सिच्त
+lang collaboration en_GB Group overview
+lang collaboration hi_IN ग़्रुप्पेनुएबेर्सिच्त
+show 0
+type user/memberlist.php
+access_foyer 0
+access_course 0
+show_order 
+apply
+
+#MODUL: In Planung
+name In Planung
+modul courses/courseannouncement.php
+show 1
+type courses/facetview.php
+access_foyer 0
+access_course 0
+show_order 1
+apply
+
+#MODUL: Mitgliederliste
+name Mitgliederliste
+modul user/userlistexport.php
+lang learning en_GB Memberlist
+lang learning hi_IN ंइत्ग्लिएदेर्लिस्ते
+lang collaboration en_GB Memberlist
+lang collaboration hi_IN ंइत्ग्लिएदेर्लिस्ते
+show 3
+type user/memberlist.php
+access_foyer 0
+access_course 6
+show_order 1
+apply
+
+#MODUL: Vereinbarung
+name Vereinbarung
+modul courses/policyadmin.php
+lang learning en_GB Course-Policy
+lang learning hi_IN कुर्स-पॉलिसी
+lang collaboration en_GB Course-Policy
+lang collaboration hi_IN कुर्स-पॉलिसी
+show 2
+type courses/settings.php
+access_foyer 0
+access_course 2
+show_order 4
+apply
+
+#MODUL: Notenliste
+name Notenliste
+modul user/notenliste.php
+lang learning en_GB Note export
+lang learning hi_IN नोतेनेक्स्पोर्ट
+lang collaboration en_GB Note export
+lang collaboration hi_IN नोतेनेक्स्पोर्ट
+show 2
+type courses/settings.php
+access_foyer 0
+access_course 0
+show_order 5
+apply
+
+#MODUL: Module aktivieren
+name Module aktivieren
+modul courses/modulegroupConfig.php
+lang learning en_GB Activate module
+lang learning hi_IN मॉड्यूल अक्तिविएरें
+lang collaboration en_GB Activate module
+lang collaboration hi_IN मॉड्यूल अक्तिविएरें
+show 2
+type courses/settings.php
+access_foyer 0
+access_course 0
+show_order 6
+apply
+
+#MODUL: Aktivitätsindikator
+name Aktivit&auml;tsindikator
+modul statistics/editindikator.php
+lang learning en_GB Activity indicator
+lang learning hi_IN अक्तिवितेत्सिंदिकाटर
+lang collaboration en_GB Activity indicator
+lang collaboration hi_IN अक्तिवितेत्सिंदिकाटर
+show 2
+type courses/settings.php
+access_foyer 0
+access_course 0
+show_order 7
+apply
+
+#MODUL: Benutzerrechte
+name Benutzerrechte
+modul courses/groupassignment.php
+lang learning en_GB Usergroups
+lang learning hi_IN बेनुत्ज़र्ग्रुप्पें
+lang collaboration en_GB Usergroups
+lang collaboration hi_IN बेनुत्ज़र्ग्रुप्पें
+show 2
+type courses/settings.php
+access_foyer 0
+access_course 0
+show_order 8
+apply
diff --git a/web/externaltools/Tools.mkf b/web/externaltools/Tools.mkf
dissimilarity index 70%
index 7bb1222..39c13bc 100644
--- a/web/externaltools/Tools.mkf
+++ b/web/externaltools/Tools.mkf
@@ -1,83 +1,43 @@
-Info eStudy-Makefile
-
-##Automatisch generierte Datei
-##Tool: .mkf-Export V1.2
-##File: Tools.mkf
-##Date: 20.05.2010
-##Modulgruppe: Tools
-
-
-#Modulgruppe
-define Tools:externaltools:0
-
-sql externaltools/external_tools.sql
-sql eyeos/eyeos.sql
-sql emoderation/emoderation.sql
-
-#MODUL: Tool-Konfiguration
-name Tool-Konfiguration
-modul externaltools/externaltool.admin.php
-lang en_GB Manage tools
-lang hi_IN टूल्स वेर्वाल्तें
-lang en_GB Manage tools
-lang hi_IN टूल्स वेर्वाल्तें
-lang en_GB Manage tools
-lang hi_IN टूल्स वेर्वाल्तें
-show 3
-type top:-3
-access_foyer 0
-access_course 2
-show_order 5
-apply
-
-#MODUL: Tools
-name Tools
-modul externaltools/externaltools.php
-lang en_GB Tools
-lang hi_IN टूल्स
-lang en_GB Tools
-lang hi_IN टूल्स
-lang en_GB Tools
-lang hi_IN टूल्स
-show 2
-type top:-1
-access_foyer 0
-access_course 63
-show_order 8
-apply
-
-#MODUL: eyeOS-Einstellungen
-name eyeOS-Einstellungen
-modul eyeos/eyeosserver.php
-show 1
-type externaltools/externaltool.admin.php
-access_foyer 0
-access_course 0
-show_order 1
-apply
-
-#MODUL: eModeration
-name eModeration
-modul emoderation/index.php
-lang en_GB eModeration
-lang hi_IN एमोदेरेशन
-lang en_GB eModeration
-lang hi_IN एमोदेरेशन
-lang en_GB eModeration
-lang hi_IN एमोदेरेशन
-show 2
-type externaltools/externaltools.php
-access_foyer 0
-access_course 63
-show_order 2
-apply
-
-#MODUL: eyeOS-Konten
-name eyeOS-Konten
-modul eyeos/eyeosadmin.php
-show 1
-type admin/waitinglist.php
-access_foyer 0
-access_course 0
-show_order 3
-apply
+Info eStudy-Makefile
+
+##Automatisch generierte Datei
+##Tool: .mkf-Export V1.2
+##File: Tools.mkf
+##Date: 20.05.2010
+##Modulgruppe: Tools
+
+
+#Modulgruppe
+define Tools:externaltools:0
+
+sql externaltools/external_tools.sql
+sql eyeos/eyeos.sql
+sql emoderation/emoderation.sql
+
+#MODUL: Tools
+name Tools
+modul externaltools/externaltools.php
+lang learning en_GB Tools
+lang learning hi_IN टूल्स
+lang collaboration en_GB Tools
+lang collaboration hi_IN टूल्स
+show 0
+type top:-1
+access_foyer 0
+access_course 63
+show_order 
+apply
+
+#MODUL: Tool-Einstellungen
+name Tool-Einstellungen
+modul externaltools/externaltool.admin.php
+lang learning en_GB Manage tools
+lang learning hi_IN टूल्स वेर्वाल्तें
+lang collaboration en_GB Manage tools
+lang collaboration hi_IN टूल्स वेर्वाल्तें
+show 3
+type ...
 
[truncated message content]