Merge branch devel-addressbook (r4193:4382) back into trunk

1 files changed, 142 insertions, 20 deletions

diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index add8ef4e3..7d29b6fb2 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-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -29,33 +29,147 @@ if ($CONTACTS->readonly) {
   return;
 }
 
-// Basic input checks
-if ((!get_input_value('_name', RCUBE_INPUT_POST) || !get_input_value('_email', RCUBE_INPUT_POST))) {
-  $OUTPUT->show_message('formincomplete', 'warning');
-  rcmail_overwrite_action($return_action);
-  return;
-}
 
+// handle photo upload for contacts
+if ($RCMAIL->action == 'upload-photo') {
+    // clear all stored output properties (like scripts and env vars)
+    $OUTPUT->reset();
+
+    if ($filepath = $_FILES['_photo']['tmp_name']) {
+        // check file type and resize image
+        $imageprop = rcmail::imageprops($_FILES['_photo']['tmp_name']);
+        
+        if ($imageprop['width'] && $imageprop['height']) {
+            $maxsize = intval($RCMAIL->config->get('contact_photo_size', 160));
+            $tmpfname = tempnam($RCMAIL->config->get('temp_dir'), 'rcmImgConvert');
+            $save_hook = 'attachment_upload';
+            
+            // scale image to a maximum size
+            if (($imageprop['width'] > $maxsize || $imageprop['height'] > $maxsize) &&
+                  (rcmail::imageconvert(array('in' => $filepath, 'out' => $tmpfname, 'size' => $maxsize.'x'.$maxsize, 'type' => $imageprop['type'])) !== false)) {
+                $filepath = $tmpfname;
+                $save_hook = 'attachment_save';
+            }
+            
+            // save uploaded file in storage backend
+            $attachment = $RCMAIL->plugins->exec_hook($save_hook, array(
+                'path' => $filepath,
+                'size' => $_FILES['_photo']['size'],
+                'name' => $_FILES['_photo']['name'],
+                'mimetype' => 'image/' . $imageprop['type'],
+            ));
+        }
+        else
+            $attachment['error'] = rcube_label('invalidimageformat');
+
+        if ($attachment['status'] && !$attachment['abort']) {
+            $file_id = $attachment['id'];
+            $_SESSION['contacts']['files'][$file_id] = $attachment;
+            $OUTPUT->command('replace_contact_photo', $file_id);
+        }
+        else {  // upload failed
+            $err = $_FILES['_photo']['error'];
+            if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE)
+                $msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+            else if ($attachment['error'])
+                $msg = $attachment['error'];
+            else
+                $msg = rcube_label('fileuploaderror');
+            
+            $OUTPUT->command('display_message', $msg, 'error');
+        }
+    }
+    else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+        // if filesize exceeds post_max_size then $_FILES array is empty,
+        // show filesizeerror instead of fileuploaderror
+        if ($maxsize = ini_get('post_max_size'))
+            $msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes($maxsize)))));
+        else
+            $msg = rcube_label('fileuploaderror');
+            
+        $OUTPUT->command('display_message', $msg, 'error');
+    }
+    
+    $OUTPUT->command('photo_upload_end');
+    $OUTPUT->send('iframe');
+}
 
-// setup some vars we need
-$a_save_cols = array('name', 'firstname', 'surname', 'email');
-$a_record = array();
 
 // read POST values into hash array
