From 9d195d6e82c3be4e543a47ef8ff1e9fe54bd0939 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 05 Jul 2011 13:09:25 -0400
Subject: [PATCH] - Added lost argument in delete_record() method
---
program/steps/addressbook/save.inc | 283 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 215 insertions(+), 68 deletions(-)
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 94a0d58..e1986ef 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/steps/addressbook/save.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,108 +19,255 @@
*/
+$CONTACTS = rcmail_contact_source(null, true);
+$cid = get_input_value('_cid', RCUBE_INPUT_POST);
+$return_action = empty($cid) ? 'add' : 'edit';
+
+
+// Source changed, display the form again
+if (!empty($_GET['_reload'])) {
+ rcmail_overwrite_action($return_action);
+ return;
+}
+
// cannot edit record
-if ($CONTACTS->readonly)
-{
+if ($CONTACTS->readonly) {
$OUTPUT->show_message('contactreadonly', 'error');
- rcmail_overwrite_action(empty($_POST['_cid']) ? 'add' : 'show');
- return;
-}
-
-// check input
-if ((!get_input_value('_name', RCUBE_INPUT_POST) || !get_input_value('_email', RCUBE_INPUT_POST)) && $OUTPUT->action)
-{
- $OUTPUT->show_message('formincomplete', 'warning');
- rcmail_overwrite_action(empty($_POST['_cid']) ? 'add' : 'show');
+ rcmail_overwrite_action($return_action);
return;
}
-// setup some vars we need
-$a_save_cols = array('name', 'firstname', 'surname', 'email');
-$a_record = array();
-$cid = get_input_value('_cid', RCUBE_INPUT_POST);
+// 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'],
+ 'group' => 'contact',
+ ));
+ }
+ 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');
+}
// 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]))
- $a_record[$col] = get_input_value($fname, RCUBE_INPUT_POST);
+ 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, true);
+ 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, true);
+ $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, true);
+ }
+}
+
+// let a dedicated function or a plugin compose the full name if empty
+if (empty($a_record['name'])) {
+ $a_record['name'] = rcube_addressbook::compose_display_name($a_record);
+}
+
+
+// do input checks (delegated to $CONTACTS instance)
+if (!$CONTACTS->validate($a_record)) {
+ $err = (array)$CONTACTS->get_error() + array('message' => 'formincomplete', 'type' => 'warning');
+ $OUTPUT->show_message($err['message'], $err['type']);
+ $GLOBALS['EDIT_RECORD'] = $a_record; // store submitted data to be used in edit form
+ 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('group' => 'contact'));
+ $RCMAIL->session->remove('contacts');
}
// update an existing contact
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);
+ $plugin = $RCMAIL->plugins->exec_hook('contact_update',
+ array('id' => $cid, 'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
+ $a_record = $plugin['record'];
- foreach (array('name', 'email') as $col)
- $a_js_cols[] = (string)$record[$col];
+ if (!$plugin['abort'])
+ $result = $CONTACTS->update($cid, $a_record);
+ else
+ $result = $plugin['result'];
- // update the changed col in list
- $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols);
+ if ($result) {
+ // LDAP DN change
+ if (is_string($result) && strlen($result)>1) {
+ $newcid = $result;
+ // change cid in POST for 'show' action
+ $_POST['_cid'] = $newcid;
}
-
+
+ // define list of cols to be displayed
+ $a_js_cols = array();
+ $record = $CONTACTS->get_record($newcid ? $newcid : $cid, true);
+ $record['email'] = reset($CONTACTS->get_col_values('email', $record, true));
+ if (!$record['name'])
+ $record['name'] = $record['email'];
+
+ foreach (array('name', 'email') as $col)
+ $a_js_cols[] = Q((string)$record[$col]);
+
+ // update the changed col in list
+ $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols, $newcid);
+
// show confirmation
- $OUTPUT->show_message('successfullysaved', 'confirmation');
+ $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
rcmail_overwrite_action('show');
}
- else
- {
+ else {
// show error message
- $OUTPUT->show_message('errorsaving', 'error');
+ $err = $CONTACTS->get_error();
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
rcmail_overwrite_action('show');
}
}
// insert a new contact
-else
-{
- // check for existing contacts
- $existing = $CONTACTS->search('email', $a_record['email'], true, false);
-
- // show warning message
- if ($existing->count)
- {
- $OUTPUT->show_message('contactexists', 'warning');
- rcmail_overwrite_action('add');
- return;
+else {
+ // show notice if existing contacts with same e-mail are found
+ $existing = false;
+ foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
+ if (($res = $CONTACTS->search('email', $email, false, false)) && $res->count) {
+ $OUTPUT->show_message('contactexists', 'notice', null, false);
+ break;
+ }
}
+
+ $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
+ 'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
+ $a_record = $plugin['record'];
// 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);
+ if (!$plugin['abort'])
+ $insert_id = $CONTACTS->insert($a_record);
+ else
+ $insert_id = $plugin['result'];
- 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());
+ if ($insert_id) {
+ // add new contact to the specified group
+ if ($CONTACTS->groups && $CONTACTS->group_id) {
+ $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array('group_id' => $CONTACTS->group_id, 'ids' => $insert_id, 'source' => $source));
+
+ if (!$plugin['abort']) {
+ if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + 1 > $maxnum))
+ $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
+
+ $CONTACTS->add_to_group($gid, $plugin['ids']);
+ }
}
+ // 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', html_identifier($insert_id));
+
+ // update record count display
+ $CONTACTS->reset();
+ $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
+
// show confirmation
- $OUTPUT->show_message('successfullysaved', 'confirmation');
- rcmail_overwrite_action('show');
- $_GET['_cid'] = $insert_id;
+ $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+ $OUTPUT->send('iframe');
}
- else
- {
+ else {
// show error message
- $OUTPUT->show_message('errorsaving', 'error');
+ $err = $CONTACTS->get_error();
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
rcmail_overwrite_action('add');
}
}
-
-?>
--
Gitblit v1.9.1