Updated environment, profile/checkboxes

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 0b8b3f3a3f588f283ffc0011bb8b85ac57bba237..6762c88ca328ddde77fd624313192de57fba1ac7 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -330,6 +330,15 @@ class environment extends plugin
         $smarty->assign($s_attr."ACL"," disabled ");
       }
     }
+
+    if(empty($this->useProfile)){
+      $smarty->assign("gotoProfileACL","disabled");
+      $smarty->assign("useProfileCHK","");
+    }else{
+      $smarty->assign("gotoProfileACL","");
+      $smarty->assign("useProfileCHK"," checked ");
+    }
+
  
     $smarty->assign("useProfileACL","");
     if($this->acl != "#none#"){
@@ -359,14 +368,6 @@ class environment extends plugin
       $smarty->assign("gotoProfileFlag_CCHK"," checked ");
     }
 
-    if(empty($this->useProfile)){
-      $smarty->assign("gotoProfileACL","disabled"); 
-      $smarty->assign("useProfileCHK",""); 
-    }else{
-      $smarty->assign("gotoProfileACL",""); 
-      $smarty->assign("useProfileCHK"," checked "); 
-    }
-
     $this->gotoXResolutions = array("640x480","800x600","1024x768","1280x768","1280x1024");
 
     $smarty->assign("gotoXResolutions",$this->gotoXResolutions);
@@ -684,9 +685,9 @@ class environment extends plugin
  
     if(isset($_POST['iamposted'])){
       if(isset($_POST['useProfile'])){
-        $this->useProfile = $_POST['useProfile'];
-      }else{
         $this->useProfile = true;
+      }else{
+        $this->useProfile = false;
       }
       if(isset($_POST['gotoProfileFlag_C'])){
         $this->gotoProfileFlag_C = $_POST['gotoProfileFlag_C'];

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 05f3986c455b346c30b105f81af83d3ba1e4f132..26c383d997d6b5b46f92a04c569b4c8ea0d0d314 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -37,8 +37,8 @@
                                                        </tr>
                                                        <tr>
                                                                <td colspan=2>  
-                                                                       <input class="center" type="checkbox" name="gotoProfileFlag_C" value="C" 
-                                                                               id="gotoProfileFlag_C" {$gotoProfileFlagsACL}>&nbsp;
+                                                                       <input class="center" type="checkbox" name="gotoProfileFlag_C" value="C" {$gotoProfileFlag_CCHK}
+                                                                               id="gotoProfileFlag_C" {$gotoProfileFlag_CACL}>&nbsp;
                                                                        <label for="gotoProfileFlag_C">{t}Cache profile localy{/t}</label>
                                                                </td>
                                                        </tr>