Upload - Clean code with php-cs-fixer - refs BT#19380

main/inc/lib/fileUpload.lib.php

@@ -759,7 +759,9 @@ function moveUploadedFile($file, $storePath)
     }
 
     if ($copyFile) {
-        return copy($file['tmp_name'], $storePath);
+        $copied = copy($file['tmp_name'], $storePath);
+        unlink($file['tmp_name']);
+        return $copied;
     }
 
     if ($handleFromFile) {

main/inc/lib/formvalidator/Element/BigUpload.php

@@ -40,9 +40,11 @@ class BigUpload extends HTML_QuickForm_file
                 formId = uploadForm.attr("id");
                 submitButtonId = uploadForm.find("[type=\'submit\']").attr("id");
                 $("#"+submitButtonId).click(function(e) {
-                    e.preventDefault();
-                    setBigUploadSettings();
-                    bigUpload.fire();
+                    if ($("#'.$id.'").val()) {
+                        e.preventDefault();
+                        setBigUploadSettings();
+                        bigUpload.fire();
+                    }
                 });
             });
             function setBigUploadSettings() {

main/inc/lib/javascript/bigupload/css/style.css

@@ -1,78 +0,0 @@
-body {
-	margin: 0 auto;
-	background-color:#ffffff;
-	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-	color: #000000;
-	font-size: 12px;
-}
-h1 {
-	font-size:32px;
-	margin-top:0;
-}
-.bigUpload .bigUploadContainer {
-	max-width: 350px;
-	padding: 20px 30px 30px;
-	margin: 0 auto 20px;
-	margin-top:75px;
-	background-color: #ffffff;
-	border: 1px solid #e5e5e5;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	text-align: center;
-}
-.bigUpload #bigUploadFile {
-	border: 1px solid #e5e5e5;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	padding: 10px;
-}
-.bigUpload .bigUploadButton {
-	background-color: rgb(0, 109, 204);
-	border: 1px solid rgba(0, 0, 0, 0.09);
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	border-radius:6px;
-	padding-bottom: 11px;
-	padding-left: 19px;
-	padding-right: 19px;
-	padding-top: 11px;
-	font-size: 18px;
-	color:#ffffff;
-	cursor: pointer;
-	margin-top:15px;
-	font-size: 18px;
-}
-.bigUpload .bigUploadAbort {
-	background-color:rgb(218, 79, 73);
-}
-
-.bigUpload #bigUploadProgressBarContainer {
-	width:94%;
-	height:19px;
-	margin-left: 3%;
-	margin-top:1%;
-	border: 1px solid #e5e5e5;
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	border-radius: 6px;
-	-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	box-shadow: 0 1px 2px rgba(0,0,0,.05);
-}
-
-.bigUpload #bigUploadProgressBarFilled {
-	border-radius: 5px;
-	margin: 1px;
-	height:17px;
-	width:0;
-	background-color: rgb(91, 183, 91);
-	font-size: 14px;
-}

main/inc/lib/javascript/bigupload/css/upload.css

@@ -1,25 +0,0 @@
-
-.bigUploadContainer{
-    width : 450px;
-    border : solid 1px gray;
-    border-radius: 14px;
-    padding : 20px;
-}
-
-.bigUploadContainer input[type="file"] {
-    appearance: auto;
-    user-select: none;
-    white-space: pre;
-    align-items: flex-start;
-    text-align: center;
-    cursor: default;
-    padding: 1px 6px;
-    margin : 8px;
-    padding : 8px;
-    padding-left : 2px;
-    margin-left : 2px;
-}
-
-.bigUploadButton{
-    margin-left : 16px;
-}

main/inc/lib/javascript/bigupload/inc/bigUpload.php

@@ -225,11 +225,12 @@ class BigUpload
             chmod($tmpFile, '0777');
             $workInfo = get_work_data_by_id($_REQUEST['id']);
             $values = $_REQUEST;
-            $course_info = api_get_course_info();
-            $session_id = api_get_session_id();
-            $group_id = api_get_group_id();
-            $user_id = api_get_user_id();
+            $courseInfo = api_get_course_info();
+            $sessionId = api_get_session_id();
+            $groupId = api_get_group_id();
+            $userId = api_get_user_id();
             $values['contains_file'] = 1;
+            $values['title'] = $finalName;
             $file = [
                 'name' => $finalName,
                 'type' => $_POST['type'],
@@ -243,10 +244,10 @@ class BigUpload
             $result = processWorkForm(
                 $workInfo,
                 $values,
-                $course_info,
-                $session_id,
-                $group_id,
-                $user_id,
+                $courseInfo,
+                $sessionId,
+                $groupId,
+                $userId,
                 $file,
                 api_get_configuration_value('assignment_prevent_duplicate_upload')
             );

main/work/work.lib.php

@@ -4498,15 +4498,16 @@ function setWorkUploadForm($form, $uploadFormType = 0)
             break;
         case 2:
             // Only file.
-            $form->addElement(
+            /*$form->addElement(
                 'file',
                 'file',
                 get_lang('UploadADocument'),
                 'size="40" onchange="updateDocumentTitle(this.value)"'
             );
             $form->addProgress();
+            */
+            $form->addElement('BigUpload', 'file', get_lang('UploadADocument'), ['id' => 'bigUploadFile', 'data-origin' => 'work']);
             $form->addRule('file', get_lang('ThisFieldIsRequired'), 'required');
-            //$form->addElement('BigUpload', 'file', get_lang('UploadADocument'), ['id' => 'bigUploadFile', 'data-origin' => 'work']);
             break;
     }