From 084e4a23d4a19560568d8ba430401bcfc474bd01 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 10 Jun 2022 00:04:01 +0000
Subject: [PATCH]

---
 util/OpsDiagnostics.cs |  16 +++---
 util/RfVersion.cs      |   2 +-
 wwwroot/default.htm    | 112 ++++++++++++++++++++---------------------
 wwwroot/js/app.api.js  |   2 +-
 4 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/util/OpsDiagnostics.cs b/util/OpsDiagnostics.cs
index 8170a2b..8b20dd3 100644
--- a/util/OpsDiagnostics.cs
+++ b/util/OpsDiagnostics.cs
@@ -99,8 +99,8 @@ namespace rockfishCore.Util
 
         public static bool VerifyBackups()
         {
-            string[] CriticalDailyBackupFilePrefixes = { "ayanova21-pecklist-db-backup-", "ayanova21-rockfish-db-backup-", "mail21-svn-backup-" };
-            string[] Level2ManualBackupFilePrefixes = { "forum21-backup-", "ayanova21-website-backup-" };
+            string[] CriticalDailyBackupFilePrefixes = { "ayanova21-pecklist-db-backup-", "ayanova21-rockfish-db-backup-", "mail21-svn-backup-", "forum21-backup-" };
+            string[] Level2ManualBackupFilePrefixes = { "ayanova21-website-backup-" };
             var SpacesFileNames = GetFileListFromSpacesBackupStorage();
 
             //Daily critical files
@@ -119,17 +119,19 @@ namespace rockfishCore.Util
                 }
             }
 
-            //Website and Forum sb at least three of each, so just ensure there are three matches
-            //we dont' care about date for these ones, just presence
+            //Manual backups are random in quantity so just confirm there is at least one
+            //we dont' care about date for these ones, just presence of at least one
             int FoundLevel2Matches = 0;
             foreach (string ExpectedFileName in Level2ManualBackupFilePrefixes)
                 foreach (string FileName in SpacesFileNames)
                     if (FileName.StartsWith(ExpectedFileName))
+                    {
                         FoundLevel2Matches++;
+                        break;
+                    }
 
-            //should be one each of the critical and 3 each of the level2 
-            //todo: as long as there is one of each that's fine
-            return (FoundCriticalMatches == CriticalDailyBackupFilePrefixes.Length && FoundLevel2Matches == (Level2ManualBackupFilePrefixes.Length * 3));
+            //At least one of each separate manual backup file          
+            return (FoundCriticalMatches == CriticalDailyBackupFilePrefixes.Length && FoundLevel2Matches == Level2ManualBackupFilePrefixes.Length);
         }
 
 
diff --git a/util/RfVersion.cs b/util/RfVersion.cs
index 7da0afa..e00155f 100644
--- a/util/RfVersion.cs
+++ b/util/RfVersion.cs
@@ -2,7 +2,7 @@ namespace rockfishCore.Util
 {    
     public static class RfVersion
     {
-        public const string NumberOnly="6.14";
+        public const string NumberOnly="6.15";
         public const string Full = "Rockfish server " + NumberOnly;                
     }
 }
\ No newline at end of file
diff --git a/wwwroot/default.htm b/wwwroot/default.htm
index 74f2061..ec53f6b 100644
--- a/wwwroot/default.htm
+++ b/wwwroot/default.htm
@@ -11,73 +11,73 @@
   <title>Rockfish loading....</title>
 
   <!-- ICONS / MANIFEST -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.14">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.14">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.14">
-  <link rel="manifest" href="/manifest.json?rfv=6.14">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.14" color="#5bbad5">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.15">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.15">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.15">
+  <link rel="manifest" href="/manifest.json?rfv=6.15">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.15" color="#5bbad5">
   <meta name="theme-color" content="#ffffff">
 
 
   <!-- 3rd party components fonts and icons -->
