Added ie workarround check

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13324 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php
index f9b72d1bfefb7fee38ac67ad415e5cd21bafa23c..bb1300725bc630371611d334ba9213aa5d0af998 100644 (file)
--- a/gosa-core/html/helpviewer.php
+++ b/gosa-core/html/helpviewer.php
@@ -116,6 +116,7 @@ if(session::global_is_set('current_class_for_help')){
   if($helpdir == ""){
     
     $smarty->assign("help_contents","<br><h2>"._("There is no helpfile specified for this class"))."</h2>";
+    $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround", FALSE));
     $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
     $display= (  $header.$smarty->fetch(get_template_path('help.tpl')));
     echo $display;

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 137235b68078fa09ba91fff2a92d20561e42047e..d66647ea36dc69bd50cf649ca2c33886786afa69 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -90,6 +90,7 @@ function displayLogin()
     $smarty->assign("php_errors", "");
   }
   $smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+  $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround", FALSE));
   $smarty->display (get_template_path('headers.tpl'));
   $smarty->assign("version",get_gosa_version());
   $smarty->display(get_template_path('login.tpl'));

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index fd4bb903d6837425950dfe4e871a23452720dcc4..d5ef67d4af9902a5d05488eed40293c94df3ec84 100644 (file)
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -80,6 +80,7 @@ if (isset($_GET['request'])){
   if (isset($config) && $config->get_cfg_value("htaccessAuthentication") == "true"){
 
     /* Else notice that the user has to close the browser... */
+    $smarty->assign("iePngWorkaround", FALSE);
     $smarty->display (get_template_path('headers.tpl'));
     $smarty->display (get_template_path('logout-close.tpl'));
     exit;

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index ed2b4ffa333a8d4f00d7ec40262f22ccde52324b..10a11b05ca05136962f00da53665877cd35e00bc 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -303,6 +303,7 @@ $plist->gen_menu();
 $smarty->assign ("menu", $plist->menu);
 $smarty->assign ("plug", "$plug");
 
+$smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround", FALSE));
 $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
 
 /* React on clicks */

diff --git a/gosa-core/ihtml/themes/default/headers.tpl b/gosa-core/ihtml/themes/default/headers.tpl
index b52a00abf1661071236d0911522f5ef553699e1c..d21dea2a8408d09a4aee14ef95820ee4ab2026e9 100644 (file)
--- a/gosa-core/ihtml/themes/default/headers.tpl
+++ b/gosa-core/ihtml/themes/default/headers.tpl
@@ -20,7 +20,9 @@
   <link rel="shortcut icon" href="favicon.ico">
 
   <script language="javascript" src="include/events.js" type="text/javascript"></script>
+{if $iePngWorkaround}
   <script language="javascript" src="include/png.js" type="text/javascript"></script>
+{/if}
   <script language="javascript" src="include/calendar.js" type="text/javascript"></script>
   <script language="javascript" src="include/focus.js" type="text/javascript"></script>
   <script language="javascript" src="include/warning.js" type="text/javascript"></script>