Changeset 5643 in subversion

Timestamp:

Dec 22, 2011 11:35:38 AM (18 months ago)

Author:

thomasb

Message:

Fix upload form handling

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (1 diff)
• steps/addressbook/edit.inc (modified) (3 diffs)
• steps/mail/compose.inc (modified) (2 diffs)

trunk/roundcubemail/program/js/app.js

@@ -1044 +1044 @@
 
       case 'upload-photo':
-        this.upload_contact_photo(props);
+        this.upload_contact_photo(props || this.gui_objects.uploadform);
         break;
 

trunk/roundcubemail/program/steps/addressbook/edit.inc

@@ -178 +178 @@
 
   // set defaults
-  $attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');
+  $attrib += array('id' => 'rcmUploadform', 'buttons' => 'yes');
 
   // find max filesize value
@@ -192 +192 @@
 
   $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()) .
@@ -204 +204 @@
 
   $OUTPUT->add_label('addphoto','replacephoto');
-  $OUTPUT->add_gui_object('uploadbox', $attrib['id']);
+  $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
   return $out;
 }

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -1277 +1277 @@
 
   $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)))) .
@@ -1287 +1287 @@
   );
 
-  $OUTPUT->add_gui_object('uploadform', $attrib['id']);
+  $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
   return $out;
 }