Merge branch 'feature/uploader' into hrm_ng

Conflicts solved:
	inc/FileBrowser.php
	inc/Fileserver.inc.php
	inc/QueueManager.php
	inc/Util.inc.php
	inc/hrm_config.inc.php

Author: aarpon

Diff for: composer.lock

@@ -75,8 +75,8 @@ $allowHttpTransfer = true;
 // $max_upload_limit AND $max_post_limit. If these are set to 0, they are
 // instead read from the PHP settings. If set to higher values, make sure
 // that the PHP settings allow for such transfer limits. These PHP settings
-// are normally located in php.ini, with the options upload_max filesize AND
-// post_max size.
+// are normally located in php.ini, with the options upload_max_filesize AND
+// post_max_size.
 // Unzipping large archives may also require high max_execution_time and
 // memory_limit variables.
 $allowHttpUpload = true;

Diff for: config/samples/hrm_client_config.inc.sample

@@ -0,0 +1,69 @@
+.buttons {
+    text-align: left;    
+}
+
+.qq-uploader {
+    position: relative;
+    min-height: 200px;
+    overflow-x: hidden;
+    border-radius: 6px;
+    border: 1px dashed #CCCCCC;
+    padding: 3px;
+}
+
+.qq-progress-bar {
+    display: block;
+    background: #4988de;
+    width: 0;
+    height: 14px;
+    border-radius: 6px;
+    margin-bottom: 3px;
+}
+
+.qq-edit-filename-selector {
+    font-size: 12px;
+}
+
+.qq-upload-file-selector {
+    font-size: 11px;
+    text-align: left;
+    width: 280px;
+}
+
+.qq-upload-size-selector {
+    font-size: 11px;
+    text-align: right;
+}
+
+.qq-btn {
+    font-size: 10px;
+    margin: 3px;
+}
+
+#trigger-upload {
+    color: white;
+    font-size: 9px;
+    background: #4988de none;
+    width: 92px;
+    height: 26px;
+}
+
+.qq-upload-button {
+    color: white;
+    font-size: 9px;
+    padding: 7px 20px;
+    background: #4988de none;
+    width: 50px;
+}
+
+.qq-upload-status-text {
+    font-size: 11px;
+}
+
+#fine-uploader-manual-trigger .qq-uploader .qq-total-progress-bar-container {
+    width: 50%;
+}
+
+#fine-uploader-manual-trigger .qq-upload-button {
+    margin-right: 15px;
+}

Diff for: css/custom_fineuploader.css

@@ -196,7 +196,7 @@
                 $browse_folder);
 
     } else if (isset($_GET['upload'])) {
-        $max = Util::getMaxPostSize() / 1024 / 1024;
+        $max = UtilV2::getMaxPostSize() / 1024 / 1024;
         $maxPost = "$max MB";
         $operationResult = "<b>Nothing uploaded!</b> Probably total post " .
             "exceeds maximum allowed size of $maxPost.<br>\n";

Diff for: file_management.php

@@ -5,7 +5,7 @@
 use hrm\Util;
 use hrm\System;
 
-require_once("./inc/bootstrap.php");
+require_once dirname(__FILE__) . '/inc/bootstrap.php';
 
 ?>