From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 09:03:53 -0400
Subject: [PATCH] - s/RoundCube/Roundcube/
---
program/steps/settings/save_identity.inc | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index b34575d..895ddea 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/steps/settings/save_identity.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -60,7 +60,11 @@
// update an existing contact
if ($_POST['_iid'])
{
- if ($updated = $USER->update_identity(get_input_value('_iid', RCUBE_INPUT_POST), $save_data))
+ $iid = get_input_value('_iid', RCUBE_INPUT_POST);
+ $plugin = $RCMAIL->plugins->exec_hook('identity_update', array('id' => $iid, 'record' => $save_data));
+ $save_data = $plugin['record'];
+
+ if (!$plugin['abort'] && ($updated = $USER->update_identity($iid, $save_data)))
{
$OUTPUT->show_message('successfullysaved', 'confirmation');
@@ -73,10 +77,10 @@
// ...
}
}
- else if ($DB->is_error())
+ else if ($plugin['abort'] || $DB->is_error())
{
// show error message
- $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->show_message('errorsaving', 'error', null, false);
rcmail_overwrite_action('edit-identity');
return;
}
@@ -86,11 +90,14 @@
else if (IDENTITIES_LEVEL < 2)
{
if (IDENTITIES_LEVEL == 1)
- $save_data['email'] = rcmail_get_email();
+ $save_data['email'] = $RCMAIL->user->get_username();
- if ($save_data['email'] && ($insert_id = $USER->insert_identity($save_data)))
+ $plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data));
+ $save_data = $plugin['record'];
+
+ if (!$plugin['abort'] && $save_data['email'] && ($insert_id = $USER->insert_identity($save_data)))
{
- $OUTPUT->show_message('successfullysaved', 'confirmation');
+ $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
$_GET['_iid'] = $insert_id;
@@ -100,7 +107,7 @@
else
{
// show error message
- $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->show_message('errorsaving', 'error', null, false);
rcmail_overwrite_action('edit-identity');
return;
}
@@ -116,4 +123,4 @@
// go to next step
rcmail_overwrite_action('identities');
-?>
+
--
Gitblit v1.9.1