Imported Upstream version 0.3

[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 84f5c33d93b8dcb3c835ba7eb311952dd34a0ce5..c3410603c33b496a9fda5fbc1ebacda621390612 100644 (file)
--- 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-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,17 +15,28 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: delete_identity.inc 2008 2008-10-24 08:30:52Z alec $
+ $Id: delete_identity.inc 2779 2009-07-21 16:13:42Z thomasb $
 
 */
 
-if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids))
+$iid = get_input_value('_iid', RCUBE_INPUT_GPC);
+
+// check request token
+if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(RCUBE_INPUT_GPC)) {
+  $OUTPUT->show_message('invalidrequest', 'error');
+  rcmail_overwrite_action('identities');
+  return;
+}
+
+if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid))
 {
-  if ($USER->delete_identity($ids)) {
-    $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
+  $plugin = $RCMAIL->plugins->exec_hook('delete_identity', array('id' => $iid));
+  
+  if (!$plugin['abort'] && $USER->delete_identity($iid)) {
+    $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
   }
   else {
-    $OUTPUT->show_message('nodeletelastidentity', 'error');
+    $OUTPUT->show_message('nodeletelastidentity', 'error', null, false);
   }
   // send response
   if ($OUTPUT->ajax_call)