Imported Upstream version 0.2~alpha

[roundcube.git] / program / steps / addressbook / save.inc

diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index f80f6ce442fae33c1c51ee182cbcdc4e654cce8a..234a3c9909e8be5f85fae15b72b1ee6f5c317295 100644 (file)
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: save.inc 638 2007-07-03 17:25:05Z thomasb $
+ $Id: save.inc 1407 2008-05-19 17:47:45Z thomasb $
 
 */
 
@@ -28,7 +28,7 @@ if ($CONTACTS->readonly)
 }
 
 // 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 (!empty($cid))
 {
   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);
-
-      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 ($_framed)
-    {
-      // 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');