X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=4b30c443e80531d05dfefd003acdaa04ddeb87e7;hb=ecabf2056dc1350d73115d5fa226676be30017d6;hp=35b521d49017d7f58a3f8469f8eff43db334b6b1;hpb=97e61ff93f8965e4cd5ccfc625942812777687af;p=gosa.git diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index 35b521d49..4b30c443e 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -8,12 +8,13 @@ class termstartup extends plugin /* Generic terminal attributes */ var $bootmode= "G"; - var $goLdapServerList= array("default"); - var $gotoBootKernel= "default"; + var $goLdapServerList= array(); + var $gotoBootKernel= "default-inherit"; var $gotoKernelParameters= ""; var $gotoLdapServer= ""; var $gotoModules= array(); var $gotoTerminalPath= ""; + var $gotoBootKernels= array(); /* Share */ var $gotoShares = array();// Currently Share Option @@ -31,9 +32,11 @@ 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-inherit"=>"["._("inherited")."]"); /* Get arrays */ foreach (array("gotoModules") as $val){ @@ -81,12 +84,71 @@ class termstartup extends plugin $this->gotoAvailableShares= $config->getShareList(false); $this->orig_dn= $this->dn; + + /* Get list of boot kernels */ + if (isset($this->config->data['TABS'])){ + $command= search_config($this->config->data['TABS'], get_class($this), "KERNELS"); + + if (!check_command($command)){ + $message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command, + get_class($this)); + } else { + $fh= popen($command, "r"); + while (!feof($fh)) { + $buffer= trim(fgets($fh, 256)); + + if(!empty($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); + } + + } + $tmp = $this->config->data['SERVERS']['LDAP']; + foreach($tmp as $server){ + $visible = $server; + if($server == "default-inherit"){ + $visible = "["._("inherited")."]"; + } + $this->goLdapServerList[$server] = $visible; + } + + /* Load hardware list */ + $ldap= $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))"); + if ($ldap->count() == 1){ + $map= array("gotoLdapServer"); + $attrs= $ldap->fetch(); + + foreach ($map as $name){ + if (!isset($attrs[$name][0])){ + continue; + } + + switch ($name){ + case 'gotoLdapServer': + $this->goLdapServerList= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList); + break; + } + } + } } 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'])){ @@ -102,14 +164,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']); } } @@ -117,6 +179,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 @@ -124,11 +192,12 @@ class termstartup extends plugin */ $smarty->assign("gotoShareSelections", $this->gotoShareSelections); $smarty->assign("gotoShareSelectionKeys", array_flip($this->gotoShareSelections)); + $smarty->assign("gotoBootKernels",$this->gotoBootKernels); /* 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.")); @@ -144,16 +213,13 @@ 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']]); } $smarty->assign("gotoShares",$this->printOutAssignedShares()); $smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares())); - /* Arrays */ - $tmp = $this->config->data['SERVERS']['LDAP']; - /* Create divSelectBox for ldap server selection */ $SelectBoxLdapServer = new divSelectBox("LdapServer"); @@ -163,7 +229,7 @@ class termstartup extends plugin * or given entry is no longer available ... */ $found = false; - foreach($tmp as $server){ + foreach($this->goLdapServerList as $server => $name){ if($this->gotoLdapServer==$server){ $found = true; } @@ -171,7 +237,7 @@ class termstartup extends plugin /* Add Entries */ - foreach($tmp as $server){ + foreach($this->goLdapServerList as $server => $visible){ $use =""; if(($this->gotoLdapServer == $server) || ($found == false)) { $found = true; @@ -180,15 +246,14 @@ class termstartup extends plugin $SelectBoxLdapServer->AddEntry( array( - array("string"=>$server), array("string"=>"", - "attach"=>"style='border-right:0px;'") + "attach"=>"style='border-left:0px;'"), + array("string"=>$visible) )); } $smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList()); - $smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL")); foreach (array("gotoModules" ) as $val){ $smarty->assign("$val", $this->$val); } @@ -196,7 +261,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 */ @@ -216,18 +280,15 @@ 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"); + } } @@ -237,12 +298,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"]; } } @@ -254,7 +315,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 ',' */ @@ -267,7 +328,7 @@ class termstartup extends plugin $tmp= preg_replace ("/^[^,]+,/", "", $tmp); $ldap->cat("cn=default,ou=terminals,ou=systems,$tmp". - $this->config->current['BASE']); + $this->config->current['BASE'], array('gotoTerminalPath')); $attrs= $ldap->fetch(); if (isset($attrs['gotoTerminalPath'])){ $this->gotoTerminalPath= $attrs['gotoTerminalPath'][0]; @@ -312,8 +373,10 @@ class termstartup extends plugin } /* Strip out 'default' values */ - if ($this->attrs['gotoLdapServer'] == "default"){ - unset ($this->attrs['gotoLdapServer']); + foreach(array("gotoBootKernel","gotoLdapServer") as $value){ + if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){ + $this->attrs[$value] = array(); + } } /* prepare share settings */ @@ -329,9 +392,9 @@ class termstartup extends plugin $ldap= $this->config->get_ldap_link(); $ldap->cd($this->dn); $this->cleanup(); -$ldap->modify ($this->attrs); + $ldap->modify ($this->attrs); - show_ldap_error($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"); } @@ -372,6 +435,27 @@ $ldap->modify ($this->attrs); return($a_return); } + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plShortName" => _("Startup"), + "plDescription" => _("Terminal startup"), + "plSelfModify" => FALSE, + "plDepends" => array(), + "plPriority" => 5, + "plSection" => array("administration"), + "plCategory" => array("terminal"), + + "plProvidedAcls"=> array( + "gotoLdapServer" => _("Ldap server"), + "gotoShare" => _("Shares"), + "gotoModules" => _("Kernel modules"), + "gotoBootKernel" => _("Boot kernel"), + "gotoKernelParameters"=> _("Kernel parameter")) + )); + } + }