-foreach ($a_save_cols as $col) {
+$a_record = array();
+foreach ($GLOBALS['CONTACT_COLTYPES'] as $col => $colprop) {
   $fname = '_'.$col;
-  if (isset($_POST[$fname]))
+  if ($colprop['composite'])
+    continue;
+  // gather form data of composite fields
+  if ($colprop['childs']) {
+    $values = array();
+    foreach ($colprop['childs'] as $childcol => $cp) {
+      $vals = get_input_value('_'.$childcol, RCUBE_INPUT_POST);
+      foreach ((array)$vals as $i => $val)
+        $values[$i][$childcol] = $val;
+    }
+    $subtypes = get_input_value('_subtype_' . $col, RCUBE_INPUT_POST);
+    foreach ($subtypes as $i => $subtype)
+      if ($values[$i])
+        $a_record[$col.':'.$subtype][] = $values[$i];
+  }
+  // assign values and subtypes
+  else if (is_array($_POST[$fname])) {
+    $values = get_input_value($fname, RCUBE_INPUT_POST);
+    $subtypes = get_input_value('_subtype_' . $col, RCUBE_INPUT_POST);
+    foreach ($values as $i => $val) {
+      $subtype = $subtypes[$i] ? ':'.$subtypes[$i] : '';
+      $a_record[$col.$subtype][] = $val;
+    }
+  }
+  else if (isset($_POST[$fname])) {
     $a_record[$col] = get_input_value($fname, RCUBE_INPUT_POST);
+  }
 }
 
-// Validity checks
-$_email = idn_to_ascii($a_record['email']);
-if (!check_email($_email, false)) {
-  $OUTPUT->show_message('emailformaterror', 'warning', array('email' => $_email));
+if (empty($a_record['name']))
+  $a_record['name'] = join(' ', array_filter(array($a_record['prefix'], $a_record['firstname'], $a_record['middlename'], $a_record['surname'], $a_record['suffix'],)));
+
+#var_dump($a_record);
+
+// Basic input checks (TODO: delegate to $CONTACTS instance)
+if (empty($a_record['name'])/* || empty($a_record['email'])*/) {
+  $OUTPUT->show_message('formincomplete', 'warning');
   rcmail_overwrite_action($return_action);
   return;
 }
 
+// Validity checks
+foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
+  if (strlen($email)) {
+    $_email = idn_to_ascii($email);
+    if (!check_email($_email, false)) {
+      $OUTPUT->show_message('emailformaterror', 'warning', array('email' => $email));
+      rcmail_overwrite_action($return_action);
+      return;
+    }
+  }
+}
+
+// get raw photo data if changed
+if (isset($a_record['photo'])) {
+    if ($a_record['photo'] == '-del-') {
+        $a_record['photo'] = '';
+    }
+    else if ($tempfile = $_SESSION['contacts']['files'][$a_record['photo']]) {
+        $tempfile = $RCMAIL->plugins->exec_hook('attachment_get', $tempfile);
+        if ($tempfile['status'])
+            $a_record['photo'] = $tempfile['data'] ? $tempfile['data'] : @file_get_contents($tempfile['path']);
+    }
+    else
+        unset($a_record['photo']);
+    
+    // cleanup session data
+    $RCMAIL->plugins->exec_hook('attachments_cleanup', array());
+    $RCMAIL->session->remove('contacts');
+}
+
 // update an existing contact
 if (!empty($cid))
 {
@@ -92,7 +206,8 @@ if (!empty($cid))
   }
   else {
     // show error message
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+    $err = $CONTACTS->get_error();
+    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
     rcmail_overwrite_action('show');
   }
 }
@@ -100,10 +215,16 @@ if (!empty($cid))
 // insert a new contact
 else {
   // check for existing contacts
-  $existing = $CONTACTS->search('email', $a_record['email'], true, false);
+  $existing = false;
+  foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
+      if (($res = $CONTACTS->search('email', $email, true, false)) && $res->count) {
+          $existing = true;
+          break;
+      }
+  }
 
   // show warning message
-  if ($existing->count) {
+  if ($existing) {
     $OUTPUT->show_message('contactexists', 'warning', null, false);
     rcmail_overwrite_action('add');
     return;
@@ -138,7 +259,8 @@ else {
   }
   else {
     // show error message
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+    $err = $CONTACTS->get_error();
+    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
     rcmail_overwrite_action('add');
   }
 }