Merge branch 'xdmod11.0' into portal-settings-migration-escape-quotes

docs/support.md

@@ -5,18 +5,12 @@ title: Support
 Support Lifecycle
 -----------------
 
-In general, Open XDMoD has two major releases each year and each major version will receive support
+In general, Open XDMoD has one or two major releases each year, and each major version will receive support
  for one year from the time of initial release.  This includes security fixes and other critical updates in
 addition to limited access to our support team.
 
-Note that there was only one major release of Open XDMoD in 2022 due to the team supporting the
-transition from the [XD Metrics Service](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1445806)
- to [ACCESS Metrics](https://metrics.access-ci.org). The 10.0 release of
-Open XDMoD therefore has a longer than typical support time.
-
 | Version | Release Date       | End of Support      |
 |---------|--------------------|---------------------|
-| 10.0    | March 10, 2022     | September 10, 2023  |
 | 10.5    | September 03, 2023 | September 03, 2024* |
 
 **\* Note: CentOS 7 will officially reach end of life on June 30, 2024, and as such so will our official support for el7 XDMoD.**

html/.eslintrc.json

@@ -1,6 +1,7 @@
 {
   "env": {
-    "browser": true
+    "browser": true,
+    "es6": true
   },
   "globals": {
     "AppKernel": false,

html/gui/js/profile_editor/ProfileApiToken.js

@@ -355,10 +355,7 @@ XDMoD.ProfileApiToken = Ext.extend(Ext.form.FormPanel, {
     },
 
     showReceivedToken: function () {
-        var isTokenExpired = (
-            new Date(this.creationDate)
-            >= new Date(this.expirationDate)
-        );
+        var isTokenExpired = (new Date() >= new Date(this.expirationDate));
         if (isTokenExpired) {
             this.showMsg(this.getExpiredTokenMsg());
         } else {

html/index.php

@@ -41,11 +41,12 @@
         // TODO: Refactor generic catch block below to handle specific exceptions,
         //       which would allow this block to be removed.
         throw $see;
+    } catch (PDOException $e) {
+        xd_web_message\displayMessage('XDMoD is currently experiencing a temporary outage.', 'Status: session=true code=' . $e->getCode(), true);
+        exit;
     } catch (Exception $e) {
-
         xd_web_message\displayMessage('There was a problem initializing your account.', $e->getMessage(), true);
         exit;
-
     }
 
     if (!isset($user) || !isset($_SESSION['session_token'])) {
@@ -76,7 +77,12 @@ function isReferrer($referrer)
         $_SESSION['public_session_token'] = 'public-' . microtime(true) . '-' . uniqid();
     }
 
-    $user = XDUser::getPublicUser();
+    try {
+        $user = XDUser::getPublicUser();
+    } catch (PDOException $e) {
+        xd_web_message\displayMessage('XDMoD is currently experiencing a temporary outage.', 'Status: session=false code=' . $e->getCode(), true);
+        exit;
+    }
 }
 
 $page_title = xd_utilities\getConfiguration('general', 'title');

tests/regression/lib/Controllers/UsageChartsTest.php

@@ -114,7 +114,7 @@ private function phash($type, $imageData)
             fclose($pipes[2]);
             $retval = proc_close($process);
             if (strlen($err) > 0 || $retval !== 0) {
-                throw new Exception("imagehash returned $retval stderr='$err'");
+                throw new \UnexpectedValueException("imagehash returned $retval stderr='$err'");
             }
         } else {
             $out = sha1($imageData);