Merged branch devel-addressbook from r443 back to trunk

1 files changed, 64 insertions, 196 deletions

diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index a50d0388a..72e54b173 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/save.inc                                    |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -19,240 +19,108 @@
 
 */
 
+// cannot edit record
+if ($CONTACTS->readonly)
+{
+  $OUTPUT->show_message('contactreadonly', 'error');
+  rcmail_overwrite_action(empty($_POST['_cid']) ? 'add' : 'show');
+  return;
+}
+
 // check input
-if ((empty($_POST['_name']) || empty($_POST['_email'])) && empty($_GET['_framed']))
-  {
-  show_message('formincomplete', 'warning');
+if ((!get_input_value('_name', RCUBE_INPUT_POST) || !get_input_value('_email', RCUBE_INPUT_POST)) && $_framed)
+{
+  $OUTPUT->show_message('formincomplete', 'warning');
   rcmail_overwrite_action(empty($_POST['_cid']) ? 'add' : 'show');
   return;
-  }
+}
+
 
 // setup some vars we need
 $a_save_cols = array('name', 'firstname', 'surname', 'email');
-$contacts_table = get_table_name('contacts');
+$a_record = array();
+$cid = get_input_value('_cid', RCUBE_INPUT_POST);
+
+// 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);
+}
 
 // update an existing contact
