From 7725be4b40da939480de0c0c8deaf14c2cc10a6f Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Fri, 27 Jan 2017 08:29:05 +0100
Subject: [PATCH] =?UTF-8?q?Option=20zum=20Ausblenden=20von=20Messages=20hi?=
 =?UTF-8?q?nzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/global.config-default.inc.php     |  3 +++
 content/fas.xul.php                      | 30 +++++++++++++++---------
 content/student/studentenoverlay.xul.php | 11 +++++++--
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 440d3c1a6..8b9402363 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -92,6 +92,9 @@ define('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN',false);
 //oder Prozentpunkte uebernommen werden true=Punkte, false=Prozentpunkte
 define('FAS_REIHUNGSTEST_PUNKTE', false);
 
+// Legt fest ob Messages im FAS angezeigt werden true|false
+define('FAS_MESSAGES',false);
+
 // Anzeigeoptionen für LV-Plan Menü
 define('CIS_LVPLAN_EXPORT_ANZEIGEN',true);
 define('CIS_LVPLAN_PERSONENAUSWAHL_ANZEIGEN',true);
diff --git a/content/fas.xul.php b/content/fas.xul.php
index dd63abf14..84b34a11d 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -20,6 +20,7 @@
  *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
  */
 require_once('../config/vilesci.config.inc.php');
+require_once('../config/global.config.inc.php');
 require_once('../include/functions.inc.php');
 require_once('../include/benutzerberechtigung.class.php');
 require_once('../include/studiensemester.class.php');
@@ -751,17 +752,24 @@ foreach($addon_obj->result as $addon)
                accesskey = "&menu-cis-notenliste.accesskey;"/>
           </menupopup>
     </menu>
-	<!-- ***** CIS ***** -->
-    <menu id="menu-messages" label="&menu-messages.label;" accesskey="&menu-messages.accesskey;">
-          <menupopup id="menu-messages-popup">
-            <menuitem
-               id        =  "menu-messages-new"
-               key       =  "menu-messages-new:key"
-               label     = "&menu-messages-new.label;"
-               command   =  "menu-messages-new:command"
-               accesskey = "&menu-messages-new.accesskey;"/>
-          </menupopup>
-    </menu>
+	<?php
+	if(!defined('FAS_MESSAGES') || FAS_MESSAGES==true)
+	{
+		?>
+		<!-- ***** Messages ***** -->
+	    <menu id="menu-messages" label="&menu-messages.label;" accesskey="&menu-messages.accesskey;">
+	          <menupopup id="menu-messages-popup">
+	            <menuitem
+	               id        =  "menu-messages-new"
+	               key       =  "menu-messages-new:key"
+	               label     = "&menu-messages-new.label;"
+	               command   =  "menu-messages-new:command"
+	               accesskey = "&menu-messages-new.accesskey;"/>
+	          </menupopup>
+	    </menu>
+		<?php
+	}
+	?>
     <!-- ***** Zusatzmenues inkludieren ***** -->
     <?php
     include('../include/'.EXT_FKT_PATH.'/fas_zusatzmenues.inc.php');
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index b0cdb78e2..ae8f7d1da 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -27,6 +27,7 @@ header("Pragma: no-cache");
 header("Content-type: application/vnd.mozilla.xul+xml");
 
 require_once('../../config/vilesci.config.inc.php');
+require_once('../../config/global.config.inc.php');
 require_once('../../include/functions.inc.php');
 require_once('../../include/benutzerberechtigung.class.php');
 
@@ -414,7 +415,10 @@ else
 								echo '<tab id="student-tab-anwesenheit" label="Anwesenheit" onclick="StudentAnwesenheitIFrameLoad();"/>';
                             ?>
 							<tab id="student-tab-aufnahmetermine" label="Aufnahme-Termine" onclick="StudentAufnahmeTermineIFrameLoad();"/>
-							<tab id="student-tab-messages" label="Messages" onclick="StudentMessagesIFrameLoad();"/>
+							<?php
+							if(!defined('FAS_MESSAGES') || FAS_MESSAGES==true)
+								echo '<tab id="student-tab-messages" label="Messages" onclick="StudentMessagesIFrameLoad();"/>';
+							?>
 
 						</tabs>
 						<tabpanels id="student-tabpanels-main" flex="1">
@@ -446,7 +450,10 @@ else
 								echo '<iframe id="student-anwesenheit" src="" style="margin-top:10px;" />';
                             ?>
 							<iframe id="student-aufnahmetermine" style="margin: 0px;" src="" />
-							<iframe id="student-messages" style="margin: 0px;" src="" />
+							<?php
+							if(!defined('FAS_MESSAGES') || FAS_MESSAGES==false)
+								echo '<iframe id="student-messages" style="margin: 0px;" src="" />';
+							?>
 						</tabpanels>
 					</tabbox>
 				</vbox>