Add configuration for jqueryui plugin

[roundcube.git] / program / steps / settings / delete_identity.inc

diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index 669608e5ec4b87ff35745e8c0a05fb583a3c87a9..6f0cf94bb37901f358b99e7f81983f018c159ee0 100644 (file)
--- a/program/steps/settings/delete_identity.inc
+++ b/program/steps/settings/delete_identity.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/settings/delete_identity.inc                            |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,39 +15,37 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: delete_identity.inc 429 2006-12-22 22:26:24Z thomasb $
+ $Id: delete_identity.inc 4668 2011-04-19 20:41:24Z thomasb $
 
 */
 
-$REMOTE_REQUEST = $_GET['_remote'] ? TRUE : FALSE;
+$iid = get_input_value('_iid', RCUBE_INPUT_GPC);
 
-if ($_GET['_iid'] && preg_match('/^[0-9]+(,[0-9]+)*$/',$_GET['_iid']))
-  {
-  $DB->query("UPDATE ".get_table_name('identities')."
-              SET    del=1
-              WHERE  user_id=?
-              AND    identity_id IN (".$_GET['_iid'].")",
-              $_SESSION['user_id']);
+// check request token
+if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(RCUBE_INPUT_GPC)) {
+  $OUTPUT->show_message('invalidrequest', 'error');
+  rcmail_overwrite_action('identities');
+  return;
+}
 
-  $count = $DB->affected_rows();
-  if ($count)
-    {
-    $commands = show_message('deletedsuccessfully', 'confirmation');
-    }
+if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid))
+{
+  $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));
+  
+  $deleted = !$plugin['abort'] ? $USER->delete_identity($iid) : $plugin['result'];
 
-  // send response
-  if ($REMOTE_REQUEST)
-    rcube_remote_response($commands);
-  }
+  if ($deleted > 0 && $deleted !== false)
+    $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
+  else
+    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($deleted < 0 ? 'nodeletelastidentity' : 'errorsaving'), 'error', null, false);
 
+  // send response
+  if ($OUTPUT->ajax_call)
+    $OUTPUT->send();
+}
 
-if ($REMOTE_REQUEST)
+if ($OUTPUT->ajax_call)
   exit;
 
-
 // go to identities page
-$_action = 'identities';
-
-// overwrite action variable  
-$OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action));
-?>
+rcmail_overwrite_action('identities');