diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index f9fac4e4ff5c50ee3ddb4f4f238a80c0ee133a3c..8a0fd3dc7698d6fc658f9989dc9d4349a61937ce 100644 (file)
}
/* Hanlde notification event requests */
- if(isset($_POST['menu_action']) && preg_match("/^trigger_event_DaemonEvent_notify/",$_POST['menu_action'])){
- $s_action = "notify";
+ if(isset($_POST['menu_action']) && preg_match("/^event/",$_POST['menu_action'])){
+ $s_action = $_POST['menu_action'];
}
+
/********************
Create notification event
********************/
- if($s_action == "notify"){
-
+ if(preg_match("/^event_/",$s_action) && class_available("DaemonEvent")){
$ids = $this->list_get_selected_items();
$uids = array();
foreach($ids as $id){
$uids[] = $this->ogrouplist[$id]['cn'][0];
}
if(count($uids)){
- $this->ogroup= new DaemonEvent_notify($this->config);
- $this->ogroup->add_targets($uids);
+ $events = DaemonEvent::get_event_types(USER_EVENT);
+ $event = preg_replace("/^event_/","",$s_action);
+ if(isset($events['BY_CLASS'][$event])){
+ $type = $events['BY_CLASS'][$event];
+ $this->ogroup = new $type['CLASS_NAME']($this->config);
+ $this->ogroup->add_targets($uids);
+ $this->ogroup->set_type(TRIGGERED_EVENT);
+ }
}
-
}
/* Abort event dialog */
$o_queue = new gosaSupportDaemon();
$o_queue->append($this->ogroup);
if($o_queue->is_error()){
- msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
- $o_queue->get_error()),ERROR_DIALOG);
+ msg_dialog::display(_("Infrastructure error"), msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
}else{
$this->ogroup = FALSE;
}
}
$this->dns[$id] = $dn;
}
- $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("info", sprintf(_("You're about to delete the following object entry %s"), @LDAP::fix($dns_names)));
- } else {
- $smarty->assign("info", sprintf(_("You're about to delete the following object entries %s"), @LDAP::fix($dns_names)));
- }
+ $smarty->assign("info", msgPool::deleteInfo($dns_names,_("object group")));
$smarty->assign("multiple", true);
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
new log("security","ogroups/".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("info", sprintf(_("You're about to delete the object group '%s'."), @LDAP::fix($this->dn)));
+ $smarty->assign("info", msgPool::deleteInfo(@LDAP::fix($this->dn),_("object group")));
$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. */
- msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
}
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
} 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);
}
}
/* Don't show buttons if tab dialog requests this */
if (!$this->ogroup->by_object[$this->ogroup->current]->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 ($this->dn != "new"){
- $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);
"S" => array("select_server.png" ,_("Server") , "ogroup"),
"F" => array("select_phone.png" ,_("Phone") , "phonequeue"),
"W" => array("select_workstation.png" ,_("Workstation") , "workstartup"),
- "O" => array("select_winstation.png" ,_("Windows Install") , "ogroup"),
+ "O" => array("select_winstation.png" ,_("Windows Install") , "ogroup"),
"T" => array("select_terminal.png" ,_("Terminal") , "termgroup"),
"P" => array("select_printer.png" ,_("Printer") , "ogroup"));
function save_object()
{
$this->DivListOGroup->save_object();
+ if(is_object($this->CopyPasteHandler)){
+ $this->CopyPasteHandler->save_object();
+ }
}
}