From 5b8cb3aa9c7f40de65e81c41cb42df7b096e0e3b Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 26 Mar 2005 11:27:15 +0000 Subject: [PATCH] fixed deleting of accounts --- lam/templates/delete.php | 186 +++++++++++++++++++-------------------- 1 file changed, 89 insertions(+), 97 deletions(-) diff --git a/lam/templates/delete.php b/lam/templates/delete.php index 13f27e7a..48ef91dc 100644 --- a/lam/templates/delete.php +++ b/lam/templates/delete.php @@ -1,26 +1,31 @@ load_account($_SESSION['delete_dn'][0]); // Show HTML Page echo $_SESSION['header']; echo ""; @@ -78,18 +74,18 @@ if ($_GET['type']) { echo "</head><body>\n"; echo "<form action=\"delete.php\" method=\"post\">\n"; echo "<fieldset class=\"".$_GET['type']."edit-dark\"><legend class=\"".$_GET['type']."edit-bright\"><b>"; - echo _('Please confirm:'); - echo "</b></legend>\n"; + echo _('Please confirm:'); + echo "</b></legend>\n"; echo "<input name=\"type\" type=\"hidden\" value=\"" . $_GET['type'] . "\">\n"; - echo _("Do you really want to remove the following accounts?"); - echo "<br>\n"; + echo "<b>" . _("Do you really want to remove the following accounts?") . "</b>"; + echo "<br><br>\n"; echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >"; for ($i=0; $i<count($users); $i++) { echo "<tr>\n"; - echo "<td>" . _("Account name:") . " $users[$i]</td>\n"; - echo "<td>" . _('DN') . " " . $_SESSION['delete_dn'][$i] . "</td>\n"; + echo "<td><b>" . _("Account name:") . "</b> $users[$i]</td>\n"; + echo "<td><b>" . _('DN') . ":</b> " . $_SESSION['delete_dn'][$i] . "</td>\n"; echo "</tr>\n"; - } + } echo "</table>\n"; echo "<br>\n"; // Print delete rows from modules @@ -97,23 +93,21 @@ if ($_GET['type']) { $modules = array_keys($_SESSION['account']->module); for ($i=0; $i<count($modules); $i++) { $_SESSION['account']->module[$modules[$i]]->display_html_delete($_POST); - } + } echo "</table>\n"; echo "<br>\n"; - echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >"; - echo "<td><input name=\"delete\" type=\"submit\" value=\"" . _('Delete') . "\"></td>\n"; - echo "<td><input name=\"cancel\" type=\"submit\" value=\"" . _('Cancel') . "\"></td>\n"; - echo "</table>\n"; + echo "<input name=\"delete\" type=\"submit\" value=\"" . _('Delete') . "\"> \n"; + echo "<input name=\"cancel\" type=\"submit\" value=\"" . _('Cancel') . "\">\n"; echo "</fieldset>\n"; echo "</form>\n"; echo "</body>\n"; echo "</html>\n"; - } +} if ($_POST['cancel']) { if (isset($_SESSION['delete_dn'])) unset($_SESSION['delete_dn']); metaRefresh("lists/list" . $_POST['type'] . "s.php"); - } +} if ($_POST['delete']) { // Show HTML Page @@ -126,10 +120,9 @@ if ($_POST['delete']) { echo "<form action=\"delete.php\" method=\"post\">\n"; echo "<input name=\"type\" type=\"hidden\" value=\"" . $_POST['type'] . "\">\n"; echo "<fieldset class=\"".$_POST['type']."edit-dark\"><legend class=\"".$_POST['type']."edit-bright\"><b>"; - echo _('Deleting. Please stand by ...'); - echo "</b></legend>\n"; + echo _('Deleting. Please stand by ...'); + echo "</b></legend>\n"; - echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >"; // Delete dns for ($m=0; $m<count($_SESSION['delete_dn']); $m++) { // Set to true if an real error has happened @@ -154,95 +147,94 @@ if ($_POST['delete']) { for ($j=0; $j<count($ops); $j++) { $attrs = array_keys($temp[$DNs[$i]][$ops[$j]]); for ($k=0; $k<count($attrs); $k++) - $attributes[$DNs[$i]][$ops[$j]][$attrs[$k]] = array_unique($attributes[$DNs[$i]][$ops[$j]][$attrs[$k]]); - } + $attributes[$DNs[$i]][$ops[$j]][$attrs[$k]] = array_unique($attributes[$DNs[$i]][$ops[$j]][$attrs[$k]]); } } } + } $DNs = array_keys($attributes); for ($i=0; $i<count($DNs); $i++) { if (isset($attributes[$DNs[$i]]['errors'])) { foreach ($attributes[$DNs[$i]]['errors'] as $singleerror) { $errors[] = $singleerror; - if ($singleerror[0] = 'ERROR') $stopprocessing = true; - } + if ($singleerror[0] == 'ERROR') $stopprocessing = true; } + } if (!$stopprocessing) { // modify attributes if (isset($attributes[$DNs[$i]]['modify']) && !$stopprocessing) { - $success = @ldap_mod_replace($_SESSION[$_SESSION['account']->ldap]->server(), $DNs[$i], $attributes[$DNs[$i]]['modify']); + $success = @ldap_mod_replace($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['modify']); if (!$success) { - $errors[] = array ('ERROR', 'LDAP', sprintf(_('Was unable to modify attribtues from DN: %s.'), $DNs[$i])); + $errors[] = array ('ERROR', sprintf(_('Was unable to modify attribtues from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; - } - else - $_SESSION['cache']->update_cache($DNs[$i], 'modify', $attributes[$DNs[$i]]['modify']); } + else $_SESSION['cache']->update_cache($DNs[$i], 'modify', $attributes[$DNs[$i]]['modify']); + } // add attributes if (isset($attributes[$DNs[$i]]['add']) && !$stopprocessing) { - $success = @ldap_mod_add($_SESSION[$_SESSION['account']->ldap]->server(), $DNs[$i], $attributes[$DNs[$i]]['add']); + $success = @ldap_mod_add($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['add']); if (!$success) { - $errors[] = array ('ERROR', 'LDAP', sprintf(_('Was unable to add attribtues to DN: %s.'), $DNs[$i])); + $errors[] = array ('ERROR', sprintf(_('Was unable to add attribtues to DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; - } - else - $_SESSION['cache']->update_cache($DNs[$i], 'add', $attributes[$DNs[$i]]['add']); } + else $_SESSION['cache']->update_cache($DNs[$i], 'add', $attributes[$DNs[$i]]['add']); + } // removce attributes if (isset($attributes[$DNs[$i]]['remove']) && !$stopprocessing) { - $success = @ldap_mod_del($_SESSION[$_SESSION['account']->ldap]->server(), $DNs[$i], $attributes[$DNs[$i]]['remove']); + $success = @ldap_mod_del($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['remove']); if (!$success) { - $errors[] = array ('ERROR', 'LDAP', sprintf(_('Was unable to remove attribtues from DN: %s.'), $DNs[$i])); + $errors[] = array ('ERROR', sprintf(_('Was unable to remove attribtues from DN: %s.'), $DNs[$i]), ldap_error($_SESSION['ldap']->server())); $stopprocessing = true; - } - else - $_SESSION['cache']->update_cache($DNs[$i], 'remove', $attributes[$DNs[$i]]['remove']); } + else $_SESSION['cache']->update_cache($DNs[$i], 'remove', $attributes[$DNs[$i]]['remove']); } } + } if (!$stopprocessing) { foreach ($attributes as $DN) { if (is_array($DN['lamdaemon']['command'])) $result = lamdaemon($DN['lamdaemon']['command']); - // Error somewhere in lamdaemon + if (!is_array($result)) continue; + // check for error somewhere in lamdaemon foreach ($result as $singleresult) { if (is_array($singleresult)) { - if ($singleresult[0] = 'ERROR') $stopprocessing = true; - $temparray[0] = $singleresult[0]; - $temparray[1] = _($singleresult[1]); - $temparray[2] = _($singleresult[2]); + if ($singleresult[0] == 'ERROR') { + $stopprocessing = true; + $temparray[0] = $singleresult[0]; + $temparray[1] = $singleresult[1]; + $temparray[2] = $singleresult[2]; + $errors[] = $temparray; } } } } - if (!$stopprocessing) { - $success = @ldap_delete($_SESSION[$_SESSION['account']->ldap]->server(), $_SESSION['delete_dn'][$m]); - if (!$success) $errors[] = array ('ERROR', 'LDAP', sprintf(_('Was unable to remove attribtues from DN: %s.'), $DNs[$i])); - else - $_SESSION['cache']->update_cache($_SESSION['delete_dn'][$m], 'delete_dn'); - } - if (!$stopprocessing) { - echo "<tr>\n"; - echo "<td>" . sprintf(_('Deleted DN: %s'), $_SESSION['delete_dn'][$m]) . "</td>\n"; - echo "</tr>\n"; - foreach ($errors as $error) StatusMessage($error[0], $error[1], $error[2]); - } - else { - echo "<tr>\n"; - echo "<td>" . sprintf(_('Error while deleting DN: %s'), $_SESSION['delete_dn'][$m]) . "</td>\n"; - echo "</tr>\n"; - foreach ($errors as $error) StatusMessage($error[0], $error[1], $error[2]); - } } - echo "</table>\n"; + if (!$stopprocessing) { + $success = @ldap_delete($_SESSION['ldap']->server(), $_SESSION['delete_dn'][$m]); + if (!$success) { + $errors[] = array ('ERROR', sprintf(_('Was unable to delete DN: %s.'), $_SESSION['delete_dn'][$m]), ldap_error($_SESSION['ldap']->server())); + $stopprocessing = true; + } + else + $_SESSION['cache']->update_cache($_SESSION['delete_dn'][$m], 'delete_dn'); + } + if (!$stopprocessing) { + echo sprintf(_('Deleted DN: %s'), $_SESSION['delete_dn'][$m]) . "<br>\n"; + foreach ($errors as $error) StatusMessage($error[0], $error[1], $error[2]); + echo "<br>\n"; + } + else { + echo sprintf(_('Error while deleting DN: %s'), $_SESSION['delete_dn'][$m]) . "<br>\n"; + foreach ($errors as $error) StatusMessage($error[0], $error[1], $error[2]); + echo "<br>\n"; + } + } echo "<br>\n"; - echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >"; - echo "<td><input name=\"cancel\" type=\"submit\" value=\"" . _('Back to list') . "\"></td>\n"; - echo "</table>\n"; + echo "<br><input name=\"cancel\" type=\"submit\" value=\"" . _('Back to list') . "\">\n"; echo "</fieldset>\n"; echo "</form>\n"; echo "</body>\n"; echo "</html>\n"; - } +} ?>