![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index e795803be3a6f25951d2470f68982f5e2d41bdcf..9185810d38a65fcafb6770e4e95d4660bed26c5e 100644 (file)
/* Generic terminal attributes */
var $bootmode= "G";
var $goLdapServerList= array();
- var $gotoBootKernel= "";
+ var $gotoBootKernel= "default-inherit";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
var $gotoTerminalPath= "";
var $gotoBootKernels= array();
+ /* Ldap server list */
+ var $gotoLdapServers = array();
+ var $gotoLdapServerList = array();
+ var $gotoLdap_inherit = FALSE;
+
/* Share */
var $gotoShares = array();// Currently Share Option
var $gotoShare = ""; // currently selected Share Option
/* attribute list for save action */
- var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters");
+ var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters","gotoModules");
var $objectclasses= array("GOhard");
+ var $view_logged = FALSE;
/* Helper */
var $customParameters= "";
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])){
/* Get list of boot kernels */
if (isset($this->config->data['TABS'])){
- $command= search_config($this->config->data['TABS'], get_class($this), "KERNELS");
+ $command= $this->config->search(get_class($this), "KERNELS",array('tabs'));
if (!check_command($command)){
$message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command,
} 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);
}
}
- $tmp = $this->config->data['SERVERS']['LDAP'];
- foreach($tmp as $server){
- $visible = $server;
- if($server == "default"){
- $visible = "["._("inherited")."]";
+
+ foreach($this->config->data['SERVERS']['LDAP'] as $server) {
+ $this->gotoLdapServerList[]= $server;
+ }
+ if(isset($this->attrs['gotoLdapServer'])){
+ unset($this->attrs['gotoLdapServer']['count']);
+ sort($this->attrs['gotoLdapServer']);
+ foreach($this->attrs['gotoLdapServer'] as $value){
+ $this->gotoLdapServers[] = preg_replace("/^[0-9]*:/","",$value);
}
- $this->goLdapServerList[$server] = $visible;
+ }
+ if(!count($this->gotoLdapServers)){
+ $this->gotoLdap_inherit = TRUE;
}
- /* Load hardware list */
+ /* Load hardware list */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
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;
}
}
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
+
+ if($this->is_account && !$this->view_logged){
+ $this->view_logged = TRUE;
+ new log("view","terminal/".get_class($this),$this->dn);
+ }
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
}
/* Do we represent a valid terminal? */
- if (!$this->is_account && $this->parent == NULL){
+ if (!$this->is_account && $this->parent === NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
_("This 'dn' has no terminal features.")."</b>";
return ($display);
/* 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']);
}
}
/* 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
/* 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."));
/* 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']]);
}
$SelectBoxLdapServer = new divSelectBox("LdapServer");
$SelectBoxLdapServer->SetHeight(80);
- /* Set first entry as selected, if $this->gotoLdapServer is empty
- * or given entry is no longer available ...
- */
- $found = false;
- foreach($this->goLdapServerList as $server => $name){
- if($this->gotoLdapServer==$server){
- $found = true;
+ /* Add new ldap server to the list */
+ if(!$this->gotoLdap_inherit && isset($_POST['add_ldap_server']) && isset($_POST['ldap_server_to_add'])){
+ if(isset($this->gotoLdapServerList[$_POST['ldap_server_to_add']])){
+ $to_add = $this->gotoLdapServerList[$_POST['ldap_server_to_add']];
+ if(!in_array($to_add,$this->gotoLdapServers)){
+ $this->gotoLdapServers[] = $to_add;
+ }
}
}
-
- /* Add Entries
+
+ /* Move ldap servers up and down */
+ if(!$this->gotoLdap_inherit){
+ foreach($_POST as $name => $value){
+ if(preg_match("/sort_ldap_up_/",$name)){
+ $id = preg_replace("/^sort_ldap_up_([0-9]*)_(x|y)$/","\\1",$name);
+ $from = $id;
+ $to = $id -1;
+ $tmp = $this->array_switch_item($this->gotoLdapServers,$from,$to);
+ if($tmp){
+ $this->gotoLdapServers = $tmp;
+ }
+ break;
+ }
+ if(preg_match("/sort_ldap_down_/",$name)){
+ $id = preg_replace("/^sort_ldap_down_([0-9]*)_(x|y)$/","\\1",$name);
+ $from = $id;
+ $to = $id +1;
+ $tmp = $this->array_switch_item($this->gotoLdapServers,$from,$to);
+ if($tmp){
+ $this->gotoLdapServers = $tmp;
+ }
+ break;
+ }
+ if(preg_match("/gotoLdapRemove_/",$name)){
+ $id = preg_replace("/^gotoLdapRemove_([0-9]*)_(x|y)$/","\\1",$name);
+ $value = $this->gotoLdapServers[$id];
+ $this->gotoLdapServers = array_remove_entries(array($value),$this->gotoLdapServers);
+ break;
+ }
+ }
+ }
+ /* Add Entries
*/
- foreach($this->goLdapServerList as $server => $visible){
- $use ="";
- if(($this->gotoLdapServer == $server) || ($found == false)) {
- $found = true;
- $use = " checked ";
- };
+ foreach($this->gotoLdapServers as $key => $server){
+ if(!in_array($server,$this->gotoLdapServerList)){
+ $server = $server." <font style='color:red'>(missing)</font>";
+ }
$SelectBoxLdapServer->AddEntry(
- array(
- array("string"=>$visible),
- array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
- "attach"=>"style='border-right:0px;'")
- ));
+ array(array("string" => $server),
+ array("string" =>
+ "<input class='center' type='image' src='images/sort_up.png' name='sort_ldap_up_".$key."'> ".
+ "<input class='center' type='image' src='images/sort_down.png' name='sort_ldap_down_".$key."'> ".
+ "<input class='center' type='image' src='images/edittrash.png' name='gotoLdapRemove_".$key."'>",
+ "attach" => "style='text-align:right;width:40px;border-right:0px;'")));
}
- $smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList());
+ if($this->gotoLdap_inherit){
+ $smarty->assign("gotoLdapServerACL_inherit", preg_replace("/w/","",$this->getacl("gotoLdapServer")));;
+ }else{
+ $smarty->assign("gotoLdapServerACL_inherit", $this->getacl("gotoLdapServer"));
+ }
+
+ $list = array();
+ foreach($this->gotoLdapServerList as $key => $entry){
+ if(!in_array($entry,$this->gotoLdapServers)){
+ $list[$key] = $entry;
+ }
+ }
+ $smarty->assign("gotoLdapServers", $SelectBoxLdapServer->DrawList());
+ $smarty->assign("gotoLdapServerList", $list);
+ $smarty->assign("gotoLdap_inherit", $this->gotoLdap_inherit);
+ $smarty->assign("JS", $_SESSION['js']);
- $smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL"));
foreach (array("gotoModules" ) as $val){
$smarty->assign("$val", $this->$val);
}
/* Values */
foreach(array("gotoBootKernel", "customParameters") as $val){
$smarty->assign($val, $this->$val);
- $smarty->assign($val."ACL", chkacl($this->acl, $val));
}
/* Radio button group */
$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");
+ new log("remove","terminal/".get_class($this),$this->dn,array_keys($this->attrs));
+ }
}
{
plugin::save_object();
- /* Save group radio buttons */
- if (chkacl ($this->acl, "bootmode") == "" && isset($_POST["bootmode"])){
- $this->bootmode= $_POST["bootmode"];
- }
+ if(isset($_POST['TerminalStarttabPosted'])){
+ if(isset($_POST['gotoLdap_inherit'])){
+ $this->gotoLdap_inherit = TRUE;
+ }else{
+ $this->gotoLdap_inherit = FALSE;
+ }
+
+ /* Save group radio buttons */
+ if ($this->acl_is_writeable("bootmode") && isset($_POST["bootmode"])){
+ $this->bootmode= $_POST["bootmode"];
+ }
- /* Save kernel parameters */
- if (chkacl ($this->acl, "gotoKernelParameters") == "" && isset($_POST["customParameters"])){
- $this->customParameters= $_POST["customParameters"];
+ /* Save kernel parameters */
+ if ($this->acl_is_writeable("gotoKernelParameters") && isset($_POST["customParameters"])){
+ $this->customParameters= $_POST["customParameters"];
+ }
}
}
/* 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 ',' */
}
}
}
-
+
/* Add semi automatic values */
// FIXME: LDAP Server may not be set here...
$this->gotoKernelParameters= "root=/dev/nfs nfsroot=".
$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();
+ }
+ }
+
+ /* Prepare list of ldap servers */
+ $this->attrs['gotoLdapServer'] = array();
+ if(!$this->gotoLdap_inherit){
+ $i = 0;
+ foreach($this->gotoLdapServers as $server){
+ $i ++;
+ $this->attrs['gotoLdapServer'][] = $i.":".$server;
+ }
}
/* Strip out 'default' values */
- foreach(array("gotoBootKernel","gotoLdapServer") as $value){
- if ($this->attrs[$value] == "default"){
+ foreach(array("gotoBootKernel") as $value){
+ if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){
$this->attrs[$value] = array();
}
}
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
+
$this->cleanup();
$ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error(), _("Saving terminal startup settings failed"));
+ new 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");
}
}
+ function PrepareForCopyPaste($source)
+ {
+ plugin::PrepareForCopyPaste($source);
+
+ $source_o = new termstartup ($this->config, $source['dn']);
+
+ foreach(array("gotoModules", "gotoKernelParameters","gotoShares","customParameters","bootmode","gotoTerminalPath","gotoShares","goLdapServerList","gotoBootKernel","gotoLdapServer","gotoBootKernels") as $attr){
+ $this->$attr = $source_o->$attr;
+ }
+ }
+
+
+ function array_switch_item($ar,$from,$to)
+ {
+ if(!is_array($ar)){
+ return(false);
+ }
+ if(!isset($ar[$from])){
+ return(false);
+ }
+ if(!isset($ar[$to])){
+ return(false);
+ }
+
+ $tmp = $ar[$from];
+ $ar[$from] = $ar[$to];
+ $ar[$to] = $tmp;
+ return($ar);
+ }
+
+
+ /* 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"))
+ ));
+ }
+
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: