From 5b8e3624f6b125a906744b2348d0c77d2e2738ca Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 11 May 2011 15:04:24 +0000 Subject: [PATCH] fixed typos --- lam/help/help.inc | 2 +- lam/lib/modules.inc | 12 ++++++------ lam/templates/delete.php | 6 +++--- lam/templates/tree/add_oclass.php | 2 +- lam/templates/tree/add_oclass_form.php | 2 +- lam/templates/tree/update.php | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lam/help/help.inc b/lam/help/help.inc index 40df0193..aaf2db72 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -182,7 +182,7 @@ $helpArray = array ( "510" => array ("Headline" => _("Additional CSS links"), "Text" => _("Here you can specify additional CSS links to change the layout of the self service pages. This is useful to adapt them to your corporate design. Please enter one link per line.")), "520" => array ("Headline" => _("Generate random password"), - "Text" => _("This will set a random password and display it on the screen or send it the user via mail. Please edit your LAM server profile to setup the mail settings.")), + "Text" => _("This will set a random password and display it on the screen or send it to the user via mail. Please edit your LAM server profile to setup the mail settings.")), "550" => array ("Headline" => _("From address"), "Text" => _("This email address will be set as sender address of all password mails. If empty the system default (php.ini) will be used.")), "551" => array ("Headline" => _("Subject"), diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 72d16783..0cbbea6f 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -1700,8 +1700,8 @@ class accountContainer { if (isset($attributes[$DNs[$i]]['modify']) && !$stopprocessing) { $success = @ldap_mod_replace($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['modify']); if (!$success) { - logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to modify attribtues from DN: ' . $DNs[$i] . ' (' . ldap_err2str(ldap_errno($_SESSION['ldap']->server())) . ').'); - $errors[] = array('ERROR', sprintf(_('Was unable to modify attribtues from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); + logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to modify attributes from DN: ' . $DNs[$i] . ' (' . ldap_err2str(ldap_errno($_SESSION['ldap']->server())) . ').'); + $errors[] = array('ERROR', sprintf(_('Was unable to modify attributes from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; } else { @@ -1712,8 +1712,8 @@ class accountContainer { if (isset($attributes[$DNs[$i]]['add']) && !$stopprocessing) { $success = @ldap_mod_add($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['add']); if (!$success) { - logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to add attribtues to DN: ' . $DNs[$i] . ' (' . ldap_err2str(ldap_errno($_SESSION['ldap']->server())) . ').'); - $errors[] = array('ERROR', sprintf(_('Was unable to add attribtues to DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); + logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to add attributes to DN: ' . $DNs[$i] . ' (' . ldap_err2str(ldap_errno($_SESSION['ldap']->server())) . ').'); + $errors[] = array('ERROR', sprintf(_('Was unable to add attributes to DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; } else { @@ -1724,8 +1724,8 @@ class accountContainer { if (isset($attributes[$DNs[$i]]['remove']) && !$stopprocessing) { $success = @ldap_mod_del($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['remove']); if (!$success) { - logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to delete attribtues from DN: ' . $DNs[$i] . ' (' . ldap_err2str(ldap_errno($_SESSION['ldap']->server())) . ').'); - $errors[] = array('ERROR', sprintf(_('Was unable to remove attribtues from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); + logNewMessage(LOG_ERR, '[' . $ldapUser .'] Unable to delete attributes from DN: ' . $DNs[$i] . ' (' . ldap_err2str(ldap_errno($_SESSION['ldap']->server())) . ').'); + $errors[] = array('ERROR', sprintf(_('Was unable to remove attributes from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; } else { diff --git a/lam/templates/delete.php b/lam/templates/delete.php index a1e5be11..3b7d1cde 100644 --- a/lam/templates/delete.php +++ b/lam/templates/delete.php @@ -204,7 +204,7 @@ if (isset($_POST['delete'])) { if (isset($attributes[$DNs[$i]]['modify']) && !$stopprocessing) { $success = @ldap_mod_replace($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['modify']); if (!$success) { - $errors[] = array ('ERROR', sprintf(_('Was unable to modify attribtues from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); + $errors[] = array ('ERROR', sprintf(_('Was unable to modify attributes from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; $allOk = false; } @@ -213,7 +213,7 @@ if (isset($_POST['delete'])) { if (isset($attributes[$DNs[$i]]['add']) && !$stopprocessing) { $success = @ldap_mod_add($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['add']); if (!$success) { - $errors[] = array ('ERROR', sprintf(_('Was unable to add attribtues to DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); + $errors[] = array ('ERROR', sprintf(_('Was unable to add attributes to DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; $allOk = false; } @@ -222,7 +222,7 @@ if (isset($_POST['delete'])) { if (isset($attributes[$DNs[$i]]['remove']) && !$stopprocessing) { $success = @ldap_mod_del($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['remove']); if (!$success) { - $errors[] = array ('ERROR', sprintf(_('Was unable to remove attribtues from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); + $errors[] = array ('ERROR', sprintf(_('Was unable to remove attributes from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; $allOk = false; } diff --git a/lam/templates/tree/add_oclass.php b/lam/templates/tree/add_oclass.php index 03083153..6a9aeace 100644 --- a/lam/templates/tree/add_oclass.php +++ b/lam/templates/tree/add_oclass.php @@ -90,7 +90,7 @@ if( ! $add_res ) echo "LDAP Account Manager\n"; echo "\n"; echo "\n"; - StatusMessage('ERROR', _("Was unable to modify attribtues from DN: %s."), ldap_error( $ds ), array($dn)); + StatusMessage('ERROR', _("Was unable to modify attributes from DN: %s."), ldap_error( $ds ), array($dn)); echo ""; } else diff --git a/lam/templates/tree/add_oclass_form.php b/lam/templates/tree/add_oclass_form.php index d3d01c23..844601f2 100644 --- a/lam/templates/tree/add_oclass_form.php +++ b/lam/templates/tree/add_oclass_form.php @@ -159,7 +159,7 @@ else echo "LDAP Account Manager\n"; echo "\n"; echo "\n"; - StatusMessage('ERROR', _("Was unable to modify attribtues from DN: %s."), ldap_error( $ds ), array($dn)); + StatusMessage('ERROR', _("Was unable to modify attributes from DN: %s."), ldap_error( $ds ), array($dn)); echo ""; } else diff --git a/lam/templates/tree/update.php b/lam/templates/tree/update.php index 816fb428..7aba5036 100644 --- a/lam/templates/tree/update.php +++ b/lam/templates/tree/update.php @@ -106,7 +106,7 @@ else echo "\n"; echo "\n"; echo ""; - StatusMessage('ERROR', _("Was unable to modify attribtues from DN: %s."), ldap_error( $ds ), array($dn)); + StatusMessage('ERROR', _("Was unable to modify attributes from DN: %s."), ldap_error( $ds ), array($dn)); echo ""; }