From 1971ddc1dd0eb9bf07f17f72dde48d7edca7b69b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 24 Oct 2008 04:30:52 -0400
Subject: [PATCH] - last commit fix
---
program/steps/addressbook/save.inc | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 72e54b1..07f7460 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -28,7 +28,7 @@
}
// check input
-if ((!get_input_value('_name', RCUBE_INPUT_POST) || !get_input_value('_email', RCUBE_INPUT_POST)) && $_framed)
+if ((!get_input_value('_name', RCUBE_INPUT_POST) || !get_input_value('_email', RCUBE_INPUT_POST)))
{
$OUTPUT->show_message('formincomplete', 'warning');
rcmail_overwrite_action(empty($_POST['_cid']) ? 'add' : 'show');
@@ -54,18 +54,15 @@
{
if ($CONTACTS->update($cid, $a_record))
{
- if ($_framed)
- {
- // define list of cols to be displayed
- $a_js_cols = array();
- $record = $CONTACTS->get_record($cid, true);
+ // define list of cols to be displayed
+ $a_js_cols = array();
+ $record = $CONTACTS->get_record($cid, true);
- foreach (array('name', 'email') as $col)
- $a_js_cols[] = (string)$record[$col];
+ 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);
- }
+ // update the changed col in list
+ $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols);
// show confirmation
$OUTPUT->show_message('successfullysaved', 'confirmation');
@@ -83,7 +80,7 @@
else
{
// check for existing contacts
- $existing = $CONTACTS->search('email', $a_record['email'], false);
+ $existing = $CONTACTS->search('email', $a_record['email'], true, false);
// show warning message
if ($existing->count)
@@ -96,19 +93,16 @@
// insert record and send response
if ($insert_id = $CONTACTS->insert($a_record))
{
- if ($_framed)
- {
- // add contact row or jump to the page where it should appear
- $CONTACTS->reset();
- $result = $CONTACTS->search($CONTACTS->primary_key, $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);
+ 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());
- }
+ // update record count display
+ $CONTACTS->reset();
+ $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
// show confirmation
$OUTPUT->show_message('successfullysaved', 'confirmation');
--
Gitblit v1.9.1