X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=f8f27fb61b229883ef5bdf23a57713e7ba306a9a;hb=14a1125842be8515bd8b8f7117081e00f40470b5;hp=7a02964f21b2b15e9cac8df5a262bdbd8d7a387f;hpb=b73b7ab43a1b732ccf81c6348bffbfe9b01eae76;p=gosa.git

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 7a02964f2..f8f27fb61 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -1,11 +1,6 @@
 <?php
 class termstartup extends plugin
 {
-  /* CLI vars */
-  var $cli_summary= "Manage terminal startup options";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* Generic terminal attributes */
   var $bootmode= "G";
   var $goLdapServerList= array();
@@ -24,7 +19,7 @@ class termstartup extends plugin
 
 
   /* attribute list for save action */
-  var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters");
+  var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters","gotoModules");
   var $objectclasses= array("GOhard");
 
   /* Helper */
@@ -32,21 +27,21 @@ class termstartup extends plugin
   var $orig_dn= "";
   var $ignore_account= TRUE;
 
-  function termstartup ($config, $dn= NULL)
+  function termstartup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
-
-    $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+    plugin::plugin ($config, $dn, $parent);
 
     /* Get arrays */
     foreach (array("gotoModules") as $val){
-      if (isset($this->attrs["$val"]["count"])){
-        for ($i= 0; $i<$this->attrs["count"]; $i++){
-          if (isset($this->attrs["$val"][$i])){
-            array_push($this->$val, $this->attrs["$val"][$i]);
+      $tmp =array();
+      if (isset($this->attrs[$val]["count"])){
+        for ($i= 0; $i<$this->attrs[$val]["count"]; $i++){
+          if (isset($this->attrs[$val][$i])){
+            $tmp[] = $this->attrs["$val"][$i];
           }
         }
       }
+      $this->$val = $tmp;
       sort ($this->$val);
       $this->$val= array_unique($this->$val);
     }
@@ -95,9 +90,22 @@ class termstartup extends plugin
       } else {
         $fh= popen($command, "r");
         while (!feof($fh)) {
-          $buffer= fgets($fh, 256);
+          $buffer= trim(fgets($fh, 256));
+
           if(!empty($buffer)){
-            $this->gotoBootKernels[]= $buffer;
+
+            $name=$value = $buffer;
+
+            if(preg_match("/:/",$buffer)){
+              $name = preg_replace("/:.*$/","",$buffer);
+              $value= preg_replace("/^.*:/","",$buffer);
+              $this->gotoBootKernels[$name]= $name.":".$value;
+            }else{
+              $this->gotoBootKernels[$name]= $value;
+            }
+            if(empty($this->gotoBootKernel)){
+              $this->gotoBootKernel = $name; 
+            }
           }
         }
         pclose($fh);
@@ -107,7 +115,7 @@ class termstartup extends plugin
     $tmp = $this->config->data['SERVERS']['LDAP'];  
     foreach($tmp as $server){
       $visible = $server;
-      if($server == "default"){
+      if($server == "default-inherit"){
         $visible = "["._("inherited")."]";
       }
       $this->goLdapServerList[$server] = $visible;
@@ -118,7 +126,7 @@ class termstartup extends plugin
     $ldap->cd($this->config->current['BASE']);
     $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
     if ($ldap->count() == 1){
-      $map= array("gotoLdapServer");
+      $map= array("gotoLdapServer","gotoBootKernel");
       $attrs= $ldap->fetch();
 
       foreach ($map as $name){
@@ -128,7 +136,10 @@ class termstartup extends plugin
 
         switch ($name){
           case 'gotoLdapServer':
-            $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+            $this->goLdapServerList= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+            break;
+          case 'gotoBootKernel':
+            $this->gotoBootKernels= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->gotoBootKernels);
             break;
         }
       }
@@ -137,12 +148,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? */
@@ -162,7 +179,7 @@ class termstartup extends plugin
     /* Delete module */
     if (isset ($_POST['delete_module'])){
       if (count($_POST['modules_list']) && chkacl ($this->acl, "gotoModule") == ""){
-        $this->del_list ($this->gotoModules, $_POST['modules_list']);
+        $this->gotoModules = $this->del_list($this->gotoModules, $_POST['modules_list']);
       }
     }
 
@@ -181,7 +198,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."));
@@ -197,7 +214,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']]);
     }
 
@@ -228,6 +245,8 @@ class termstartup extends plugin
         $use = " checked ";
       };
 
+      $use .= chkacl($this->acl,"gotoLdapServer");
+
       $SelectBoxLdapServer->AddEntry(
           array(
             array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
@@ -304,7 +323,7 @@ class termstartup extends plugin
     /* Find proper terminal path for tftp configuration
        FIXME: This is suboptimal when the default has changed to
        another location! */
-    if ($this->gotoTerminalPath == "default"){
+    if ($this->gotoTerminalPath == "default-inherit"){
       $ldap= $this->config->get_ldap_link();
 
       /* Strip relevant part from dn, keep trailing ',' */
@@ -357,13 +376,14 @@ class termstartup extends plugin
       if (isset ($this->$val) && count ($this->$val) != 0){
     
         $this->attrs["$val"]= array_unique($this->$val);
+      }else{
+        $this->attrs["$val"]=array();
       }
-      if(!isset($this->attrs["$val"])) $this->attrs["$val"]=array();
     }
 
     /* Strip out 'default' values */
     foreach(array("gotoBootKernel","gotoLdapServer") as $value){
-      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default"){
+      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){
         $this->attrs[$value] = array();
       } 
     }
@@ -399,7 +419,7 @@ class termstartup extends plugin
 
 
   /* Delete value to array, check if unique */
-  function del_list (&$array, $list)
+  function del_list ($array, $list)
   {
     $tmp= array();
     foreach ($array as $mod){
@@ -407,7 +427,7 @@ class termstartup extends plugin
         $tmp[]= $mod;
       }
     }
-    $array= $tmp;
+    return($tmp);
   }
 
    /* Generate ListBox frindly output for the defined shares