Merge branch 'release/3.7.0'

aarpon · Dec 13, 2019 · 612b8d1 · 612b8d1
2 parents 0891e1e + 320a791
commit 612b8d1
Show file tree

Hide file tree

Showing 85 changed files with 3,965 additions and 2,578 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ css/custom.css
 
 # macOS finder files 
 *.DS_Store
+*.phpunit.result.cache
diff --git a/aberration_correction.php b/aberration_correction.php
@@ -35,7 +35,7 @@
 
 /* In this page, all parameters are required! */
 $parameterNames = $_SESSION['setting']->correctionParameterNames();
-$db = new DatabaseConnection();
+$db = DatabaseConnection::get();
 foreach ($parameterNames as $name) {
     /** @var Parameter $parameter */
     $parameter = $_SESSION['setting']->parameter($name);

diff --git a/account.php b/account.php
@@ -77,14 +77,11 @@
     exit();
 }
 
-if (isset($_SERVER['HTTP_REFERER']) &&
-    !strstr($_SERVER['HTTP_REFERER'], 'account')
-) {
+if (isset($_SERVER['HTTP_REFERER']) && !strstr($_SERVER['HTTP_REFERER'], 'account')) {
     $_SESSION['referer'] = $_SERVER['HTTP_REFERER'];
 }
 
 if (isset($_SESSION['account_user'])) {
-
     // Make sure the User is properly loaded
     $edit_user = $_SESSION['account_user'];
 
@@ -100,62 +97,47 @@
  *
  **************************************************************************** */
 
-// If updating some other User setting, remove the loaded
-// User from the session and return to the referer page.
-if ((isset($_POST['cancel']))) {
-   unset($_SESSION['account_user']);
-   header("Location: " . $_SESSION['referer']);
-   exit();
-}
-
 if (isset($_POST['modify'])) {
-
     // Initialize the result to True
-    $result = True;
+    $result = true;
 
     // E-mail address
     if (UserManager::canModifyEmailAddress($edit_user)) {
-
         // Check that a valid e-mail address was provided
         if ($clean['email'] == "") {
-            $result = False;
+            $result = false;
             $message = "Please fill in the email field with a valid address";
         } else {
             $emailToUse = $clean['email'];
         }
 
     } else {
-
         // Use current e-mail address
         $emailToUse = $edit_user->emailAddress();
-
     }
 
     // User group
     if (UserManager::canModifyGroup($edit_user)) {
-
         // Check that a valid group was provided
         if ($clean['group'] == "") {
-            $result = False;
+            $result = false;
             $message = "Please fill in the group field";
         } else {
             $groupToUse = $clean['group'];
         }
 
     } else {
-
         // Use current group
         $groupToUse = $edit_user->userGroup();
-
     }
 
     // Passwords
     if ($clean['pass1'] == "" || $clean['pass2'] == "") {
-        $result = False;
+        $result = false;
         $message = "Please fill in both password fields";
     } else {
         if ($clean['pass1'] != $clean['pass2']) {
-            $result = False;
+            $result = false;
             $message = "Passwords do not match";
         } else {
             $passToUse = $clean['pass1'];
@@ -164,32 +146,29 @@
 
     // Update the information in the database
     if ($result == true) {
-
         // Update the User information
         if (UserManager::canModifyEmailAddress($edit_user)) {
             $edit_user->SetEmailAddress($emailToUse);
         }
         if (UserManager::canModifyGroup($edit_user)) {
             $edit_user->SetGroup($groupToUse);
         }
-        $success = UserManager::storeUser($edit_user, true);
+        try {
+            $success = UserManager::storeUser($edit_user, true);
+        } catch (Exception $e) {
+            $success = false;
+        }
 
         if ($success == true) {
-
             // Now we need to update the password (and update the success
             // status).
-            $success &= UserManager::changeUserPassword($edit_user->name(),
-                $passToUse);
-
+            $success &= UserManager::changeUserPassword($edit_user->name(), $passToUse);
         }
 
         if (!$success) {
-
-            $message = "Sorry, an error occurred and the user data could " .
-                "not be updated!";
+            $message = "Sorry, an error occurred and the user data could not be updated!";
 
         } else {
-
             // If updating some other User setting, remove the modified
             // User from the session and return to the user management page.
             if (isset($_SESSION['account_user'])) {
@@ -255,7 +234,6 @@
             $somethingToChange = false;
 
             if (UserManager::canModifyEmailAddress($edit_user)) {
-
                 $emailForForm = "";
                 if ($clean['email'] != "") {
                     $emailForForm = $clean['email'];
@@ -279,7 +257,6 @@
             <?php
 
             if (UserManager::canModifyGroup($edit_user)) {
-
                 $emailForForm = "";
                 if ($clean['group'] != "") {
                     $groupForForm = $clean['group'];
@@ -318,7 +295,7 @@
                 $somethingToChange = true;
             }
             ?>
-            <p/>
+            <p>&nbsp;</p>
 
             <?php
             $referer = $_SESSION['referer'];
@@ -329,7 +306,7 @@
         if ($somethingToChange == true) {
             ?>
             <div id="controls">
-                <input type="submit" name="cancel" value=""
+                <input type="button" name="cancel" value=""
                        class="icon cancel"
                        onmouseover="TagToTip('ttSpanCancel' )"
                        onmouseout="UnTip()"
@@ -352,7 +329,7 @@ class="icon cancel"
                        onclick="document.location.href='<?php echo $referer ?>'"/>
             </div>
 
-        <?php
+            <?php
         }
         ?>
     </form>

diff --git a/add_user.php b/add_user.php
@@ -75,6 +75,12 @@
  * END OF SANITIZE INPUT
  *
  */
+
+if (isset($_GET['home'])) {
+    header("Location: " . "home.php");
+    exit();
+}
+
 // Add the user
 if (isset($_POST['add'])) {
 

diff --git a/ajax/ajax.php b/ajax/ajax.php
@@ -145,7 +145,7 @@ function getJobQueueTable()
         foreach ($rows as $row) {
             if ($row['status'] == "started") {
                 $color = '#99ffcc';
-            } else if ($row['status'] == "broken" || $row['status'] == "kill") {
+            } else if ($row['status'] == "delete" || $row['status'] == "kill") {
                 $color = '#ff9999';
             } else if ($index % 2 == 0) {
                 $color = '#ffccff';
@@ -159,7 +159,7 @@ function getJobQueueTable()
                 $_SESSION['user']->isAdmin()
             ) {
 
-                if ($row['status'] != "broken") {
+                if ($row['status'] != "delete" && $row['status'] != "kill") {
 
                     $data .= '
           <td>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,4 @@ css/custom.css

		# macOS finder files
		*.DS_Store
		*.phpunit.result.cache