-if (!empty($_POST['_cid']))
+if (!empty($cid))
+{
+  if ($CONTACTS->update($cid, $a_record))
   {
-  $a_write_sql = array();
-
-  foreach ($a_save_cols as $col)
-    {
-    $fname = '_'.$col;
-    if (!isset($_POST[$fname]))
-      continue;
-    
-    $a_write_sql[] = sprintf("%s=%s",
-                             $DB->quoteIdentifier($col),
-                             $DB->quote(get_input_value($fname, RCUBE_INPUT_POST)));
-    }
-
-  if (sizeof($a_write_sql))
-    {
-    $DB->query("UPDATE $contacts_table
-                SET    changed=".$DB->now().", ".join(', ', $a_write_sql)."
-                WHERE  contact_id=?
-                AND    user_id=?
-                AND    del<>1",
-                $_POST['_cid'],
-                $_SESSION['user_id']);
-                       
-    $updated = $DB->affected_rows();
-    }
-       
-  if ($updated)
-    {
     if ($_framed)
-      {
+    {
       // define list of cols to be displayed
-      $a_show_cols = array('name', 'email');
       $a_js_cols = array();
-  
-      $sql_result = $DB->query("SELECT * FROM $contacts_table
-                                WHERE  contact_id=?
-                                AND    user_id=?
-                                AND    del<>1",
-                               $_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];
+      $record = $CONTACTS->get_record($cid, true);
 
-      // 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)));
+      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
-    show_message('successfullysaved', 'confirmation');    
+    $OUTPUT->show_message('successfullysaved', 'confirmation');    
     rcmail_overwrite_action('show');
-    }
+  }
   else
-    {
+  {
     // show error message
-    show_message('errorsaving', 'error');
+    $OUTPUT->show_message('errorsaving', 'error');
     rcmail_overwrite_action('show');
-    }
   }
+}
 
 // insert a new contact
 else
-  {
-  $a_insert_cols = $a_insert_values = array();
-
+{
   // check for existing contacts
-  $sql = "SELECT 1 FROM $contacts_table
-          WHERE  user_id = {$_SESSION['user_id']}
-          AND del <> '1' ";
-
-  // get email and name, build sql for existing user check
-  if (isset($_GET['_emails']) && isset($_GET['_names']))
-    {
-    $sql   .= "AND email IN (";
-    $emails = explode(',', get_input_value('_emails', RCUBE_INPUT_GET));
-    $names  = explode(',', get_input_value('_names', RCUBE_INPUT_GET));
-    $count  = count($emails);
-    $n = 0;
-    foreach ($emails as $email)
-      {
-      $end  = (++$n == $count) ? '' : ',';
-      $sql .= $DB->quote($email) . $end;
-      }
-    $sql .= ")";
-    $ldap_form = true; 
-    }
-  else if (isset($_POST['_email'])) 
-    $sql  .= "AND email = " . $DB->quote(get_input_value('_email', RCUBE_INPUT_POST));
-
-  $sql_result = $DB->query($sql);
-
+  $existing = $CONTACTS->search('email', $a_record['email'], false);
+  
   // show warning message
-  if ($DB->num_rows($sql_result))
-    {
-    show_message('contactexists', 'warning');
-
-    if ($ldap_form)
-      rcmail_overwrite_action('ldappublicsearch');
-    else
-      rcmail_overwrite_action('add');
-
+  if ($existing->count)
+  {
+    $OUTPUT->show_message('contactexists', 'warning');
+    rcmail_overwrite_action('add');
     return;
-    }
+  }
 
-  if ($ldap_form)
-    {
-    $n = 0; 
-    foreach ($emails as $email) 
-      {
-      $DB->query("INSERT INTO $contacts_table 
-                 (user_id, name, email)
-                 VALUES ({$_SESSION['user_id']}," . $DB->quote($names[$n++]) . "," . 
-                                      $DB->quote($email) . ")");
-      $insert_id[] = $DB->insert_id();
-      }
-    }
-  else
-    {
-    foreach ($a_save_cols as $col)
-      {
-      $fname = '_'.$col;
-      if (!isset($_POST[$fname]))
-        continue;
-    
-      $a_insert_cols[] = $col;
-      $a_insert_values[] = $DB->quote(get_input_value($fname, RCUBE_INPUT_POST));
-      }
-    
-    if (sizeof($a_insert_cols))
-      {
-      $DB->query("INSERT INTO $contacts_table
-                  (user_id, changed, del, ".join(', ', $a_insert_cols).")
-                  VALUES (?, ".$DB->now().", 0, ".join(', ', $a_insert_values).")",
-                $_SESSION['user_id']);
-                       
-      $insert_id = $DB->insert_id(get_sequence_name('contacts'));
-      }
-    }
-    
-  if ($insert_id)
+  // insert record and send response
+  if ($insert_id = $CONTACTS->insert($a_record))
+  {
+    if ($_framed)
     {
-    if (!$ldap_form)
-      {
-      if ($_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("SELECT * FROM $contacts_table
-                                  WHERE  contact_id=?
-                                  AND    user_id=?",
-                                  $insert_id,
-                                  $_SESSION['user_id']);
-        $commands .= rcmail_js_contacts_list($sql_result, $JS_OBJECT_NAME);
-
-        $commands .= sprintf("if(parent.%s)parent.%s.contact_list.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');
-      $_GET['_cid'] = $insert_id;
-      }
-    else 
-      {
       // add contact row or jump to the page where it should appear
-      $commands = '';
-      foreach ($insert_id as $id) 
-        {
-        $sql_result = $DB->query("SELECT * FROM $contacts_table
-                                  WHERE  contact_id = $id
-                                  AND    user_id    = {$_SESSION['user_id']}");
-        
-        $commands .= sprintf("if(parent.%s)parent.", $JS_OBJECT_NAME);
-        $commands .= rcmail_js_contacts_list($sql_result, $JS_OBJECT_NAME);
-        $last_id = $id;
-        }
+      $CONTACTS->reset();
+      $result = $CONTACTS->search($CONTACTS->primary_key, $insert_id);
 
-      // display the last insert id
-      $commands .= sprintf("if(parent.%s)parent.%s.contact_list.select('%d');\n",
-                            $JS_OBJECT_NAME, 
-                            $JS_OBJECT_NAME,
-                            $last_id);
+      rcmail_js_contacts_list($result, 'parent.');
+      $OUTPUT->command('parent.contact_list.select', $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);
-      rcmail_overwrite_action('ldappublicsearch');
-      }
+      $CONTACTS->reset();
+      $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
+    }
 
     // show confirmation
-    show_message('successfullysaved', 'confirmation');      
+    $OUTPUT->show_message('successfullysaved', 'confirmation');
     rcmail_overwrite_action('show');
-    }
+    $_GET['_cid'] = $insert_id;
+  }
   else
-    {
+  {
     // show error message
-    show_message('errorsaving', 'error');
+    $OUTPUT->show_message('errorsaving', 'error');
     rcmail_overwrite_action('add');
-    }
   }
+}
 
 ?>