From 1971ddc1dd0eb9bf07f17f72dde48d7edca7b69b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 24 Oct 2008 04:30:52 -0400
Subject: [PATCH] - last commit fix
---
program/steps/settings/delete_identity.inc | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index 560a2b1..a72a8a7 100644
--- a/program/steps/settings/delete_identity.inc
+++ b/program/steps/settings/delete_identity.inc
@@ -5,7 +5,7 @@
| program/steps/settings/delete_identity.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -20,32 +20,22 @@
*/
if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids))
- {
- $DB->query("UPDATE ".get_table_name('identities')."
- SET del=1
- WHERE user_id=?
- AND identity_id IN (".$ids.")",
- $_SESSION['user_id']);
-
- $count = $DB->affected_rows();
- if ($count)
- {
- $commands = show_message('deletedsuccessfully', 'confirmation');
- }
-
- // send response
- if ($REMOTE_REQUEST)
- rcube_remote_response($commands);
+{
+ if ($USER->delete_identity($ids)) {
+ $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
}
+ else {
+ $OUTPUT->show_message('nodeletelastidentity', 'error');
+ }
+ // send response
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->send();
+}
-
-if ($REMOTE_REQUEST)
+if ($OUTPUT->ajax_call)
exit;
-
// go to identities page
-$_action = 'identities';
+rcmail_overwrite_action('identities');
-// overwrite action variable
-$OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action));
?>
--
Gitblit v1.9.1