diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 5a6ba6fce7283e8106c3f0fe18ee79669b52acab..697ec135c4cd400774d972ea7f4176d571ee9596 100644 (file)
/* Finish user edit is triggered by the tabulator dialog, so
the user wants to save edited data. Check and save at this
point. */
- if ((isset($_POST['edit_finish'])) && (isset($this->systab->config))){
+ if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->systab->config))){
/* Check tabs, will feed message array */
$message= $this->systab->check();
$ldap->cd($this->config->current['BASE']);
}
- /* Terminal has been saved successfully, remove lock from
- LDAP. */
- if ($this->dn != "new"){
- del_lock ($this->dn);
- }
+ if (!isset($_POST['edit_apply'])){
+ /* Terminal has been saved successfully, remove lock from
+ LDAP. */
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
- unset ($this->systab);
- $this->systab= NULL;
- unset($_SESSION['objectinfo']);
+ unset ($this->systab);
+ $this->systab= NULL;
+ unset($_SESSION['objectinfo']);
+ }
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
/* Don't show buttons if tab dialog requests this */
if ((isset($this->systab->by_object))&&(!$this->systab->by_object[$this->systab->current]->dialog)){
$display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+ $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
$display.= " \n";
+ if ($this->dn != "new"){
+ $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+ $display.= " \n";
+ }
$display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
$display.= "</p>";
}
}
/* Display dialog with system list */
+ $this->DivListSystem->parent = $this;
$this->DivListSystem->execute();
/* Add departments if subsearch is disabled */
/* check if current object is a new one */
if (preg_match ("/,ou=incoming,/i", $tmp)){
- if (in_array('gotoTerminal', $value['objectClass'])){
+ if (in_array_ics('gotoTerminal', $value['objectClass'])){
$add= "- "._("New terminal");
- }elseif (in_array('gotoWorkstation', $value['objectClass'])){
+ }elseif (in_array_ics('gotoWorkstation', $value['objectClass'])){
$add= "- "._("New workstation");
- }elseif (in_array('GOhard', $value['objectClass'])){
+ }elseif (in_array_ics('GOhard', $value['objectClass'])){
$add= "- "._("New Device");
}
}
/* Detect type of object and create an entry for $this->terminals */
$terminal = array();
if ((in_array ($tmp, $responsible)) || ($add != "")){
- if (in_array('gotoTerminal', $value["objectClass"])){
+ if (in_array_ics('gotoTerminal', $value["objectClass"])){
if (isset($value["macAddress"][0]) && $value["macAddress"][0] != "-"){
$terminal = $value;
$terminal['type'] = "T";
$terminal['message'] = _("Terminal template for");
$terminal['location'] = array_search($tmp, $this->config->departments);
}
- } elseif (in_array('gotoWorkstation', $value["objectClass"])){
+ } elseif (in_array_ics('gotoWorkstation', $value["objectClass"])){
if (isset($value["macAddress"][0]) && $value["macAddress"][0] != "-"){
$terminal = $value;
$terminal['type'] = "L";
if (isset($value["FAIstate"][0])){
$terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
}
- } elseif (in_array('gotoPrinter', $value["objectClass"])){
+ } elseif (in_array_ics('gotoPrinter', $value["objectClass"])){
$terminal = $value;
$terminal['type'] = "P";
- } elseif (in_array('goServer', $value["objectClass"])){
+ } elseif (in_array_ics('goServer', $value["objectClass"])){
$terminal = $value;
$terminal['type'] = "S";
if (isset($value["FAIstate"][0])){
$terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
}
- } elseif (in_array('goFonHardware', $value["objectClass"])){
+ } elseif (in_array_ics('goFonHardware', $value["objectClass"])){
$terminal = $value;
$terminal['type'] = "F";
- }elseif (in_array("GOhard",$value['objectClass'])){
+ }elseif (in_array_ics("GOhard",$value['objectClass'])){
$terminal = $value;
$terminal['type'] = "Q";
$terminal['is_new'] = $add;
- } elseif (in_array('ieee802Device', $value["objectClass"])){
+ } elseif (in_array_ics('ieee802Device', $value["objectClass"])){
$terminal = $value;
$terminal['type'] = "C";
} else{
function get_system_type($classes)
{
$type= "";
- if (in_array('ieee802Device', $classes)){
+ if (in_array_ics('ieee802Device', $classes)){
$type= "component";
- }elseif (in_array('gotoTerminal', $classes)){
+ }elseif (in_array_ics('gotoTerminal', $classes)){
$type= "terminal";
- }elseif (in_array('gotoWorkstation', $classes)){
+ }elseif (in_array_ics('gotoWorkstation', $classes)){
$type= "workstation";
- }elseif (in_array('gotoPrinter', $classes)){
+ }elseif (in_array_ics('gotoPrinter', $classes)){
$type= "printer";
- }elseif (in_array('goFonHardware', $classes)){
+ }elseif (in_array_ics('goFonHardware', $classes)){
$type= "phone";
- }elseif (in_array('goServer', $classes)){
+ }elseif (in_array_ics('goServer', $classes)){
$type= "server";
- }elseif (in_array('GOhard', $classes)){
+ }elseif (in_array_ics('GOhard', $classes)){
$type= "NewDevice";
- }elseif (in_array('sambaAccount', $classes) ||
- in_array('sambaSamAccount', $classes)){
+ }elseif (in_array_ics('sambaAccount', $classes) ||
+ in_array_ics('sambaSamAccount', $classes)){
$type= "winstation";
}
return ($type);