diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index ad651b856978854b0e19740c4744cea4fc6bce12..ca979e91b47e4d36a41d20cab4d8180397f90820 100644 (file)
/* Plugin side filled */
var $modes= array();
+ var $baseSelector;
/* attribute list for save action */
var $ignore_account= TRUE;
function termgeneric (&$config, $dn= NULL, $parent= NULL)
{
/* Check if FAI is activated */
- $tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
- if(!empty($tmp)){
- $this->fai_activated = TRUE;
- }
+ $this->fai_activated = $config->pluginEnabled("faiManagement");
plugin::plugin ($config, $dn, $parent);
}
$this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
+ $this->netConfigDNS->MACisMust =TRUE;
+
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
/* Set base */
if ($this->dn == "new"){
$ui= get_userinfo();
- $this->base= dn2base($ui->dn);
+ $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
+ } elseif(preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", $this->dn)){
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", "", $this->dn);
} else {
- $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("terminalRDN"), '/')."/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("termgeneric", "terminalRDN"), '/')."/i", "", $this->dn);
}
/* Create an array of all Syslog servers */
$this->orig_dn= $this->dn;
$this->orig_cn= $this->cn;
$this->orig_base= $this->base;
+
+ /* Instanciate base selector */
+ $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+ $this->baseSelector->setSubmitButton(false);
+ $this->baseSelector->setHeight(300);
+ $this->baseSelector->update(true);
}
function set_acl_base($base)
}
- /* Base select dialog */
- $once = true;
- foreach($_POST as $name => $value){
- if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_moveable()){
- $once = false;
- $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
- $this->dialog->setCurrentBase($this->base);
- }
- }
-
- /* Dialog handling */
- if(is_object($this->dialog)){
- /* Must be called before save_object */
- $this->dialog->save_object();
-
- if($this->dialog->isClosed()){
- $this->dialog = false;
- }elseif($this->dialog->isSelected()){
-
- /* A new base was selected, check if it is a valid one */
- $tmp = $this->get_allowed_bases();
- if(isset($tmp[$this->dialog->isSelected()])){
- $this->base = $this->dialog->isSelected();
- }
- $this->dialog= false;
- }else{
- return($this->dialog->execute());
- }
- }
-
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent === NULL){
$display= "<img alt=\"\" src=\"images/small-error.png\" align=middle> <b>".
/* Fill templating stuff */
$smarty= get_smarty();
+
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translation){
$smarty->assign("cn", $this->cn);
$smarty->assign("description", $this->description);
- $smarty->assign("staticAddress", "");
-
- $smarty->assign("bases", $this->get_allowed_bases());
/* tell smarty the inherit checkbox state */
$smarty->assign("inheritTimeServer",$this->inheritTimeServer);
$smarty->assign("fai_activated",$this->fai_activated);
/* Variables */
- foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer","gotoSyslogServer", "gotoNtpServer") as $val){
+ foreach(array("gotoMode", "gotoTerminalPath", "gotoSwapServer","gotoSyslogServer", "gotoNtpServer") as $val){
$smarty->assign($val."_select", $this->$val);
}
+ $smarty->assign("base", $this->baseSelector->render());
$smarty->assign("member_of_ogroup",$this->member_of_ogroup);
plugin::save_object();
$this->base = $base_tmp;
- /* Set new base if allowed */
- $tmp = $this->get_allowed_bases();
- if(isset($_POST['base'])){
- if(isset($tmp[$_POST['base']])){
- $this->base= $_POST['base'];
+ /* Refresh base */
+ if ($this->acl_is_moveable($this->base)){
+ if (!$this->baseSelector->update()) {
+ msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+ }
+ if ($this->base != $this->baseSelector->getBase()) {
+ $this->base= $this->baseSelector->getBase();
+ $this->is_modified= TRUE;
}
}
}
/* Permissions for that base? */
- $this->dn= "cn=".$this->cn.",".get_ou('terminalRDN').$this->base;
+ $this->dn= "cn=".$this->cn.",".get_ou("termgeneric", "terminalRDN").$this->base;
if ($this->cn == ""){
$message[]= msgPool::required(_("Name"));
}
+ // Check if a wrong base was supplied
+ if(!$this->baseSelector->checkLastBaseUpdate()){
+ $message[]= msgPool::check_base();
+ }
+
/* Check if given name is a valid host/dns name */
if(!tests::is_dns_name($this->cn) ){
$message[] = msgPool::invalid(_("Name"));
}
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
- if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".preg_quote(get_ou('systemIncomingRDN'), '/')."/", $ldap->getDN())){
+ if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", $ldap->getDN())){
continue;
} else {
if ($attrs['dn'] != $this->orig_dn){
$ldap= $this->config->get_ldap_link();
/* Strip relevant part from dn, keep trailing ',' */
- $tmp= preg_replace("/^cn=[^,]+,".get_ou('terminalRDN')."/i", "", $this->dn);
+ $tmp= preg_replace("/^cn=[^,]+,".preg_quote(get_ou("termgeneric", "terminalRDN"), '/')."/i", "", $this->dn);
$tmp= preg_replace("/".$this->config->current['BASE']."$/i", "", $tmp);
/* Walk from top to base and try to load default values for
while (TRUE){
$tmp= preg_replace ("/^[^,]+,/", "", $tmp);
- $ldap->cat("cn=default,".get_ou('terminalRDN').$tmp.
+ $ldap->cat("cn=default,".get_ou("termgeneric", "terminalRDN").$tmp.
$this->config->current['BASE'], array('gotoTerminalPath'));
$attrs= $ldap->fetch();
if (isset($attrs['gotoTerminalPath'])){
"plPriority" => 1,
"plSection" => array("administration"),
"plCategory" => array("terminal" => array( "description" => _("Terminal"),
- "objectClass" => "gotoTerminal")),
+ "objectClass" => "gotoTerminal")),
+ "plProperties" =>
+ array(
+ array(
+ "name" => "terminalRDN",
+ "type" => "rdn",
+ "default" => "ou=terminals,ou=systems,",
+ "description" => _("The 'terminalRDN' statement defines the location where new terminals will be created. The default is 'ou=terminals,ou=systems,'."),
+ "check" => "gosaProperty::isRdn",
+ "migrate" => "migrate_terminalRDN",
+ "group" => "plugin",
+ "mandatory" => FALSE
+ )
+ ),
+
"plProvidedAcls"=> array(
"cn" => _("Name"),
"description" => _("Description"),
$this->parent->by_object['termstartup']->gotoLdapServers = array();
}
}
+
+
+ function is_modal_dialog()
+ {
+ return((isset($this->dialog) && $this->dialog) || (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog));
+ }
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: