From 6f096812c9fd460fddd21ff1cef55542cb79a890 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 02 Nov 2010 05:27:03 -0400
Subject: [PATCH] - Support contact's email addresses up to 255 characters long (#1487095) - Added email format checks when saving contacts data
---
program/steps/addressbook/save.inc | 246 ++++++++++++++++++++++---------------------------
1 files changed, 111 insertions(+), 135 deletions(-)
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index c0afd23..f074f18 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -4,9 +4,9 @@
+-----------------------------------------------------------------------+
| program/steps/addressbook/save.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Save a contact entry or to add a new one |
@@ -19,150 +19,126 @@
*/
+$cid = get_input_value('_cid', RCUBE_INPUT_POST);
+$return_action = empty($cid) ? 'add' : 'edit';
+// cannot edit record
+if ($CONTACTS->readonly) {
+ $OUTPUT->show_message('contactreadonly', 'error');
+ rcmail_overwrite_action($return_action);
+ return;
+}
+
+// Basic input checks
+if ((!get_input_value('_name', RCUBE_INPUT_POST) || !get_input_value('_email', RCUBE_INPUT_POST))) {
+ $OUTPUT->show_message('formincomplete', 'warning');
+ rcmail_overwrite_action($return_action);
+ return;
+}
+
+
+// setup some vars we need
$a_save_cols = array('name', 'firstname', 'surname', 'email');
+$a_record = array();
+// read POST values into hash array
+foreach ($a_save_cols as $col) {
+ $fname = '_'.$col;
+ if (isset($_POST[$fname]))
+ $a_record[$col] = get_input_value($fname, RCUBE_INPUT_POST);
+}
+
+// Validity checks
+$_email = idn_to_ascii($a_record['email']);
+if (!check_email($_email, false)) {
+ $OUTPUT->show_message('emailformaterror', 'warning', array('email' => $_email));
+ rcmail_overwrite_action($return_action);
+ return;
+}
// update an existing contact
-if ($_POST['_cid'])
- {
- $a_write_sql = array();
+if (!empty($cid))
+{
+ $plugin = $RCMAIL->plugins->exec_hook('contact_update',
+ array('id' => $cid, 'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
+ $a_record = $plugin['record'];
- foreach ($a_save_cols as $col)
- {
- $fname = '_'.$col;
- if (!isset($_POST[$fname]))
- continue;
-
- $a_write_sql[] = sprintf("%s='%s'", $col, addslashes($_POST[$fname]));
- }
-
- if (sizeof($a_write_sql))
- {
- $DB->query(sprintf("UPDATE %s
- SET %s
- WHERE contact_id=%d
- AND user_id=%d
- AND del!='1'",
- get_table_name('contacts'),
- join(', ', $a_write_sql),
- $_POST['_cid'],
- $_SESSION['user_id']));
-
- $updated = $DB->affected_rows();
- }
-
- if ($updated)
- {
- $_action = 'show';
- show_message('successfullysaved', 'confirmation');
-
- if ($_POST['_framed'])
- {
- // define list of cols to be displayed
- $a_show_cols = array('name', 'email');
- $a_js_cols = array();
-
- $sql_result = $DB->query(sprintf("SELECT * FROM %s
- WHERE contact_id=%d
- AND user_id=%d
- AND del!='1'",
- get_table_name('contacts'),
- $_POST['_cid'],
- $_SESSION['user_id']));
-
- $sql_arr = $DB->fetch_assoc($sql_result);
- foreach ($a_show_cols as $col)
- $a_js_cols[] = (string)$sql_arr[$col];
-
- // update the changed col in list
- $OUTPUT->add_script(sprintf("if(parent.%s)parent.%s.update_contact_row('%d', %s);",
- $JS_OBJECT_NAME,
- $JS_OBJECT_NAME,
- $_POST['_cid'],
- array2js($a_js_cols)));
-
- // show confirmation
- show_message('successfullysaved', 'confirmation');
- }
- }
+ if (!$plugin['abort'])
+ $result = $CONTACTS->update($cid, $a_record);
else
- {
- // show error message
- show_message('errorsaving', 'error');
- $_action = 'show';
+ $result = $plugin['result'];
+
+ if ($result) {
+ // LDAP DN change
+ if (is_string($result) && strlen($result)>1) {
+ $newcid = $result;
+ // change cid in POST for 'show' action
+ $_POST['_cid'] = $newcid;
}
+
+ // define list of cols to be displayed
+ $a_js_cols = array();
+ $record = $CONTACTS->get_record($newcid ? $newcid : $cid, true);
+
+ foreach (array('name', 'email') as $col)
+ $a_js_cols[] = (string)$record[$col];
+
+ // update the changed col in list
+ $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols, $newcid);
+
+ // show confirmation
+ $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+ rcmail_overwrite_action('show');
}
+ else {
+ // show error message
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+ rcmail_overwrite_action('show');
+ }
+}
// insert a new contact
-else
- {
- $a_insert_cols = $a_insert_values = array();
+else {
+ // check for existing contacts
+ $existing = $CONTACTS->search('email', $a_record['email'], true, false);
- foreach ($a_save_cols as $col)
- {
- $fname = '_'.$col;
- if (!isset($_POST[$fname]))
- continue;
-
- $a_insert_cols[] = $col;
- $a_insert_values[] = sprintf("'%s'", addslashes($_POST[$fname]));
- }
-
- if (sizeof($a_insert_cols))
- {
- $DB->query(sprintf("INSERT INTO %s
- (user_id, %s)
- VALUES (%d, %s)",
- get_table_name('contacts'),
- join(', ', $a_insert_cols),
- $_SESSION['user_id'],
- join(', ', $a_insert_values)));
-
- $insert_id = $DB->insert_id();
- }
-
- if ($insert_id)
- {
- $_action = 'show';
- $_GET['_cid'] = $insert_id;
-
- if ($_POST['_framed'])
- {
- // add contact row or jump to the page where it should appear
- $commands = sprintf("if(parent.%s)parent.", $JS_OBJECT_NAME);
- $sql_result = $DB->query(sprintf("SELECT * FROM %s
- WHERE contact_id=%d
- AND user_id=%d",
- get_table_name('contacts'),
- $insert_id,
- $_SESSION['user_id']));
- $commands .= rcmail_js_contacts_list($sql_result, $JS_OBJECT_NAME);
-
- $commands .= sprintf("if(parent.%s)parent.%s.select('%d');\n",
- $JS_OBJECT_NAME,
- $JS_OBJECT_NAME,
- $insert_id);
-
- // update record count display
- $commands .= sprintf("if(parent.%s)parent.%s.set_rowcount('%s');\n",
- $JS_OBJECT_NAME,
- $JS_OBJECT_NAME,
- rcmail_get_rowcount_text());
-
- $OUTPUT->add_script($commands);
-
- // show confirmation
- show_message('successfullysaved', 'confirmation');
- }
- }
- else
- {
- // show error message
- show_message('errorsaving', 'error');
- $_action = 'add';
- }
+ // show warning message
+ if ($existing->count) {
+ $OUTPUT->show_message('contactexists', 'warning', null, false);
+ rcmail_overwrite_action('add');
+ return;
}
+ $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
+ 'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
+ $a_record = $plugin['record'];
-?>
\ No newline at end of file
+ // insert record and send response
+ if (!$plugin['abort'])
+ $insert_id = $CONTACTS->insert($a_record);
+ else
+ $insert_id = $plugin['result'];
+
+
+ if ($insert_id) {
+ // add contact row or jump to the page where it should appear
+ $CONTACTS->reset();
+ $result = $CONTACTS->search($CONTACTS->primary_key, $insert_id);
+
+ rcmail_js_contacts_list($result, 'parent.');
+ $OUTPUT->command('parent.contact_list.select', $insert_id);
+
+ // update record count display
+ $CONTACTS->reset();
+ $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
+
+ // show confirmation
+ $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+ $OUTPUT->send('iframe');
+ }
+ else {
+ // show error message
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+ rcmail_overwrite_action('add');
+ }
+}
--
Gitblit v1.9.1