Updated terminal startup

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

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 596cf2bafe009d239bcc8429f4c0a6ca0ea5b3b1..d5894c839b4ad70c76dade0bf138e2b71928c4e2 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -151,12 +151,18 @@ class termstartup extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Do we need to flip is_account state? */
     if (isset($_POST['modify_state'])){
-      $this->is_account= !$this->is_account;
+
+      /* Only change account state if allowed */
+      if($this->is_account && $this->acl == "#all#"){
+        $this->is_account= !$this->is_account;
+      }elseif(!$this->is_account && chkacl($this->acl,"create") == ""){
+        $this->is_account= !$this->is_account;
+      }
     }
 
     /* Do we represent a valid terminal? */
@@ -195,7 +201,7 @@ class termstartup extends plugin
     /* if $_POST['gotoShareAdd'] is set, we will try to add a new entry
      * This entry will be, a combination of mountPoint and sharedefinitions
      */
-    if(isset($_POST['gotoShareAdd'])){
+    if(isset($_POST['gotoShareAdd']) && chkacl($this->acl,"gotoShare") == ""){
       /* We assign a share to this user, if we don't know where to mount the share */
       if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
         print_red(_("You must specify a valid mount point."));
@@ -211,7 +217,7 @@ class termstartup extends plugin
     /* if the Post  gotoShareDel is set, someone asked GOsa to delete the selected entry (if there is one selected)
      * If there is no defined share selected, we will abort the deletion without any message
      */
-    if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare']))){
+    if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare'])) && chkacl($this->acl,"gotoShare") == ""){
       unset($this->gotoShares[$_POST['gotoShare']]);
     }
 
@@ -242,6 +248,10 @@ class termstartup extends plugin
         $use = " checked ";
       };
 
+      if(chkacl($this->acl,"gotoLdapServer") == ""){
+        $use.= " disabled ";
+      }
+
       $SelectBoxLdapServer->AddEntry(
           array(
             array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",

diff --git a/plugins/admin/systems/terminalStartup.tpl b/plugins/admin/systems/terminalStartup.tpl
index 6a5d38f02a7c53a1d14f2930071dcff0a50b4083..55f7de1555b4acff78af0b6cba2e784243c7b169 100644 (file)
--- a/plugins/admin/systems/terminalStartup.tpl
+++ b/plugins/admin/systems/terminalStartup.tpl
@@ -52,7 +52,7 @@
    <h2>
     <img class="center" alt="" align="middle" src="images/hardware.png"> {t}Kernel modules (format: name parameters){/t}
    </h2>
-    <select style="width:100%;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}">
+    <select style="width:100%;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}" {$gotoModulesACL}>
      {html_options values=$gotoModules output=$gotoModules}
         <option disabled>&nbsp;</option>
     </select>