summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-07-04 11:40:02 +0000
committeralecpl <alec@alec.pl>2011-07-04 11:40:02 +0000
commit4171c59bd79a54c1fd65128f7100247a4dec8720 (patch)
tree3261b05d91324840570c8ebe6b1084e26793701d /program/steps/mail
parent5b3ac324154b0d29e6e14db2b06fbc3636a3e708 (diff)
- Add optional textual upload progress indicator (#1486039)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/attachments.inc4
-rw-r--r--program/steps/mail/compose.inc5
2 files changed, 8 insertions, 1 deletions
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 14712c628..4674034a1 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -19,6 +19,10 @@
*/
+// Upload progress update
+if (!empty($_GET['_progress'])) {
+ rcube_upload_progress();
+}
$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GPC);
$_SESSION['compose'] = $_SESSION['compose_data'][$COMPOSE_ID];
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 943c800b5..458441fda 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1199,12 +1199,15 @@ function rcmail_compose_attachment_list($attrib)
function rcmail_compose_attachment_form($attrib)
{
- global $OUTPUT;
+ global $RCMAIL, $OUTPUT;
// add ID if not given
if (!$attrib['id'])
$attrib['id'] = 'rcmUploadbox';
+ // Enable upload progress bar
+ rcube_upload_progress_init();
+
// find max filesize value
$max_filesize = parse_bytes(ini_get('upload_max_filesize'));
$max_postsize = parse_bytes(ini_get('post_max_size'));