Merge branch 'devel' into 'master'.

# Conflicts:
#	composer.json
#	composer.lock
#	composer.phar

.gitignore

@@ -25,9 +25,12 @@ css/custom.css
 # file marking a development version
 .hrm_devel_version
 
-# Composer's vendor folder 
+# Composer's vendor folder
 /vendor/
 
-# macOS finder files 
+# macOS finder files
 *.DS_Store
 *.phpunit.result.cache
+
+# symlink to the HRM-OMERO connector
+bin/ome_hrm.py

add_user.php

@@ -16,8 +16,6 @@
 // Settings
 global $hrm_url, $image_folder, $image_host, $email_sender, $userManagerScript;
 
-require_once dirname(__FILE__) . '/inc/bootstrap.php';
-
 session_start();
 
 if (!isset($_SESSION['user']) || !$_SESSION['user']->isLoggedIn()) {
@@ -89,7 +87,7 @@
     } else if ($clean["email"] == "") {
         $message = "Please provide a valid email address!";
     } else if ($clean['group'] == "") {
-        $message = "Please a group!";
+        $message = "Please provide a group!";
     } else {
 
         // Make sure that there is no user with same name

ajax/json-rpc-server.php

@@ -389,7 +389,7 @@ function jsonSendTestEmail()
     global $email_admin;
 
     // Include configuration file
-    include(dirname(__FILE__) . "/../config/hrm_client_config.inc");
+    include(dirname(__FILE__) . "/../config/hrm_config.inc");
 
     // Prepare the output array
     $json = initJSONArray();
@@ -1069,6 +1069,20 @@ function jsonRemoveFilesFromSelection($fileList)
 
 function processFilesAndSelectedFilesLists($allFiles, $selectedFiles, $fileServer, $format)
 {
+    // Sanity checks
+    if ($allFiles === null) {
+        $allFiles = [];
+    }
+    if ($selectedFiles === null) {
+        $selectedFiles = [];
+    }
+    if (gettype($allFiles) == "string") {
+        $allFiles = [$allFiles];
+    }
+    if (gettype($selectedFiles) == "string") {
+        $selectedFiles = [$selectedFiles];
+    }
+
     // Are the selected files compatible with the current format?
     if (count($selectedFiles) > 0 && !$fileServer->checkAgainstFormat($selectedFiles[0], $format)) {
         $fileServer->removeAllFilesFromSelection();