From f94e442469deca30b39f3fa08aade83cbd0ede70 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 16 Dec 2011 13:38:59 -0500
Subject: [PATCH] Add more classes and options to HTML elements for better styleability
---
program/steps/mail/attachments.inc | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index ffb1642..52de1c1 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -25,9 +25,12 @@
}
$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GPC);
-$_SESSION['compose'] = $_SESSION['compose_data_'.$COMPOSE_ID];
+$COMPOSE = null;
-if (!$_SESSION['compose']) {
+if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
+ $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
+
+if (!$COMPOSE) {
die("Invalid session var!");
}
@@ -38,15 +41,15 @@
$id = 'undefined';
if (preg_match('/^rcmfile(\w+)$/', $_POST['_file'], $regs))
$id = $regs[1];
- if ($attachment = $_SESSION['compose']['attachments'][$id])
+ if ($attachment = $COMPOSE['attachments'][$id])
$attachment = $RCMAIL->plugins->exec_hook('attachment_delete', $attachment);
if ($attachment['status']) {
- if (is_array($_SESSION['compose']['attachments'][$id])) {
- unset($_SESSION['compose']['attachments'][$id]);
+ if (is_array($COMPOSE['attachments'][$id])) {
+ unset($COMPOSE['attachments'][$id]);
$OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
}
}
-
+
$OUTPUT->send();
exit;
}
@@ -56,16 +59,16 @@
$id = 'undefined';
if (preg_match('/^rcmfile(\w+)$/', $_GET['_file'], $regs))
$id = $regs[1];
- if ($attachment = $_SESSION['compose']['attachments'][$id])
+ if ($attachment = $COMPOSE['attachments'][$id])
$attachment = $RCMAIL->plugins->exec_hook('attachment_display', $attachment);
-
+
if ($attachment['status']) {
if (empty($attachment['size']))
$attachment['size'] = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
header('Content-Type: ' . $attachment['mimetype']);
header('Content-Length: ' . $attachment['size']);
-
+
if ($attachment['data'])
echo $attachment['data'];
else if ($attachment['path'])
@@ -76,8 +79,8 @@
// attachment upload action
-if (!is_array($_SESSION['compose']['attachments'])) {
- $_SESSION['compose']['attachments'] = array();
+if (!is_array($COMPOSE['attachments'])) {
+ $COMPOSE['attachments'] = array();
}
// clear all stored output properties (like scripts and env vars)
@@ -107,9 +110,9 @@
// store new attachment in session
unset($attachment['status'], $attachment['abort']);
- $_SESSION['compose']['attachments'][$id] = $attachment;
+ $COMPOSE['attachments'][$id] = $attachment;
- if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) {
+ if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
$button = html::img(array(
'src' => $icon,
'alt' => rcube_label('delete')
@@ -123,6 +126,7 @@
'href' => "#delete",
'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
'title' => rcube_label('delete'),
+ 'class' => 'delete',
), $button);
$content .= Q($attachment['name']);
@@ -131,6 +135,7 @@
'html' => $content,
'name' => $attachment['name'],
'mimetype' => $attachment['mimetype'],
+ 'classname' => rcmail_filetype2classname($attachment['mimetype'], $attachment['name']),
'complete' => true), $uploadid);
}
else { // upload failed
--
Gitblit v1.9.1