summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--program/steps/addressbook/func.inc4
-rw-r--r--program/steps/addressbook/save.inc72
-rw-r--r--program/steps/addressbook/upload_photo.inc83
3 files changed, 85 insertions, 74 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 6635d1338..6f01667f6 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -309,8 +309,9 @@ function rcmail_js_contacts_list($result, $prefix='')
if ($val == '' && $col == 'name') {
$val = rcube_addressbook::compose_display_name($row, true);
}
+
$a_row_cols[$col] = Q($val);
- }
+ }
$OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols);
}
@@ -729,7 +730,6 @@ $OUTPUT->add_handlers(array(
$RCMAIL->register_action_map(array(
'add' => 'edit.inc',
'photo' => 'show.inc',
- 'upload-photo' => 'save.inc',
'group-create' => 'groups.inc',
'group-rename' => 'groups.inc',
'group-delete' => 'groups.inc',
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 599c2f6a6..43426d8f3 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -23,12 +23,6 @@ $CONTACTS = rcmail_contact_source(null, true, 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) {
$OUTPUT->show_message('contactreadonly', 'error');
@@ -36,72 +30,6 @@ if ($CONTACTS->readonly) {
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'],
- '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
$a_record = array();
foreach ($GLOBALS['CONTACT_COLTYPES'] as $col => $colprop) {
diff --git a/program/steps/addressbook/upload_photo.inc b/program/steps/addressbook/upload_photo.inc
new file mode 100644
index 000000000..1ed71f8cb
--- /dev/null
+++ b/program/steps/addressbook/upload_photo.inc
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/addressbook/upload_photo.inc |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team |
+ | Licensed under the GNU GPL |
+ | |
+ | PURPOSE: |
+ | Handles contact photo uploads |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+// clear all stored output properties (like scripts and env vars)
+$OUTPUT->reset();
+console($_FILES);
+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');
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 14:02:32 +0000