Reverted Last commits, I've accidentally replaced to much.

[gosa.git] / gosa-plugins / goto / personal / environment / class_environment.inc

diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index eff161899b0b1e94d1072b7a4a76e9811f61dff2..237de00d999dc04883004984baf6ce0ed6ba3fde 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_environment.inc
+++ b/gosa-plugins/goto/personal/environment/class_environment.inc
@@ -219,8 +219,8 @@ class environment extends plugin
                                     "1280x768"  =>  "1280x768",
                                     "1280x1024" =>  "1280x1024");
 
-    if($this->config->get_cfg_value("resolutions") != ""){
-      $file = $this->config->get_cfg_value("resolutions");
+    if($this->config->get_cfg_value("core","resolutions") != ""){
+      $file = $this->config->get_cfg_value("core","resolutions");
 
       if(is_readable($file)){
         $str = file_get_contents($file);
@@ -301,7 +301,8 @@ class environment extends plugin
       }
     }
 
-    if($cnt && $this->config->search("environment","kioskpath",array('menu','tabs'))){
+    $tmp = $this->config->get_cfg_value("environment","kioskPath");
+    if($cnt && !empty($tmp)){
       $this->kiosk_enabled = TRUE;
     }
 
@@ -441,7 +442,7 @@ class environment extends plugin
       }
       /* Group Dialog with enabled environment options */
       if ($this->is_account){
-        $display= $this->show_enable_header(msgPool::removeFeaturesButton(_("Desktop")),
+        $display= $this->show_disable_header(msgPool::removeFeaturesButton(_("Desktop")),
             msgPool::featuresEnabled(_("Desktop")));
       } else {
 
@@ -481,7 +482,7 @@ class environment extends plugin
 
         // 3. Account enabled . Editing from adminmenu
         if ($this->is_account){
-          $display= $this->show_enable_header(msgPool::removeFeaturesButton(_("Desktop")),
+          $display= $this->show_disable_header(msgPool::removeFeaturesButton(_("Desktop")),
               msgPool::featuresEnabled(_("Desktop")));
         } else {