From 15cf4fa9251f01313b5eb5cf1a91ec10643d42cb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 21 Nov 2012 13:55:34 -0500
Subject: [PATCH] Rename rcube_bc.inc to bc.php for consistency
---
program/steps/settings/save_identity.inc | 114 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 41 deletions(-)
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index 8673d40..8515c44 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/settings/save_identity.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Save an identity record or to add a new one |
@@ -14,25 +17,21 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));
$a_save_cols = array('name', 'email', 'organization', 'reply-to', 'bcc', 'standard', 'signature', 'html_signature');
-$a_html_cols = array('signature');
$a_boolean_cols = array('standard', 'html_signature');
$updated = $default_id = false;
// check input
if (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3))
- {
+{
$OUTPUT->show_message('formincomplete', 'warning');
rcmail_overwrite_action('edit-identity');
return;
- }
+}
$save_data = array();
@@ -40,7 +39,7 @@
{
$fname = '_'.$col;
if (isset($_POST[$fname]))
- $save_data[$col] = get_input_value($fname, RCUBE_INPUT_POST, in_array($col, $a_html_cols));
+ $save_data[$col] = get_input_value($fname, RCUBE_INPUT_POST, true);
}
// set "off" values for checkboxes that were not checked, and therefore
@@ -56,6 +55,21 @@
if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3)
unset($save_data['email']);
+// Validate e-mail addresses
+$email_checks = array(rcube_idn_to_ascii($save_data['email']));
+foreach (array('reply-to', 'bcc') as $item) {
+ foreach (rcube_mime::decode_address_list($save_data[$item], null, false) as $rcpt)
+ $email_checks[] = rcube_idn_to_ascii($rcpt['mailto']);
+}
+
+foreach ($email_checks as $email) {
+ if ($email && !check_email($email)) {
+ // show error message
+ $OUTPUT->show_message('emailformaterror', 'error', array('email' => rcube_idn_to_utf8($email)), false);
+ rcmail_overwrite_action('edit-identity');
+ return;
+ }
+}
// update an existing contact
if ($_POST['_iid'])
@@ -64,24 +78,29 @@
$plugin = $RCMAIL->plugins->exec_hook('identity_update', array('id' => $iid, 'record' => $save_data));
$save_data = $plugin['record'];
- if (!$plugin['abort']) {
- if ($updated = $USER->update_identity($iid, $save_data)) {
- $OUTPUT->show_message('successfullysaved', 'confirmation');
+ if ($save_data['email'])
+ $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
+ if (!$plugin['abort'])
+ $updated = $RCMAIL->user->update_identity($iid, $save_data);
+ else
+ $updated = $plugin['result'];
- if (!empty($_POST['_standard']))
- $default_id = get_input_value('_iid', RCUBE_INPUT_POST);
+ if ($updated) {
+ $OUTPUT->show_message('successfullysaved', 'confirmation');
- if ($_POST['_framed']) {
- // update the changed col in list
- // ...
- }
+ if (!empty($_POST['_standard']))
+ $default_id = get_input_value('_iid', RCUBE_INPUT_POST);
+
+ if ($_POST['_framed']) {
+ // update the changed col in list
+ $OUTPUT->command('parent.update_identity_row', $iid, Q(trim($save_data['name'] . ' <' . rcube_idn_to_utf8($save_data['email']) .'>')));
}
- else if ($DB->is_error()) {
- // show error message
- $OUTPUT->show_message('errorsaving', 'error', null, false);
- rcmail_overwrite_action('edit-identity');
- return;
- }
+ }
+ else {
+ // show error message
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+ rcmail_overwrite_action('edit-identity');
+ return;
}
}
@@ -94,21 +113,32 @@
$plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data));
$save_data = $plugin['record'];
- if (!$plugin['abort']) {
- if ($save_data['email'] && ($insert_id = $USER->insert_identity($save_data))) {
- $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+ if ($save_data['email'])
+ $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
- $_GET['_iid'] = $insert_id;
+ if (!$plugin['abort'])
+ $insert_id = $save_data['email'] ? $RCMAIL->user->insert_identity($save_data) : null;
+ else
+ $insert_id = $plugin['result'];
- if (!empty($_POST['_standard']))
- $default_id = $insert_id;
+ if ($insert_id) {
+ $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+
+ $_GET['_iid'] = $insert_id;
+
+ if (!empty($_POST['_standard']))
+ $default_id = $insert_id;
+
+ if ($_POST['_framed']) {
+ // add a new row to the list
+ $OUTPUT->command('parent.update_identity_row', $insert_id, Q(trim($save_data['name'] . ' <' . rcube_idn_to_utf8($save_data['email']) .'>')), true);
}
- else {
- // show error message
- $OUTPUT->show_message('errorsaving', 'error', null, false);
- rcmail_overwrite_action('edit-identity');
- return;
- }
+ }
+ else {
+ // show error message
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+ rcmail_overwrite_action('edit-identity');
+ return;
}
}
else
@@ -117,9 +147,11 @@
// mark all other identities as 'not-default'
if ($default_id)
- $USER->set_default($default_id);
+ $RCMAIL->user->set_default($default_id);
// go to next step
-rcmail_overwrite_action('identities');
-
-
+if (!empty($_REQUEST['_framed'])) {
+ rcmail_overwrite_action('edit-identity');
+}
+else
+ rcmail_overwrite_action('identities');
--
Gitblit v1.9.1