-  <link href="css/materialdesignicons.min.css?rfv=6.14" media="all" rel="stylesheet" type="text/css" />
-  <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.14" type="text/css" />
-  <link rel="stylesheet" href="css/app.css?rfv=6.14" type="text/css" />
-  <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.14" type="text/css" />
+  <link href="css/materialdesignicons.min.css?rfv=6.15" media="all" rel="stylesheet" type="text/css" />
+  <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.15" type="text/css" />
+  <link rel="stylesheet" href="css/app.css?rfv=6.15" type="text/css" />
+  <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.15" type="text/css" />
 
 
 
   <!-- third-party javascript -->
-  <script src="js/lib/jquery-3.3.1.min.js?rfv=6.14"></script>
-  <script src="js/lib/page.js?rfv=6.14"></script>
-  <script src="js/lib/jquery.event.gevent.js?rfv=6.14"></script>
-  <script src="js/lib/jquery.gzserialize.js?rfv=6.14"></script>
-  <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.14"></script>
-  <script src="js/lib/store.min.js?rfv=6.14"></script>
-  <script src="js/lib/jquery.autocomplete.min.js?rfv=6.14"></script>
-  <script src="js/lib/moment.min.js?rfv=6.14"></script>
+  <script src="js/lib/jquery-3.3.1.min.js?rfv=6.15"></script>
+  <script src="js/lib/page.js?rfv=6.15"></script>
+  <script src="js/lib/jquery.event.gevent.js?rfv=6.15"></script>
+  <script src="js/lib/jquery.gzserialize.js?rfv=6.15"></script>
+  <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.15"></script>
+  <script src="js/lib/store.min.js?rfv=6.15"></script>
+  <script src="js/lib/jquery.autocomplete.min.js?rfv=6.15"></script>
+  <script src="js/lib/moment.min.js?rfv=6.15"></script>
 
   <!-- our javascript -->  
