![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index d2f695baab99468eeb2794c0c7b6db979392ca27..f56f05f78418e0998acf4416d83275d387969bc0 100644 (file)
<?php
/*
- This code is part of GOsa (https://gosa.gonicus.de)
- Copyright (C) 2003 Cajus Pollmeier
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
class systems extends plugin
$this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
$this->systab->base = $this->DivListSystem->selectedBase;
}else{
- print_red(_("You are not allowed to create a new object of this type."));
+ msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
}
}
}
session::set('objectinfo',$this->dn);
add_lock ($this->dn, $this->ui->dn);
}else{
- print_red (_("You can't edit this object type yet!"));
+ msg_dialog::display(_("Error"), _("Editing this type of object is not supported yet!"), ERROR_DIALOG);
del_lock($this->dn);
}
}
session::set('objectinfo',$this->dn);
return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
}else{
- print_red(_("You are not allowed to change the password for this object."));
+ msg_dialog::display(_("Permission error"), _("You have no permission to change this password!"), ERROR_DIALOG);
}
}
/* Correctly specified? */
if (isset($_POST['password_finish'])){
if ($_POST['new_password'] != $_POST['repeated_password']){
- print_red (_("Passwords entered as new and repeated do not match!"));
+ msg_dialog::display(_("Error"), _("The passwords you've entered as 'New password' and 'Repeated password' do not match!"), ERROR_DIALOG);
return($smarty->fetch(get_template_path('password.tpl', TRUE)));
}
}
$ldap->modify($attrs);
new log("security","systems/".get_class($this),$this->dn,array_keys($attrs),$ldap->get_error());
}else{
- print_red(_("You are not allowed to change the password for this object."));
+ msg_dialog::display(_("Permission error"), _("You have no permission to change this password!"), ERROR_DIALOG);
}
}else{
- print_red(_("Can't detect object to change password."));
+ msg_dialog::display(_("Error"), _("Cannot determine object to change password!"), ERROR_DIALOG);
}
session::un_set('objectinfo');
}
/********************
SCHEDULE action in GOsa Daemon
********************/
- if(preg_match("/^schedule_event_/",$s_action)){
+
+ if(preg_match("/^schedule_event_/",$s_action) || preg_match("/^trigger_event_/",$s_action)){
$this->dns = array();
$ids = $this->list_get_selected_items();
$mac[]= $attrs['macAddress'][0];
}
}
- $events = DaemonEvent::get_event_types();
- $type = preg_replace("/^schedule_event_/","",$s_action);
+ $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
+ $type = preg_replace("/^[a-z]*_event_/","",$s_action);
+ $o_queue = new gosaSupportDaemon();
+
+ /* Skip installation or update trigerred events,
+ * if this entry is currently processing.
+ */
+ if(preg_match("/trigger_event/",$s_action) && in_array($type,array("DaemonEvent_reinstall","DaemonEvent_update"))){
+ foreach($mac as $key => $mac_address){
+ foreach($o_queue->get_entries_by_mac(array($mac_address)) as $entry){
+
+ $entry['STATUS'] = strtoupper($entry['STATUS']);
+ if($entry['STATUS'] == "PROCESSING" &&
+ isset($events['QUEUED'][$entry['HEADERTAG']]) &&
+ in_array($events['QUEUED'][$entry['HEADERTAG']],array("DaemonEvent_reinstall","DaemonEvent_update"))){
+ unset($mac[$key]);
+
+ new log("security","systems/".get_class($this),"",array(),"Skip adding 'DaemonEvent::".$type."' for mac '".$mac_address."', there is already a job in progress.");
+ break;
+ }
+ }
+ }
+ }
+
+ /* Prepare event to be added
+ */
if(count($mac) && isset($events['BY_CLASS'][$type])){
$event = $events['BY_CLASS'][$type];
$this->systab = new $event['CLASS_NAME']($this->config);
$this->systab->add_targets($mac);
+ if(preg_match("/trigger_event/",$s_action)){
+ $this->systab->set_type(TRIGGERED_EVENT);
+ }else{
+ $this->systab->set_type(SCHEDULED_EVENT);
+ }
}
}
}
/* Insert scheduled events into queue */
if($this->systab instanceof DaemonEvent){
$this->systab->save_object();
- if(isset($_POST['save_event_dialog'])){
- $header = $this->systab->get_header_tag();
- $targets = $this->systab->get_targets();
- $data = $this->systab->save();
- $data['timestamp'] = $this->systab->get_timestamp();
+
+ /* Save event
+ */
+ if(isset($_POST['save_event_dialog']) || $this->systab->get_type() == TRIGGERED_EVENT){
$o_queue = new gosaSupportDaemon();
- foreach($targets as $target){
- $data['mac'] = $target;
- if(!$o_queue->send($header,$target,$data,TRUE)){
- msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
- $o_queue->get_error()),ERROR_DIALOG);
- }
+ $o_queue->append($this->systab);
+ if($o_queue->is_error()){
+ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
+ }else{
+ $this->systab = FALSE;
}
- $this->systab = FALSE;
}
if(isset($_POST['abort_event_dialog'])){
$this->systab = FALSE;
return(gen_locked_message($user,$this->dns));
}
- $dns_names = "<br><pre>";
+ $dns_names = array();
foreach($this->dns as $dn){
add_lock ($dn, $this->ui->dn);
- $dns_names .= $dn."\n";
+ $dns_names[] = @LDAP::fix($dn);
}
- $dns_names .="</pre>";
/* Lock the current entry, so nobody will edit it during deletion */
- if (count($this->dns) == 1){
- $smarty->assign("warning", sprintf(_("You're about to delete the following entry %s"), @LDAP::fix($dns_names)));
- } else {
- $smarty->assign("warning", sprintf(_("You're about to delete the following entries %s"), @LDAP::fix($dns_names)));
- }
+ $smarty->assign("warning", msgPool::deleteInfo($dns_names));
$smarty->assign("multiple", true);
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
}
if(preg_match("/d/",$tabacl)){
/* Delete request is permitted, perform LDAP action */
- if($tabtype=="phonetabs"){
+ if(in_array($type,array("ArpNewDevice","NewDevice")) && class_available("termgeneric")){
+ $this->systab= new termgeneric($this->config, $dn);
+ $this->systab->set_acl_base($dn);
+ $this->systab->remove_from_parent();
+ }elseif($tabtype=="phonetabs"){
$this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $dn,$type);
$this->systab->set_acl_base($dn);
$this->systab->by_object['phoneGeneric']->remove_from_parent ();
} else {
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- print_red (_("You are not allowed to delete this component!"));
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
new log("security","systems/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
/* Remove lock file after successfull deletion */
/* Lock the current entry, so nobody will edit it during deletion */
add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("warning", sprintf(_("You're about to delete all information about the component at '%s'."), @LDAP::fix($this->dn)));
+ $smarty->assign("warning", msgPool::deleteInfo(@LDAP::fix($this->dn)));
$smarty->assign("multiple", false);
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
} else {
/* Obviously the user isn't allowed to delete. Show message and
clean session. */
- print_red (_("You are not allowed to delete this component!"));
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
}
}
if(preg_match("/d/",$tabacl)){
/* Delete request is permitted, perform LDAP action */
- if($tabtype=="phonetabs"){
+ if(in_array($type,array("ArpNewDevice","NewDevice")) && class_available("termgeneric")){
+ $this->systab= new termgeneric($this->config, $this->dn);
+ $this->systab->set_acl_base($this->dn);
+ $this->systab->remove_from_parent();
+ }elseif($tabtype=="phonetabs"){
$this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $this->dn,$type);
$this->systab->set_acl_base($this->dn);
$this->systab->by_object['phoneGeneric']->remove_from_parent ();
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- print_red (_("You are not allowed to delete this component!"));
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
new log("security","systems/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
}
-
-
-
-
-
-
-
- /********************
+ /********************
Edit system type finished, check if everything went ok
********************/
/* Finish user edit is triggered by the tabulator dialog, so
}
}
if(!$found){
- print_red(sprintf(_("Can't set gotoMode to status 'active', the current object couldn't be identified.")));
+ msg_dialog::display(_("Internal error"), _("Cannot set mode to 'active'!"), ERROR_DIALOG);
}
}
* entry and not an edited one, so we will delete it.
*
*/
-
if(session::is_set('SelectedSystemType')){
$SelectedSystemType = session::get('SelectedSystemType');
if($SelectedSystemType['ogroup'] != "none"){
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
- show_errors($message);
+ msg_dialog::displayChecks($message);
}
}
$dialog = FALSE;
$hide_apply = $this->dn == "new";
+ $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->dn));
if(is_object($this->systab) && !isset($this->systab->by_object)){
$dialog = TRUE;
$hide_apply = TRUE;
if (!$dialog){
$display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
+ $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
$display.= " \n";
if (!$hide_apply){
- $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+ $display.= "<input type=submit name=\"edit_apply\" value=\"".msgPool::applyButton()."\">\n";
$display.= " \n";
}
- $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+ $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
$display.= "</p>";
}
return ($display);
{
}
- function adapt_from_template($dn)
+ function adapt_from_template($dn, $skip= array())
{
}
}
/* Walk through all possible search combinations, and search for some objects if the checkbox is enabled */
- $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
foreach($objs as $checkBox => $oc){
if($this->DivListSystem->$checkBox){
if($this->DivListSystem->SubSearch){
if($oc['CLASS'] != ""){
+ $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
$new_res = get_sub_list($filter, $sys_categories ,$oc['TREE'], $base,$sys_attrs, GL_SUBSEARCH | GL_SIZELIMIT);
$res = array_merge($res,$new_res);
}
}else{
/* User filter? */
if($oc['CLASS'] != ""){
+ $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
$res = array_merge($res,get_list($filter,$sys_categories,$oc['TREE'].$base, $sys_attrs, GL_SIZELIMIT));
}
}
}
/* Search for incoming objects */
+ $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
$res = array_merge($res,get_list($filter,$sys_categories, get_ou('incomingou').$base,$sys_attrs, GL_SIZELIMIT));
/* Get all gotoTerminal's */
/* Return C&P dialog */
if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
-
- /* Load entry from queue and set base */
- $this->CopyPasteHandler->load_entry_from_queue();
- $this->CopyPasteHandler->SetVar("base",$this->DivListSystem->selectedBase);
/* Get dialog */
$data = $this->CopyPasteHandler->execute();
+ $this->CopyPasteHandler->SetVar("base",$this->DivListSystem->selectedBase);
/* Return dialog data */
if(!empty($data)){
{
$temp= "";
$conv= array(
- "NQ" => array("select_newsystem.png",_("New System from incoming")),
+ "NQ" => array("select_newsystem.png",_("New system from incoming")),
"D" => array("select_default.png",_("Template")),
"T" => array("select_terminal.png",_("Terminal")),
"L" => array("select_workstation.png",_("Workstation")),
"GS" => array("select_server_green.png",_("Server is installing")),
"YS" => array("select_server_yellow.png",_("Server is waiting for action")),
"RS" => array("select_server_red.png",_("Server installation failed")),
- "W" => array("select_winstation.png",_("Winstation")),
- "C" => array("select_component.png",_("Network Device")),
- "NT"=> array("select_new_terminal.png",_("New Terminal")),
- "NL"=> array("select_new_workstation.png",_("New Workstation")),
+ "W" => array("select_winstation.png",_("Win workstation")),
+ "C" => array("select_component.png",_("Network device")),
+ "NT"=> array("select_new_terminal.png",_("New terminal")),
+ "NL"=> array("select_new_workstation.png",_("New workstation")),
"P" => array("select_printer.png",_("Printer")));
if((isset($input['is_new']))&&(!empty($input['is_new']))){