X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=cba2b395433bc77f11cea64347025aef3e68333f;hb=e1bf22f058266d04da312a6a12cc26fcda9bd930;hp=7fed88978a74f5d70bceef03da3af53a81243944;hpb=59a6f7f4d3be3ab0a4fe4000e755b8452076ad38;p=gosa.git
diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 7fed88978..cba2b3954 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -8,14 +8,20 @@ class termstartup extends plugin
/* Generic terminal attributes */
var $bootmode= "G";
- var $goLdapServerList= array("default");
- var $gotoBootKernel= "default";
+ var $goLdapServerList= array();
+ var $gotoBootKernel= "";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
- var $gotoAutoFs= array();
- var $gotoFilesystem= array();
var $gotoTerminalPath= "";
+ var $gotoBootKernels= array();
+
+ /* Share */
+ var $gotoShares = array();// Currently Share Option
+ var $gotoShare = ""; // currently selected Share Option
+ var $gotoShareSelections= array();// Available Shares for this account in Listbox format
+ var $gotoAvailableShares= array();// Available Shares for this account
+
/* attribute list for save action */
var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters");
@@ -24,14 +30,16 @@ class termstartup extends plugin
/* Helper */
var $customParameters= "";
var $orig_dn= "";
-
+ var $ignore_account= TRUE;
function termstartup ($config, $dn= NULL)
{
plugin::plugin ($config, $dn);
+ $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+
/* Get arrays */
- foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
+ 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])){
@@ -59,11 +67,79 @@ class termstartup extends plugin
$this->customParameters= "";
}
+ /* Prepare Shares */
+ if((isset($this->attrs['gotoShare']))&&(is_array($this->attrs['gotoShare']))){
+ unset($this->attrs['gotoShare']['count']);
+ foreach($this->attrs['gotoShare'] as $share){
+ $tmp = $tmp2 = array();
+ $tmp = split("\|",$share);
+ $tmp2['server'] =$tmp[0];
+ $tmp2['name'] =$tmp[1];
+ $tmp2['mountPoint'] =$tmp[2];
+ $this->gotoShares[$tmp[1]."|".$tmp[0]]=$tmp2;
+ }
+ }
+
+ $this->gotoShareSelections= $config->getShareList(true);
+ $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= fgets($fh, 256);
+ if(!empty($buffer)){
+ $this->gotoBootKernels[]= $buffer;
+ }
+ }
+ pclose($fh);
+ }
+
+ }
+ $tmp = $this->config->data['SERVERS']['LDAP'];
+ foreach($tmp as $server){
+ $visible = $server;
+ if($server == "default"){
+ $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' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ break;
+ }
+ }
+ }
}
function 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;
@@ -71,7 +147,7 @@ class termstartup extends plugin
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent == NULL){
- $display= "![](\"images/stop.png\")
".
+ $display= " ".
_("This 'dn' has no terminal features.")."";
return ($display);
}
@@ -90,42 +166,80 @@ class termstartup extends plugin
}
}
- /* Add autofs */
- if (isset ($_POST['add_autofs'])){
- if ($_POST['autofs'] != "" && chkacl ($this->acl, "gotoAutoFs") == ""){
- $this->add_list ($this->gotoAutoFs, $_POST['autofs']);
- }
- }
+ /* Show main page */
+ $smarty= get_smarty();
+
- /* Delete autofs */
- if (isset ($_POST['delete_autofs'])){
- if (count($_POST['autofs_list']) && chkacl ($this->acl, "gotoAutoFs") == ""){
- $this->del_list ($this->gotoAutoFs, $_POST['autofs_list']);
+ /* In this section server shares will be defined
+ * A user can select one of the given shares and a mount point
+ * and attach this combination to his setup.
+ */
+ $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'])){
+ /* 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."));
+ }else{
+ $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
+ $s_mount = $_POST['gotoShareMountPoint'];
+ /* Preparing the new assignment */
+ $this->gotoShares[$a_share['name']."|".$a_share['server']]=$a_share;
+ $this->gotoShares[$a_share['name']."|".$a_share['server']]['mountPoint']=$s_mount;
}
}
- /* Add filesystem */
- if (isset ($_POST['add_fs'])){
- if ($_POST['fstab'] != "" && chkacl ($this->acl, "gotoFilesystem") == ""){
- $this->add_list ($this->gotoFilesystem, $_POST['fstab']);
- }
+ /* 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']))){
+ unset($this->gotoShares[$_POST['gotoShare']]);
}
- /* Delete filesystem */
- if (isset ($_POST['delete_fs'])){
- if (count($_POST['fstab_list']) && chkacl ($this->acl, "gotoFilesystem") == ""){
- $this->del_list ($this->gotoFilesystem, $_POST['fstab_list']);
+ $smarty->assign("gotoShares",$this->printOutAssignedShares());
+ $smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares()));
+
+ /* Create divSelectBox for ldap server selection
+ */
+ $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 Entries
+ */
+ foreach($this->goLdapServerList as $server => $visible){
+ $use ="";
+ if(($this->gotoLdapServer == $server) || ($found == false)) {
+ $found = true;
+ $use = " checked ";
+ };
+
+ $SelectBoxLdapServer->AddEntry(
+ array(
+ array("string"=>"",
+ "attach"=>"style='border-left:0px;'"),
+ array("string"=>$visible)
+ ));
+ }
- /* Show main page */
- $smarty= get_smarty();
+ $smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList());
- /* Arrays */
- $smarty->assign("ldapservers", $this->config->data['SERVERS']['LDAP']);
- $smarty->assign("gotoLdapServer_select", $this->gotoLdapServer);
- $smarty->assign("gotoLdapServerACL", chkacl($this->acl, "gotoLdapServer"));
- foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
+ $smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL"));
+ foreach (array("gotoModules" ) as $val){
$smarty->assign("$val", $this->$val);
}
@@ -153,20 +267,17 @@ class termstartup extends plugin
}
/* ACL's */
- foreach (array("gotoKernelParameters", "gotoModules", "gotoFilesystem") as $value){
+ foreach (array("gotoKernelParameters", "gotoModules") as $value){
$smarty->assign($value."ACL", chkacl($this->acl, "$value"));
}
/* Show main page */
- return($smarty->fetch (get_template_path('startup.tpl', TRUE)));
+ return($smarty->fetch (get_template_path('terminalStartup.tpl', TRUE)));
}
function remove_from_parent()
{
- $ldap= $this->config->get_ldap_link();
- $ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
- $this->handle_post_events("remove");
+ $this->handle_post_events("remove");
}
@@ -206,7 +317,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];
@@ -225,7 +336,7 @@ class termstartup extends plugin
$this->gotoKernelParameters= "root=/dev/nfs nfsroot=".
$this->gotoTerminalPath.
",ro,hard,nolock,fg,rsize=8192 ".
- "ip=::::::dhcp LDAP=".$this->gotoLdapServer;
+ "ip=::::::dhcp ldap=".base64_encode($this->gotoLdapServer);
switch ($this->bootmode){
case "D":
@@ -242,22 +353,37 @@ class termstartup extends plugin
plugin::save();
/* Add missing arrays */
- foreach (array("gotoFilesystem", "gotoAutoFs", "gotoModules") as $val){
+ foreach (array("gotoModules") as $val){
if (isset ($this->$val) && count ($this->$val) != 0){
+
$this->attrs["$val"]= array_unique($this->$val);
}
+ if(!isset($this->attrs["$val"])) $this->attrs["$val"]=array();
}
/* 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"){
+ $this->attrs[$value] = array();
+ }
}
+ /* prepare share settings */
+ $tmp = array();
+ foreach($this->gotoShares as $name => $settings){
+ $tmp2 = split("\|",$name);
+ $name = $tmp2[0];
+ $tmp[] = $settings['server']."|".$name."|".$settings['mountPoint'];
+ }
+ $this->attrs['gotoShare']=$tmp;
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- show_ldap_error($ldap->get_error());
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of system terminal/startup with dn '%s' failed."),$this->dn));
$this->handle_post_events("modify");
}
@@ -284,6 +410,20 @@ class termstartup extends plugin
$array= $tmp;
}
+ /* Generate ListBox frindly output for the defined shares
+ * Possibly Add or remove an attribute here,
+ */
+ function printOutAssignedShares()
+ {
+ $a_return = array();
+ if(is_array($this->gotoShares)){
+ foreach($this->gotoShares as $share){
+ $a_return[$share['name']."|".$share['server']]= $share['name']." [".$share['server']."]";
+ }
+ }
+ return($a_return);
+ }
+
}