-  <script src="js/index.js?rfv=6.14"></script>
-  <script src="js/app.util.js?rfv=6.14"></script>
-  <script src="js/app.api.js?rfv=6.14"></script>
-  <script src="js/app.utilB.js?rfv=6.14"></script>
-  <script src="js/app.nav.js?rfv=6.14"></script>
-  <script src="js/app.shell.js?rfv=6.14"></script>
-  <script src="js/app.fourohfour.js?rfv=6.14"></script>
-  <script src="js/app.authenticate.js?rfv=6.14"></script>
-  <script src="js/app.customers.js?rfv=6.14"></script>
-  <script src="js/app.customerEdit.js?rfv=6.14"></script>
-  <script src="js/app.customerSites.js?rfv=6.14"></script>
-  <script src="js/app.customerSiteEdit.js?rfv=6.14"></script>
-  <script src="js/app.purchases.js?rfv=6.14"></script>
-  <script src="js/app.purchaseEdit.js?rfv=6.14"></script>
-  <script src="js/app.license.js?rfv=6.14"></script>
-  <script src="js/app.licenseTemplates.js?rfv=6.14"></script>
-  <script src="js/app.licenseRequestEdit.js?rfv=6.14"></script>
-  <script src="js/app.licenses.js?rfv=6.14"></script>
-  <script src="js/app.licenseView.js?rfv=6.14"></script>
-  <script src="js/app.reportData.js?rfv=6.14"></script>
-  <script src="js/app.reportDataProdEmail.js?rfv=6.14"></script>
-  <script src="js/app.reportDataExpires.js?rfv=6.14"></script>
-  <script src="js/app.search.js?rfv=6.14"></script>
-  <script src="js/app.subscription.js?rfv=6.14"></script>
-  <script src="js/app.subnotify.js?rfv=6.14"></script>
-  <script src="js/app.templates.js?rfv=6.14"></script>
-  <script src="js/app.templateEdit.js?rfv=6.14"></script>
-  <script src="js/app.inbox.js?rfv=6.14"></script>
-  <script src="js/app.mailEdit.js?rfv=6.14"></script>
-  <script src="js/app.rfcaseEdit.js?rfv=6.14"></script>
-  <script src="js/app.rfcases.js?rfv=6.14"></script>
-  <script src="js/app.rfsettings.js?rfv=6.14"></script>
-  <script src="js/app.ops.js?rfv=6.14"></script>
-  <script src="js/app.trials.js?rfv=6.14"></script>
-  <script src="js/app.trialEdit.js?rfv=6.14"></script>
-  <script src="js/app.ravLicenses.js?rfv=6.14"></script>
-  <script src="js/app.ravLicense.js?rfv=6.14"></script>
+  <script src="js/index.js?rfv=6.15"></script>
+  <script src="js/app.util.js?rfv=6.15"></script>
+  <script src="js/app.api.js?rfv=6.15"></script>
+  <script src="js/app.utilB.js?rfv=6.15"></script>
+  <script src="js/app.nav.js?rfv=6.15"></script>
+  <script src="js/app.shell.js?rfv=6.15"></script>
+  <script src="js/app.fourohfour.js?rfv=6.15"></script>
+  <script src="js/app.authenticate.js?rfv=6.15"></script>
+  <script src="js/app.customers.js?rfv=6.15"></script>
+  <script src="js/app.customerEdit.js?rfv=6.15"></script>
+  <script src="js/app.customerSites.js?rfv=6.15"></script>
+  <script src="js/app.customerSiteEdit.js?rfv=6.15"></script>
+  <script src="js/app.purchases.js?rfv=6.15"></script>
+  <script src="js/app.purchaseEdit.js?rfv=6.15"></script>
+  <script src="js/app.license.js?rfv=6.15"></script>
+  <script src="js/app.licenseTemplates.js?rfv=6.15"></script>
+  <script src="js/app.licenseRequestEdit.js?rfv=6.15"></script>
+  <script src="js/app.licenses.js?rfv=6.15"></script>
+  <script src="js/app.licenseView.js?rfv=6.15"></script>
+  <script src="js/app.reportData.js?rfv=6.15"></script>
+  <script src="js/app.reportDataProdEmail.js?rfv=6.15"></script>
+  <script src="js/app.reportDataExpires.js?rfv=6.15"></script>
+  <script src="js/app.search.js?rfv=6.15"></script>
+  <script src="js/app.subscription.js?rfv=6.15"></script>
+  <script src="js/app.subnotify.js?rfv=6.15"></script>
+  <script src="js/app.templates.js?rfv=6.15"></script>
+  <script src="js/app.templateEdit.js?rfv=6.15"></script>
+  <script src="js/app.inbox.js?rfv=6.15"></script>
+  <script src="js/app.mailEdit.js?rfv=6.15"></script>
+  <script src="js/app.rfcaseEdit.js?rfv=6.15"></script>
+  <script src="js/app.rfcases.js?rfv=6.15"></script>
+  <script src="js/app.rfsettings.js?rfv=6.15"></script>
+  <script src="js/app.ops.js?rfv=6.15"></script>
+  <script src="js/app.trials.js?rfv=6.15"></script>
+  <script src="js/app.trialEdit.js?rfv=6.15"></script>
+  <script src="js/app.ravLicenses.js?rfv=6.15"></script>
+  <script src="js/app.ravLicense.js?rfv=6.15"></script>
 
   <!-- handlebars templates -->
-  <script src="js/templates/templates.js?rfv=6.14"></script>
+  <script src="js/templates/templates.js?rfv=6.15"></script>
 
 
   <script>
@@ -107,7 +107,7 @@ window.onerror = function ( error ) {
 
 <body class="rf-body">
   <div id="app" class="container"></div>
-  <script src="js/lib/bootstrap.min.js?rfv=6.14"></script>
+  <script src="js/lib/bootstrap.min.js?rfv=6.15"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/wwwroot/js/app.api.js b/wwwroot/js/app.api.js
index 6fd7da5..3dd6c8f 100644
--- a/wwwroot/js/app.api.js
+++ b/wwwroot/js/app.api.js
@@ -29,7 +29,7 @@ app.api = (function () {
     generateFromRequest,
     licenseEmailResponse;
 
-  RockFishVersion = "6.13";
+  RockFishVersion = "6.15";
 
   //////////////////////////////////////////////////////////////////////////////////////
   //         NOT AUTHORIZED ERROR HANDLER