summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-12-22 16:35:38 +0000
committerthomascube <thomas@roundcube.net>2011-12-22 16:35:38 +0000
commita84bfa356ab168b0b065efeffb32a603970acd13 (patch)
tree6d9923de0d780f59761bd35441d6d6f81ffa72c1 /program
parent0ec438c5d68309b234bcc49c601b8b004da3724b (diff)
Fix upload form handling
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js2
-rw-r--r--program/steps/addressbook/edit.inc6
-rw-r--r--program/steps/mail/compose.inc4
3 files changed, 6 insertions, 6 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 0cc2a1f53..1652e44e4 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1043,7 +1043,7 @@ function rcube_webmail()
break;
case 'upload-photo':
- this.upload_contact_photo(props);
+ this.upload_contact_photo(props || this.gui_objects.uploadform);
break;
case 'delete-photo':
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index eb6aa1886..c5ca44d7c 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -177,7 +177,7 @@ function rcmail_upload_photo_form($attrib)
global $OUTPUT;
// set defaults
- $attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');
+ $attrib += array('id' => 'rcmUploadform', 'buttons' => 'yes');
// find max filesize value
$max_filesize = parse_bytes(ini_get('upload_max_filesize'));
@@ -191,7 +191,7 @@ function rcmail_upload_photo_form($attrib)
$button = new html_inputfield(array('type' => 'button'));
$out = html::div($attrib,
- $OUTPUT->form_tag(array('name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
+ $OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
$hidden->show() .
html::div(null, $input->show()) .
html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
@@ -203,7 +203,7 @@ function rcmail_upload_photo_form($attrib)
);
$OUTPUT->add_label('addphoto','replacephoto');
- $OUTPUT->add_gui_object('uploadbox', $attrib['id']);
+ $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
return $out;
}
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 76ff31d3c..b7a4fcb33 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1276,7 +1276,7 @@ function rcmail_compose_attachment_form($attrib)
$button = new html_inputfield(array('type' => 'button'));
$out = html::div($attrib,
- $OUTPUT->form_tag(array('name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
+ $OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) .
html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
(get_boolean($attrib['buttons']) ? html::div('buttons',
@@ -1286,7 +1286,7 @@ function rcmail_compose_attachment_form($attrib)
)
);
- $OUTPUT->add_gui_object('uploadform', $attrib['id']);
+ $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
return $out;
}