[eGroupWare-svn] r44244 - in /branches/1.8/felamimail: inc/class.uicompose.inc.php templates/default/composeForm.tpl

[<lei...@us...>]

Author: leithoff
Date: Tue Oct 22 14:05:02 2013
New Revision: 44244

URL: http://svn.stylite.de/viewvc/egroupware?rev=44244&view=rev
Log:
enable multiple file upload on attach to mail

Modified:
    branches/1.8/felamimail/inc/class.uicompose.inc.php
    branches/1.8/felamimail/templates/default/composeForm.tpl

Modified: branches/1.8/felamimail/inc/class.uicompose.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/felamimail/inc/class.uicompose.inc.php?rev=44244&r1=44243&r2=44244&view=diff
==============================================================================
--- branches/1.8/felamimail/inc/class.uicompose.inc.php (original)
+++ branches/1.8/felamimail/inc/class.uicompose.inc.php Tue Oct 22 14:05:02 2013
@@ -549,14 +549,40 @@
 			if(is_array($_FILES["addFileName"])) {
 				#phpinfo();
 				//_debug_array($_FILES);
-				if($_FILES['addFileName']['error'] == $UPLOAD_ERR_OK) {
-					$formData['name']	= $_FILES['addFileName']['name'];
-					$formData['type']	= $_FILES['addFileName']['type'];
-					$formData['file']	= $_FILES['addFileName']['tmp_name'];
-					$formData['size']	= $_FILES['addFileName']['size'];
-					$this->bocompose->addAttachment($formData);
+				$success=false;
+				if (is_array($_FILES["addFileName"]['name']))
+				{
+					// multiple uploads supported by newer firefox (>3.6) and chrome (>4) versions,
+					// upload array information is by key within the attribute (name, type, size, temp_name)
+					foreach($_FILES["addFileName"]['name'] as $key => $filename)
+					{
+						if($_FILES['addFileName']['error'][$key] == $UPLOAD_ERR_OK) {
+							$formData['name']	= $_FILES['addFileName']['name'][$key];
+							$formData['type']	= $_FILES['addFileName']['type'][$key];
+							$formData['file']	= $_FILES['addFileName']['tmp_name'][$key];
+							$formData['size']	= $_FILES['addFileName']['size'][$key];
+							$this->bocompose->addAttachment($formData);
+							$success = true;
+						}
+					}
+				}
+				else // should not happen as upload form name is defined as addFileName[]
+				{
+					if($_FILES['addFileName']['error'] == $UPLOAD_ERR_OK) {
+						$formData['name']   = $_FILES['addFileName']['name'];
+						$formData['type']   = $_FILES['addFileName']['type'];
+						$formData['file']   = $_FILES['addFileName']['tmp_name'];
+						$formData['size']   = $_FILES['addFileName']['size'];
+						$this->bocompose->addAttachment($formData);
+						$success = true;
+					}
+				}
+				if ($success == true)
+				{
 					print "<script type='text/javascript'>window.close();</script>";
-				} else {
+				}
+				else
+				{
 					print "<script type='text/javascript'>document.getElementById('fileSelectorDIV1').style.display = 'inline';document.getElementById('fileSelectorDIV2').style.display = 'none';</script>";
 				}
 			}

Modified: branches/1.8/felamimail/templates/default/composeForm.tpl
URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/felamimail/templates/default/composeForm.tpl?rev=44244&r1=44243&r2=44244&view=diff
==============================================================================
--- branches/1.8/felamimail/templates/default/composeForm.tpl (original)
+++ branches/1.8/felamimail/templates/default/composeForm.tpl Tue Oct 22 14:05:02 2013
@@ -248,7 +248,7 @@
 		</tr>
 		<tr>
 			<td style="text-align:center;">
-				<input id="addFileName" name="addFileName" size="50" style="width:450px;" type="file" onchange="fm_compose_addFile()"/>
+				<input id="addFileName" name="addFileName[]" size="50" style="width:450px;" type="file" onchange="fm_compose_addFile()" multiple="true"/>
 			</td>
 		</tr>
 		<tr>