![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a78a38e)
raw | patch | inline | side by side (parent: a78a38e)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 21 Feb 2008 07:53:16 +0000 (07:53 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 21 Feb 2008 07:53:16 +0000 (07:53 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9000 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/include/class_hostActionQueue.inc b/gosa-core/include/class_hostActionQueue.inc
index c21ebfd76560da070b51e300406f501779272488..e6eacf10e0624d740d4f429eb2e66f2d295e0f39 100644 (file)
$parts = split(" ",$row);
if(count($parts) != 10){
- print_red(_("Entry broken, skipped."));
msg_dialog::display(_("GOsa infrastructure"), _("Cannot read broken entry - skipped!"), WARNING_DIALOG);
}else{
diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc
index 299cbd2e8a77c44f62f63e7ac4bd3aae481db593..75721a269400ee97302987a22dbbeedb83a268b1 100644 (file)
$this->acltabs= new aclroletab($this->config, NULL,$this->dn);
$this->acltabs->set_acl_base($this->DivListACL->selectedBase);
}else{
- msg_dialog::display(_("Permission error"), _("You have no permissions to create a new role!"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You have no permission to create a new role!"), ERROR_DIALOG);
}
}
/* Set ACL and move DN to the headline */
session::set('objectinfo',$this->dn);
}else{
- msg_dialog::display(_("Permission error"), _("You have no permissions to edit this ACL!"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You have no permission to edit this ACL!"), ERROR_DIALOG);
}
}
/* Obviously the acl isn't allowed to delete. Show message and
clean session. */
- msg_dialog::display(_("Permission error"), _("You have no permissions to delete this ACL!"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
}
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- msg_dialog::display(_("Permission error"), _("You have no permissions to delete this role!"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
if(isset($this->ui->uid)){
new log("security","aclroles/".get_class($this),$this->dn,array(),"Warning: '".$this->ui->uid."' tried to trick acl role deletion.");
/* Obviously the acl isn't allowed to delete. Show message and
clean session. */
- msg_dialog::display(_("Permission error"), _("You have no permissions to delete this ACL!"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
}
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- msg_dialog::display(_("Permission error"), _("You have no permissions to delete this ACL!"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
if(isset($this->ui->uid)){
new log("security","aclroles/".get_class($this),$this->dn,array(),"Warning: '".$this->ui->uid."' tried to trick acl role deletion.");
diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index adb1bed530fb846dea6441e253cf96e7c5eab90f..7bf6b5959b8da7fbbc840b448c8f4b62f19e5dd6 100644 (file)
$this->deptabs->delete ();
$this->deptabs = NULL;
} else {
- print_red (_("You have no permission to remove this department."));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), WARNING_DIALOG);
}
/* Remove lock file after successfull deletion */
del_lock ($dn);
return ($display);
}
}else{
- print_red (_("You have no permission to remove this department."));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), WARNING_DIALOG);
}
}
if(preg_match("/d/",$acl)){
$this->remove_from_parent();
} else {
- print_red (_("You have no permission to remove this department."));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), WARNING_DIALOG);
}
}
diff --git a/gosa-core/plugins/admin/departments/tabs_department.inc b/gosa-core/plugins/admin/departments/tabs_department.inc
index cf04bd29b5d4721ba38fd10a1d275c149950694d..796bdffe60e9b77f868f8e59c4c561c30e0ff639 100644 (file)
$cnt1 = count(split(",",$this->dn));
$cnt2 = count(split(",",$new_dn));
if((strstr($new_dn,$this->dn))&&($cnt1<$cnt2)){
- print_red(_("Try to move tree failed. Destination tree is subtree of source tree."));
+ msg_dialog::display(_("LDAP error"), _("Moving LDAP tree failed: destination tree is a subtree of the source!"), ERROR_DIALOG);
}else{
/* Prepare to be moved */
$baseobject->recursive_move($this->dn, $new_dn);
diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index 24c16c7bcf35bac7355bc8979153e3038f31e5c8..8f2ff319277e08e3f82b3807086420031c77e3ee 100644 (file)
$this->ridBase= $this->config->current['RIDBASE'];
$this->SID= $this->config->current['SID'];
} else {
- print_red(_("Can't find this groups SID in LDAP or in your configuration file!"));
+ msg_dialog::display(_("Configuration error"), _("Cannot find group SID in your configuration!"), ERROR_DIALOG);
}
}
}
/* If more than max users are found, display a message to warn the user */
- if(($i == $MaxUser)){
- print_red(sprintf(_("Your search method returned more than '%s' users, only '%s' users are shown.") , $MaxUser,$MaxUser));
+ if($i == $MaxUser){
+ msg_dialog::display(_("Configuration error"), sprintf(_("Search returned too many results. Not displaying more than %s entries."), $MaxUser), ERROR_DIALOG);
}
/* Sort lists */
if(isset($this->config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['SID'])){
$this->SID = $this->config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['SID'];
}else{
- print_red(sprintf(_("No configured SID found for '%s'."),$this->sambaDomainName));
+ msg_dialog::display(_("Error"), sprintf(_("Cannot find any SID for '%s'!"), $this->sambaDomainName), ERROR_DIALOG);
}
if(isset($this->config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['RIDBASE'])){
$this->ridBase= $this->config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['RIDBASE'];
}else{
- print_red(sprintf(_("No configured RIDBASE found for '%s'."),$this->sambaDomainName));
+ msg_dialog::display(_("Error"), sprintf(_("Cannot find any RIDBASE for '%s'!"), $this->sambaDomainName), ERROR_DIALOG);
}
$this->attrs['objectClass'][]= 'sambaGroupMapping';
/* Check if id reached maximum */
if ($id >= pow(2,32)){
- print_red(_("Too many users, can't allocate a free ID!"));
+ msg_dialog::display(_("Error"), _("Cannot allocate a free ID!"), ERROR_DIALOG);
exit;
}
}
diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index 868c1e7aaebcc6e58cfb8ec458d0cf2b4d8f287c..e8e19f27f99630785716046f9d10162d9e9c1dbd 100644 (file)
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- print_red (_("You are not allowed to delete this group!"));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
new log("security","groups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
/* Remove lock file after successfull deletion */
} else {
/* Obviously the user isn't allowed to delete. Show message and clean session. */
- print_red (_("You are not allowed to delete this group!"));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
}
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- print_red (_("You are not allowed to delete this group!"));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), ERROR_DIALOG);
new log("security","groups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 56f96280947c145bd39e8ce7a44eb3d1d8320bf2..ca2ef69693c6ea9f32b2abc230c9faa7e817923a 100644 (file)
}
}
if($skipped){
- print_red(_("You can only have terminals or workstations in one group, but not both."));
+ msg_dialog::display(_("Information"), _("You cannot combine terminals and workstations in one object group!"), INFO_DIALOG);
}
$this->reload();
}
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index f7f7caec817b7f788f7c8bbe722e4357303c9222..39c9ea8ba2aebd81d5e6eca82adfa60aecd404c8 100644 (file)
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- print_red (_("You are not allowed to delete this object group!"));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
/* Remove lock file after successfull deletion */
/* Obviously the user isn't allowed to delete. Show message and
clean session. */
- print_red (_("You are not allowed to delete this object group!"));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
}
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- print_red (_("You are not allowed to delete this object group!"));
+ msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}