Fixes

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 74ae70170038a34d2a51d9d9df6528997939b307..725fbdf93f7923dc1805bfd51c62df4442ffb565 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -485,9 +485,18 @@ class environment extends plugin
     if($this->acl != "#none#"){
       $smarty->assign("useProfileACL","");
     }else{
-      $smarty->assign("gotoProfileFlagsACL"," disabled ");
+      $smarty->assign("gotoProfileFlag_CACL"," disabled ");
+      $smarty->assign("gotoProfileServerACL"," disabled ");
+    }
+
+    if(!$this->useProfile){
+      $smarty->assign("gotoProfileFlag_CACL"," disabled ");
       $smarty->assign("gotoProfileServerACL"," disabled ");
     }
+
+
+
+
     /* Als smarty vars are set. Get smarty template and generate output */
     $display.= $smarty->fetch(get_template_path('environment.tpl', TRUE,dirname(__FILE__)));
     
@@ -711,8 +720,6 @@ class environment extends plugin
       }
     }
   
-    plugin::save();
-
     if(isset($this->attrs['gotoPrinter'])){
       unset($this->attrs['gotoPrinter']);
     }
@@ -773,7 +780,6 @@ class environment extends plugin
       }
     }
 
-
     $ldap->cat ($this->dn);
     if ($ldap->fetch()){
       $mode= "modify";

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index ce678dc12b0b2b03bdda533b62d0e4709ad9cc1b..467120c77d4a417aec08fe5b2c608d0e3b196a7d 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -38,7 +38,7 @@
                                                                        {t}Use local caching{/t}
                                                                </td>
                                                                <td>
-                                                                       <input type="checkbox" name="gotoProfileFlag_C" value="C" id="gotoProfileFlag_C" {$gotoProfileFlagsACL} {$gotoProfileFlag_CCHK}>
+                                                                       <input type="checkbox" name="gotoProfileFlag_C" value="C" id="gotoProfileFlag_C" {$gotoProfileFlag_CACL} {$gotoProfileFlag_CCHK}>
                                                                </td>
                                                        </tr>
                                                </table>