From: Harris Wong <hwong@ocad.ca>
Date: Fri, 14 Oct 2011 16:15:11 +0000 (-0000)
Subject: AC_4897, AC_4898, AC_4899: Multifile uploader fixes.
X-Git-Tag: v1.2^0
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=acontent.git;a=commitdiff_plain;h=3f02efd3b4c06dfe9836b53927c77afc164df8c7

AC_4897, AC_4898, AC_4899: Multifile uploader fixes.

Removed an extra letter "u" on the page.  Now properly forwards user back to the popup upload page upon successful file upload.  Also fixed a vsprinf issue with the Messenger.
---

diff --git a/docs/file_manager/filemanager_display.inc.php b/docs/file_manager/filemanager_display.inc.php
index 0fd396d..786a4e9 100644
--- a/docs/file_manager/filemanager_display.inc.php
+++ b/docs/file_manager/filemanager_display.inc.php
@@ -204,7 +204,7 @@ if (TRUE || $framed != TRUE) {
 					<th class="fl-uploader-file-name">File Name</th>
 					<th class="fl-uploader-file-size">Size</th>
 					<th class="fl-uploader-file-actions"></th>
-				</tr>u
+				</tr>
             </table>
             
             <!-- File Queue body, which is the default container for the FileQueueView component -->
@@ -326,7 +326,7 @@ if (TRUE || $framed != TRUE) {
                         jQuery('#uploader-error-container').html("");
                     },
                     afterUploadComplete: function () {
-                        window.location = "<?php echo TR_BASE_HREF; ?>file_manager/index.php?pathext=<?php echo $pathext . SEP . '_course_id=' . $_course_id; ?>";
+                        window.location = "<?php echo TR_BASE_HREF . 'file_manager/index.php?popup='.$popup.SEP. 'framed='.$framed.SEP.'cp='.$_GET['cp'].SEP.'pid='.$_GET['pid'].SEP.'cid='.$cid.SEP.'a_type='.$a_type.SEP.'_course_id='.$_course_id; ?>"
                     }
     		    },
     		    components: {
diff --git a/docs/file_manager/upload.php b/docs/file_manager/upload.php
index 5643ac8..2b44f68 100644
--- a/docs/file_manager/upload.php
+++ b/docs/file_manager/upload.php
@@ -96,7 +96,8 @@ if (isset($_POST['submit'])) {
 					$_FILES['uploadedfile']['name'] = substr(time(), -4).'.'.$_FILES['uploadedfile']['name'];
 
 					$f = array('FILE_EXISTS',
-									substr($_FILES['uploadedfile']['name'], 5));
+									substr($_FILES['uploadedfile']['name'], 5),
+									$_FILES['uploadedfile']['name']);
 					$msg->addFeedback($f);
 				}