From c1b3c4cc3168d41b97256bcc3d8dd70d2a404788 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 19 May 2008 13:47:45 -0400
Subject: [PATCH] Don't check for non-existing property -> fix address book
---
program/steps/addressbook/save.inc | 38 ++++++++++++++++----------------------
program/steps/settings/save_identity.inc | 10 ++--------
2 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 94a0d58..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)) && $OUTPUT->action)
+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 ($OUTPUT->action)
- {
- // 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');
@@ -96,19 +93,16 @@
// insert record and send response
if ($insert_id = $CONTACTS->insert($a_record))
{
- if ($OUTPUT->action)
- {
- // 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');
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index a35d2d7..1eb9a90 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -76,7 +76,7 @@
}
}
-// insert a new contact
+// insert a new identity record
else
{
if ($insert_id = $USER->insert_identity($save_data))
@@ -87,12 +87,6 @@
if (!empty($_POST['_standard']))
$default_id = $insert_id;
-
- if ($_POST['_framed'])
- {
- // add contact row or jump to the page where it should appear
- // ....
- }
}
else
{
@@ -109,6 +103,6 @@
$USER->set_default($default_id);
// go to next step
-rcmail_overwrite_action($OUTPUT->action ? 'edit-identity' : 'identities');
+rcmail_overwrite_action('identities');
?>
\ No newline at end of file
--
Gitblit v1.9.1