githubFork/roundcubemail.git

			@@ -5,7 +5,7 @@
			\| program/steps/mail/upload.inc \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005, RoundCube Dev. - Switzerland \|
			\| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -20,56 +20,75 @@
			*/


			if (!$_SESSION['compose'])
			{
			exit;
			}
			if (!$_SESSION['compose']) {
			die("Invalid session var!");
			}


			if (strlen($CONFIG['temp_dir']))
			$temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id'];
			// use common temp dir for file uploads
			$temp_dir = unslashify($CONFIG['temp_dir']);

			if (!is_array($_SESSION['compose']['attachments']))
			{

			if (!is_array($_SESSION['compose']['attachments'])) {
			$_SESSION['compose']['attachments'] = array();
			}

			// create temp-dir for uploaded attachments
			if ($CONFIG['temp_dir'] && is_writeable($CONFIG['temp_dir']))
			{
			mkdir($temp_dir);
			$_SESSION['compose']['temp_dir'] = $temp_dir;
			// clear all stored output properties (like scripts and env vars)
			$OUTPUT->reset();

			if (is_array($_FILES['_attachments']['tmp_name'])) {
			foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
			$tmpfname = tempnam($temp_dir, 'rcmAttmnt');
			if (move_uploaded_file($filepath, $tmpfname)) {
			$id = count($_SESSION['compose']['attachments']);
			$_SESSION['compose']['attachments'][] = array(
			'name' => $_FILES['_attachments']['name'][$i],
			'mimetype' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['type'][$i]),
			'path' => $tmpfname,
			);

			if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) {
			$button = html::img(array(
			'src' => $icon,
			'border' => 0,
			'alt' => rcube_label('delete'),
			'style' => "padding-right:2px;vertical-align:middle",
			));
			}
			else {
			$button = Q(rcube_label('delete'));
			}

			$content = html::a(array(
			'href' => "#delete",
			'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id),
			'title' => rcube_label('delete'),
			), $button);

			$content .= Q($_FILES['_attachments']['name'][$i]);

			$OUTPUT->command('add2attachment_list', "rcmfile$id", $content);
			}
			else { // upload failed
			$err = $_FILES['_attachments']['error'][$i];
			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 {
			$msg = rcube_label('fileuploaderror');
			}

			$OUTPUT->command('display_message', $msg, 'error');
			}
			}


			$response = '';

			foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
			{
			$tmpfname = tempnam($temp_dir, 'rcmAttmnt');
			if (copy($filepath, $tmpfname))
			{
			$_SESSION['compose']['attachments'][] = array('name' => $_FILES['_attachments']['name'][$i],
			'mimetype' => $_FILES['_attachments']['type'][$i],
			'path' => $tmpfname);

			$response .= sprintf("parent.%s.add2attachment_list('%s');\n", $JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i]);
			}
			}

			}
			else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
			$OUTPUT->command('display_message', rcube_label('fileuploaderror'), 'error');
			}

			// send html page with JS calls as response
			print <<<EOF
			<html>
			<script type="text/javascript">
			if (parent.$JS_OBJECT_NAME)
			{
			$response
			parent.$JS_OBJECT_NAME.show_attachment_form(false);
			}
			</script>
			</html>
			EOF;
			exit;
			$OUTPUT->command('show_attachment_form', false);
			$OUTPUT->command('auto_save_start', false);
			$OUTPUT->send('iframe');

			?>