Add drag and drop for admin ticket, fix URL for other pages

admin/admin_submit_ticket.php

@@ -171,10 +171,23 @@ if ($hesk_settings['attachments']['use']) {
     $attachments = array();
     $trackingID = $tmpvar['trackid'];
 
-    for ($i = 1; $i <= $hesk_settings['attachments']['max_number']; $i++) {
+    $use_legacy_attachments = hesk_POST('use-legacy-attachments', 0);
-        $att = hesk_uploadFile($i);
+
-        if ($att !== false && !empty($att)) {
+    if ($use_legacy_attachments) {
-            $attachments[$i] = $att;
+        for ($i = 1; $i <= $hesk_settings['attachments']['max_number']; $i++) {
+            $att = hesk_uploadFile($i);
+            if ($att !== false && !empty($att)) {
+                $attachments[$i] = $att;
+            }
+        }
+    } else {
+        // The user used the new drag-and-drop system.
+        $temp_attachment_ids = hesk_POST_array('attachment-ids');
+        foreach ($temp_attachment_ids as $temp_attachment_id) {
+            // Simply get the temp info and move it to the attachments table
+            $temp_attachment = mfh_getTemporaryAttachment($temp_attachment_id);
+            $attachments[] = $temp_attachment;
+            mfh_deleteTemporaryAttachment($temp_attachment_id);
         }
     }
 }

admin/new_ticket.php

@@ -40,6 +40,7 @@ define('AUTOFOCUS', true);
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/view_attachment_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -1032,18 +1033,24 @@ if ($hesk_settings['attachments']['use']) {
         <label for="attachments" class="control-label col-sm-3"><?php echo $hesklang['attachments']; ?>:</label>
 
         <div class="col-sm-9">
-            <?php
+            <div class="dropzone" id="filedrop">
-            for ($i = 1; $i <= $hesk_settings['attachments']['max_number']; $i++) {
+                <div class="fallback">
-                $cls = ($i == 1 && in_array('attachments', $_SESSION['iserror'])) ? ' class="isError" ' : '';
+                    <input type="hidden" name="use-legacy-attachments" value="1">
-                echo '<input type="file" name="attachment[' . $i . ']" size="50" ' . $cls . ' /><br />';
+                    <?php
-            }
+                    for ($i = 1; $i <= $hesk_settings['attachments']['max_number']; $i++) {
-            ?>
+                        $cls = ($i == 1 && in_array('attachments', $_SESSION['iserror'])) ? ' class="isError" ' : '';
-            <a href="Javascript:void(0)"
+                        echo '<input type="file" name="attachment[' . $i . ']" size="50" ' . $cls . ' /><br />';
-               onclick="Javascript:hesk_window('../file_limits.php',250,500);return false;"><?php echo $hesklang['ful']; ?></a>
+                    }
+                    ?>
+                </div>
+            </div>
+            <a href="file_limits.php" target="_blank"
+               onclick="Javascript:hesk_window('file_limits.php',250,500);return false;"><?php echo $hesklang['ful']; ?></a>
         </div>
     </div>
     <hr/>
     <?php
+    display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
 }
 ?>
 <!-- Admin options -->

inc/headerAdmin.inc.php

@@ -75,12 +75,14 @@ $modsForHesk_settings = mfh_getSettings();
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone.min.css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone-basic.min.css">
     <script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
+    <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/dropzone.min.js"></script>
     <script language="Javascript" type="text/javascript"
             src="<?php echo HESK_PATH; ?>js/modsForHesk-javascript.js"></script>
-    <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
     <script language="JavaScript" type="text/javascript"
             src="<?php echo HESK_PATH; ?>js/bootstrap-datepicker.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-fontawesome-4.3.0.js"></script>

inc/view_attachment_functions.inc.php

@@ -231,7 +231,7 @@ function display_dropzone_field($url) {
             });
         },
         paramName: 'attachment',
-        url: ".json_encode($url).",
+        url: '" . $url . "',
         parallelUploads: 1,
         uploadMultiple: false,
         maxFiles: 1,

index.php

@@ -996,7 +996,7 @@ function print_add_ticket()
                         </div>
                     </div>
                     <?php
-                    display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php');
+                    display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
                 }
 
                 if ($hesk_settings['question_use'] || $hesk_settings['secimg_use'])

ticket.php

@@ -651,7 +651,7 @@ function hesk_printCustomerReplyForm($reopen = 0)
                 </div>
             </div>
             <?php
-            display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php');
+            display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
         }
         ?>
         <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>