diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 7a02964f21b2b15e9cac8df5a262bdbd8d7a387f..dfae3014777783a594ef3e81bd8ba5dee3f04ce4 100644 (file)
/* Generic terminal attributes */
var $bootmode= "G";
var $goLdapServerList= array();
/* Generic terminal attributes */
var $bootmode= "G";
var $goLdapServerList= array();
- var $gotoBootKernel= "";
+ var $gotoBootKernel= "default-inherit";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
/* attribute list for save action */
/* attribute list for save action */
- var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters");
+ var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters","gotoModules");
var $objectclasses= array("GOhard");
/* Helper */
var $objectclasses= array("GOhard");
/* Helper */
var $orig_dn= "";
var $ignore_account= TRUE;
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){
/* 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])){
if (isset($this->attrs["$val"]["count"])){
for ($i= 0; $i<$this->attrs["count"]; $i++){
if (isset($this->attrs["$val"][$i])){
} else {
$fh= popen($command, "r");
while (!feof($fh)) {
} else {
$fh= popen($command, "r");
while (!feof($fh)) {
- $buffer= fgets($fh, 256);
+ $buffer= trim(fgets($fh, 256));
+
if(!empty($buffer)){
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);
}
}
pclose($fh);
$tmp = $this->config->data['SERVERS']['LDAP'];
foreach($tmp as $server){
$visible = $server;
$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;
$visible = "["._("inherited")."]";
}
$this->goLdapServerList[$server] = $visible;
switch ($name){
case 'gotoLdapServer':
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;
}
}
}
break;
}
}
}
+
+ if($this->is_account){
+ @log::log("view","terminal/".get_class($this),$this->dn);
+ }
}
function execute()
{
}
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'])){
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
/* Add module */
if (isset ($_POST['add_module'])){
/* 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'])){
$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']);
}
}
$this->del_list ($this->gotoModules, $_POST['modules_list']);
}
}
/* Show main page */
$smarty= get_smarty();
/* 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
/* 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 $_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."));
/* 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 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']]);
}
unset($this->gotoShares[$_POST['gotoShare']]);
}
$smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList());
$smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList());
- $smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL"));
foreach (array("gotoModules" ) as $val){
$smarty->assign("$val", $this->$val);
}
foreach (array("gotoModules" ) as $val){
$smarty->assign("$val", $this->$val);
}
/* Values */
foreach(array("gotoBootKernel", "customParameters") 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 */
}
/* Radio button group */
$smarty->assign("debugbootup", "");
}
$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()
{
/* 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");
$this->handle_post_events("remove");
+ @log::log("remove","terminal/".get_class($this),$this->dn,array_keys($this->attrs));
+ }
}
}
plugin::save_object();
/* Save group radio buttons */
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 */
$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"];
}
}
$this->customParameters= $_POST["customParameters"];
}
}
/* Find proper terminal path for tftp configuration
FIXME: This is suboptimal when the default has changed to
another location! */
/* 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 ',' */
$ldap= $this->config->get_ldap_link();
/* Strip relevant part from dn, keep trailing ',' */
$this->attrs["$val"]= array_unique($this->$val);
}
$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){
}
/* 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();
}
}
$this->attrs[$value] = array();
}
}
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
+
$this->cleanup();
$ldap->modify ($this->attrs);
$this->cleanup();
$ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error(), _("Saving terminal startup settings failed"));
+ @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");
}
$this->handle_post_events("modify");
}
return($a_return);
}
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"))
+ ));
+ }
+
}
}