Updated terminal tabs

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

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index cb446b8792d3873e996c9e2242871072d9a3f1c5..d2bc6690a78cfa1e1b1ee58961b86cc64c3df384 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -257,6 +257,7 @@ class termgeneric extends plugin
     /* Fill templating stuff */
     $smarty= get_smarty();
     $smarty->assign("cn", $this->cn);
+    $smarty->assign("cnACL", chkacl($this->acl,"cn"));
     $smarty->assign("staticAddress", "");
 
     $smarty->assign("bases", $this->config->idepartments);
@@ -358,7 +359,7 @@ class termgeneric extends plugin
       $this->gotoTerminalPath;
     }
   
-    if(isset($_POST['termgeneric_posted'])){
+    if(isset($_POST['termgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
       if(isset($_POST["inheritTimeServer"])){
         $this->inheritTimeServer = true;
       }else{

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index d5894c839b4ad70c76dade0bf138e2b71928c4e2..c63edb99d9c9f799520da60e524ca1a195057053 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -248,9 +248,7 @@ class termstartup extends plugin
         $use = " checked ";
       };
 
-      if(chkacl($this->acl,"gotoLdapServer") == ""){
-        $use.= " disabled ";
-      }
+      $use .= chkacl($this->acl,"gotoLdapServer");
 
       $SelectBoxLdapServer->AddEntry(
           array(

diff --git a/plugins/admin/systems/terminal.tpl b/plugins/admin/systems/terminal.tpl
index 4de4cc904ebb447675641465a256ae8709ef6cf6..e8444efa8cb3d35874ad4ed6a77b03c774a99666 100644 (file)
--- a/plugins/admin/systems/terminal.tpl
+++ b/plugins/admin/systems/terminal.tpl
@@ -9,7 +9,7 @@
      {else}
      <td><LABEL for="cn">{t}Terminal name{/t}</LABEL>{$must}</td>
      <td>
-      <input name="cn" id="cn" size=18 maxlength=60 value="{$cn}">
+      <input name="cn" id="cn" size=18 maxlength=60 value="{$cn}" {$cnACL}>
      </td>
      {/if}
     </tr>
@@ -77,7 +77,7 @@
        <table width="100%">
     <tr>
         <td colspan="2">
-               <input type="checkbox" value="1" name="inheritTimeServer"
+               <input type="checkbox" value="1" name="inheritTimeServer" {$gotoNtpServerACL}
                        {if $inheritTimeServer } checked {/if} 
                        onClick="javascript:
                                        changeState('gotoNtpServerSelected');