Don't check for non-existing property -> fix address book

2 files changed, 22 insertions, 34 deletions

diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 94a0d587d..07f74602c 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -28,7 +28,7 @@ if ($CONTACTS->readonly)
 }
 
 // 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 (!empty($cid))
 {
   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);
-
-      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);
-    }
+    // 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];
+
+    // 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 @@ else
   // 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);
-
-      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());
-    }
+    // 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');
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index a35d2d73d..1eb9a9026 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -76,7 +76,7 @@ if ($_POST['_iid'])
   }
 }
 
-// insert a new contact
+// insert a new identity record
 else
 {
   if ($insert_id = $USER->insert_identity($save_data))
@@ -87,12 +87,6 @@ else
 
     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 @@ if ($default_id)
   $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