![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 67d092a38a52cf687d9bc7bbba7510ca7127d489..64899b4e4e3e97d873acbaa569cd66e9ecc7a33c 100644 (file)
$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.");
}
unset ($this->ogroup);
$this->ogroup= NULL;
session::un_set('objectinfo');
+ }else{
+
+ /* Reinitialize tab */
+ if($this->ogroup instanceof tabs){
+ $this->ogroup->re_init();
+ }
}
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
- msgDialog::displayChecks($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);
$temp= "";
$conv= array(
- "U" => array("select_user.png" ,_("User") , "ogroup"),
- "G" => array("select_groups.png" ,_("Group") , "ogroup"),
- "A" => array("select_application.png" ,_("Application") , "ogroup"),
- "D" => array("select_department.png" ,_("Department") , "ogroup"),
- "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"),
- "T" => array("select_terminal.png" ,_("Terminal") , "termgroup"),
- "P" => array("select_printer.png" ,_("Printer") , "ogroup"));
+ "U" => array("plugins/generic/images/head.png" ,_("User") , "ogroup"),
+ "G" => array("plugins/groups/images/groups.png" ,_("Group") , "ogroup"),
+ "A" => array("plugins/ogroups/images/application.png" ,_("Application") , "ogroup"),
+ "D" => array("plugins/departments/department.png" ,_("Department") , "ogroup"),
+ "S" => array("plugins/ogroups/images/server.png" ,_("Server") , "ogroup"),
+ "F" => array("plugins/ogroups/images/asterisk.png" ,_("Phone") , "phonequeue"),
+ "W" => array("plugins/ogroups/images/workstation.png" ,_("Workstation") , "workstartup"),
+ "O" => array("plugins/ogroups/images/winstation.png" ,_("Windows Install") , "ogroup"),
+ "T" => array("plugins/ogroups/images/terminal.png" ,_("Terminal") , "termgroup"),
+ "P" => array("plugins/ogroups/images/printer.png" ,_("Printer") , "ogroup"));
/* Assemble picture */
$type= $input['gosaGroupObjects'][0];
$p1['lnk']= $conv[$type[0]][2];
$html_object_1 = "<input type='image' name='".$p1['lnk']."_group_edit_%KEY' ";
} else {
- $p1['pic']= "empty.png";
+ $p1['pic']= "images/empty.png";
$p1['tit']= "";
$p1['alt']= "";
$p1['lnk']= "";//$conv[$type[0]][2];
$p2['lnk']= $conv[$type[1]][2];
$html_object_2 = "<input type='image' name='".$p2['lnk']."_group_edit_%KEY' ";
} else {
- $p2['pic']= "empty.png";
+ $p2['pic']= "images/empty.png";
$p2['alt']= "";
$p2['tit']= "";
$p2['lnk']= ""; //$conv[$type[0]][2];
}
$temp = $html_object_1." class='center' id='iconA".preg_replace("/_/","",$p1['lnk']."_group_edit_%KEY")."'
- src='images/".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
+ src='".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
$temp.= $html_object_2." class='center' id='iconB".preg_replace("/_/","",$p2['lnk']."_group_edit_%KEY")."'
- src='images/".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>";
+ src='".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>";
return ($temp);
}
function save_object()
{
$this->DivListOGroup->save_object();
+ if(is_object($this->CopyPasteHandler)){
+ $this->CopyPasteHandler->save_object();
+ }
}
}