summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 652a213)
raw | patch | inline | side by side (parent: 652a213)
author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 26 Apr 2010 19:12:14 +0000 (19:12 +0000) | ||
committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 26 Apr 2010 19:12:14 +0000 (19:12 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17861 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc
index 4fac56880775c94670261cc793d1dab2d17ebe2e..63c0c90e35f0bc52424786214fd9bc49aa90491d 100644 (file)
$acl = $this->ui->get_permissions($this->config->current['BASE'],"all/all");
if(!preg_match("/w/",$acl)){
if(isset($_POST['userfile']) || isset($_POST['sorted']) || isset($_POST['fileup'])){
- msg_dialog::display(_("Permission error"), _("You've no permission to import CSV files."), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), _("You've no permission to import CSV files!"), ERROR_DIALOG);
}
return ($smarty->fetch (get_template_path('contentcsv.tpl', TRUE)));
}
(!isset($dat['sn']))||(!isset($dat['givenName']))||(!isset($dat['uid']))){
/* Output Error */
- msg_dialog::display(_("Error"), _("Need at least 'sn', 'givenName' and 'uid' to create users."), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("Need at least %s, %s and %s to create users!"), bold("sn"), bold("givenName"), bold("uid")), ERROR_DIALOG);
} else {
/* Register usertab to trigger edit dialog */
/* Error? */
if ($failing){
- msg_dialog::display(_("Error"), sprintf(_("Cannot insert entry '%s'!"), $failing), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("Cannot add entry %s!"), bold($failing)), ERROR_DIALOG);
}
$smarty->assign("error",$failing);
diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_export.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_export.inc
index 5355a0933d6138d954f22d7889e87e89387e0a2d..da15d57756dd7b8d8176d1935833ce6f87817ab0 100644 (file)
$acls = $this->ui->get_permissions($dn,"ldapmanager/ldif");
$name = "entryExport.ldif";
if(!$ldap->dn_exists($dn)){
- msg_dialog::display(_("Ldap error"),
- sprintf(_("No such object '%s'!"),bold(LDAP::fix($dn))),
+ msg_dialog::display(_("LDAP error"),
+ sprintf(_("No such object %s!"),bold(LDAP::fix($dn))),
ERROR_DIALOG);
$dn ="";
}
// Check permissions before sending the output
if(!preg_match("/r/",$acls)){
msg_dialog::display(_("Permission error"),
- sprintf(_("You have no permission to export '%s'!"),LDAP::fix($dn)),
+ sprintf(_("You have no permission to export %s!"), bold(LDAP::fix($dn))),
ERROR_DIALOG);
}else{
$data = $ldap->generateLdif(LDAP::fix($dn), 'objectClass=*',array(),$scope);
diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
index 99fceb984be58d51402f00805edb26404be917c9..7079845e1066af025f815378f1d4a16efc1700b7 100644 (file)
if(!preg_match("/r/",$acls) && (isset($_POST['sfrmgetsingle']) || isset($_POST['sfrmgetfull']) || isset($_POST['sfrmgetivbb']))){
/* Show error msg */
- msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to export '%s'!"),LDAP::fix($dn)), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to export %s!"), bold(LDAP::fix($dn))), ERROR_DIALOG);
/* Show main page */
$smarty->assign("LDIFError",TRUE);
diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_import.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_import.inc
index ac2a81085f8f349a78a922fe518220862332dfde..003f8028c26d7ff2a44799d22d15205272da751c 100644 (file)
break;
default:
- msg_dialog::display(_("Internal error"), sprintf(_("Undefined flag '%s'!"), $check), ERROR_DIALOG);
+ msg_dialog::display(_("Internal error"), sprintf(_("Undefined flag %s!"), bold($check)), ERROR_DIALOG);
break;
}
}
diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_ldif.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_ldif.inc
index 6256b7831b11902069a844cbfbb0ae3456bdbe8f..cec87e6e7c61ffaae42c06d1b78a5d3a9dc1c583 100644 (file)
static function plInfo()
{
return (array(
- "plShortName" => _("Ldap manager"),
- "plDescription" => _("Ldap manager")." ("._("import")."/"._("export").")",
+ "plShortName" => _("LDAP manager"),
+ "plDescription" => _("LDAP manager")." ("._("import")."/"._("export").")",
"plSelfModify" => FALSE,
"plDepends" => array(),
"plPriority" => 1,
"plSection" => array("addon"),
- "plCategory" => array("ldapmanager" => array("objectClass" => "none", "description" => _("Ldap manager"))),
+ "plCategory" => array("ldapmanager" => array("objectClass" => "none", "description" => _("LDAP manager"))),
"plProvidedAcls" => array()
));