X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=dfae3014777783a594ef3e81bd8ba5dee3f04ce4;hb=7a6a428eb1c6534e448094d51bc6a542fe832bb9;hp=84c72ffb0cdca81346b7b3830114e68900073f6f;hpb=0734bb1d8d2df38a72edfef1a65e66c91a87b562;p=gosa.git diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index 84c72ffb0..dfae30147 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -9,7 +9,7 @@ class termstartup extends plugin /* Generic terminal attributes */ var $bootmode= "G"; var $goLdapServerList= array(); - var $gotoBootKernel= ""; + var $gotoBootKernel= "default-inherit"; var $gotoKernelParameters= ""; var $gotoLdapServer= ""; var $gotoModules= array(); @@ -24,7 +24,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,14 +32,15 @@ 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); + plugin::plugin ($config, $dn, $parent); - $this->gotoBootKernels = array("default"=>"["._("inherited")."]"); + $this->gotoBootKernels = array("default-inherit"=>"["._("inherited")."]"); /* Get arrays */ foreach (array("gotoModules") as $val){ + $this->$val = array(); if (isset($this->attrs["$val"]["count"])){ for ($i= 0; $i<$this->attrs["count"]; $i++){ if (isset($this->attrs["$val"][$i])){ @@ -95,9 +96,19 @@ 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; + } } } pclose($fh); @@ -107,7 +118,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; @@ -128,17 +139,21 @@ 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; } } } + + if($this->is_account){ + @log::log("view","terminal/".get_class($this),$this->dn); + } } 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'])){ @@ -154,14 +169,14 @@ class termstartup extends plugin /* Add module */ if (isset ($_POST['add_module'])){ - if ($_POST['module'] != "" && chkacl ($this->acl, "gotoModule") == ""){ + if ($_POST['module'] != "" && $this->acl_is_writeable("gotoMode")){ $this->add_list ($this->gotoModules, $_POST['module']); } } /* Delete module */ if (isset ($_POST['delete_module'])){ - if (count($_POST['modules_list']) && chkacl ($this->acl, "gotoModule") == ""){ + if (count($_POST['modules_list']) && $this->acl_is_writeable("gotoMode")){ $this->del_list ($this->gotoModules, $_POST['modules_list']); } } @@ -169,6 +184,12 @@ class termstartup extends plugin /* Show main page */ $smarty= get_smarty(); + /* Assign acls */ + $tmp = $this->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translation){ + $smarty->assign($name."ACL",$this->getacl($name)); + } + /* In this section server shares will be defined * A user can select one of the given shares and a mount point @@ -181,7 +202,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']) && $this->acl_is_writeable("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 +218,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'])) && $this->acl_is_writeable("gotoShare")){ unset($this->gotoShares[$_POST['gotoShare']]); } @@ -238,7 +259,6 @@ class termstartup extends plugin $smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList()); - $smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL")); foreach (array("gotoModules" ) as $val){ $smarty->assign("$val", $this->$val); } @@ -246,7 +266,6 @@ class termstartup extends plugin /* Values */ foreach(array("gotoBootKernel", "customParameters") as $val){ $smarty->assign($val, $this->$val); - $smarty->assign($val."ACL", chkacl($this->acl, $val)); } /* Radio button group */ @@ -266,18 +285,16 @@ class termstartup extends plugin $smarty->assign("debugbootup", ""); } - /* ACL's */ - foreach (array("gotoKernelParameters", "gotoModules") as $value){ - $smarty->assign($value."ACL", chkacl($this->acl, "$value")); - } - /* Show main page */ return($smarty->fetch (get_template_path('terminalStartup.tpl', TRUE))); } function remove_from_parent() { + if($this->acl_is_removeable()){ $this->handle_post_events("remove"); + @log::log("remove","terminal/".get_class($this),$this->dn,array_keys($this->attrs)); + } } @@ -287,12 +304,12 @@ class termstartup extends plugin plugin::save_object(); /* Save group radio buttons */ - if (chkacl ($this->acl, "bootmode") == "" && isset($_POST["bootmode"])){ + if ($this->acl_is_writeable("bootmode") && isset($_POST["bootmode"])){ $this->bootmode= $_POST["bootmode"]; } /* Save kernel parameters */ - if (chkacl ($this->acl, "gotoKernelParameters") == "" && isset($_POST["customParameters"])){ + if ($this->acl_is_writeable("gotoKernelParameters") && isset($_POST["customParameters"])){ $this->customParameters= $_POST["customParameters"]; } } @@ -304,7 +321,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 ',' */ @@ -358,12 +375,14 @@ class termstartup extends plugin $this->attrs["$val"]= array_unique($this->$val); } - if(!isset($this->attrs["$val"])) $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(); } } @@ -380,9 +399,12 @@ class termstartup extends plugin /* Write back to ldap */ $ldap= $this->config->get_ldap_link(); $ldap->cd($this->dn); + $this->cleanup(); $ldap->modify ($this->attrs); + @log::log("modify","terminal/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of system terminal/startup with dn '%s' failed."),$this->dn)); $this->handle_post_events("modify"); } @@ -432,12 +454,14 @@ class termstartup extends plugin "plDescription" => _("Terminal startup"), "plSelfModify" => FALSE, "plDepends" => array(), - "plPriority" => 0, + "plPriority" => 5, "plSection" => array("administration"), "plCategory" => array("terminal"), "plProvidedAcls"=> array( - "gotoLdapServer" => _("Ldap server"), + "gotoLdapServer" => _("Ldap server"), + "gotoShare" => _("Shares"), + "gotoModules" => _("Kernel modules"), "gotoBootKernel" => _("Boot kernel"), "gotoKernelParameters"=> _("Kernel parameter")) ));