From bb8714ba4a105bd6a46f4b4c461a4d68147c9a11 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 5 Jul 2020 19:03:45 +0000
Subject: [PATCH]

---
 Controllers/OpsController.cs            |  12 +--
 util/RfVersion.cs                       |   2 +-
 wwwroot/default.htm                     | 112 ++++++++++++------------
 wwwroot/js/app.api.js                   |   2 +-
 wwwroot/js/app.ops.js                   |   4 +-
 wwwroot/js/templates/app.ops.handlebars |  14 ---
 6 files changed, 65 insertions(+), 81 deletions(-)

diff --git a/Controllers/OpsController.cs b/Controllers/OpsController.cs
index 3338ded..4335c05 100644
--- a/Controllers/OpsController.cs
+++ b/Controllers/OpsController.cs
@@ -60,12 +60,12 @@ namespace rockfishCore.Controllers
                     case "ContactForm":
                         Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/contact", "Contact.Email");
                         break;
-                    case "RequestForm":
-                        Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/request", "Contact.Email");
-                        break;
-                    case "RequestLiteForm":
-                        Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/requestlite", "Contact.Email");
-                        break;
+                    // case "RequestForm":
+                    //     Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/request", "Contact.Email");
+                    //     break;
+                    // case "RequestLiteForm":
+                    //     Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/requestlite", "Contact.Email");
+                    //     break;
                     case "Subversion":
                         Ret.Status = OpsDiagnostics.CheckWebsite("http://svn.ayanova.com:3343/csvn/login/auth", "Subversion Edge");
                         break;
diff --git a/util/RfVersion.cs b/util/RfVersion.cs
index fafe3c3..4ed5d97 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.9";
+        public const string NumberOnly="6.10";
         public const string Full = "Rockfish server " + NumberOnly;                
     }
 }
\ No newline at end of file
diff --git a/wwwroot/default.htm b/wwwroot/default.htm
index 037b398..fc094a3 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.9">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.9">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.9">
-  <link rel="manifest" href="/manifest.json?rfv=6.9">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.9" color="#5bbad5">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.10">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.10">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.10">
+  <link rel="manifest" href="/manifest.json?rfv=6.10">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.10" color="#5bbad5">
   <meta name="theme-color" content="#ffffff">
 
 
   <!-- 3rd party components fonts and icons -->
-  <link href="css/materialdesignicons.min.css?rfv=6.9" media="all" rel="stylesheet" type="text/css" />
-  <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.9" type="text/css" />
-  <link rel="stylesheet" href="css/app.css?rfv=6.9" type="text/css" />
-  <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.9" type="text/css" />
+  <link href="css/materialdesignicons.min.css?rfv=6.10" media="all" rel="stylesheet" type="text/css" />
+  <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.10" type="text/css" />
+  <link rel="stylesheet" href="css/app.css?rfv=6.10" type="text/css" />
+  <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.10" type="text/css" />
 
 
 
   <!-- third-party javascript -->
-  <script src="js/lib/jquery-3.3.1.min.js?rfv=6.9"></script>
-  <script src="js/lib/page.js?rfv=6.9"></script>
-  <script src="js/lib/jquery.event.gevent.js?rfv=6.9"></script>
-  <script src="js/lib/jquery.gzserialize.js?rfv=6.9"></script>
-  <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.9"></script>
-  <script src="js/lib/store.min.js?rfv=6.9"></script>
-  <script src="js/lib/jquery.autocomplete.min.js?rfv=6.9"></script>
-  <script src="js/lib/moment.min.js?rfv=6.9"></script>
+  <script src="js/lib/jquery-3.3.1.min.js?rfv=6.10"></script>
+  <script src="js/lib/page.js?rfv=6.10"></script>
+  <script src="js/lib/jquery.event.gevent.js?rfv=6.10"></script>
+  <script src="js/lib/jquery.gzserialize.js?rfv=6.10"></script>
+  <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.10"></script>
+  <script src="js/lib/store.min.js?rfv=6.10"></script>
+  <script src="js/lib/jquery.autocomplete.min.js?rfv=6.10"></script>
+  <script src="js/lib/moment.min.js?rfv=6.10"></script>
 
   <!-- our javascript -->  
-  <script src="js/index.js?rfv=6.9"></script>
-  <script src="js/app.util.js?rfv=6.9"></script>
-  <script src="js/app.api.js?rfv=6.9"></script>
-  <script src="js/app.utilB.js?rfv=6.9"></script>
-  <script src="js/app.nav.js?rfv=6.9"></script>
-  <script src="js/app.shell.js?rfv=6.9"></script>
-  <script src="js/app.fourohfour.js?rfv=6.9"></script>
-  <script src="js/app.authenticate.js?rfv=6.9"></script>
-  <script src="js/app.customers.js?rfv=6.9"></script>
-  <script src="js/app.customerEdit.js?rfv=6.9"></script>
-  <script src="js/app.customerSites.js?rfv=6.9"></script>
-  <script src="js/app.customerSiteEdit.js?rfv=6.9"></script>
-  <script src="js/app.purchases.js?rfv=6.9"></script>
-  <script src="js/app.purchaseEdit.js?rfv=6.9"></script>
-  <script src="js/app.license.js?rfv=6.9"></script>
-  <script src="js/app.licenseTemplates.js?rfv=6.9"></script>
-  <script src="js/app.licenseRequestEdit.js?rfv=6.9"></script>
-  <script src="js/app.licenses.js?rfv=6.9"></script>
-  <script src="js/app.licenseView.js?rfv=6.9"></script>
-  <script src="js/app.reportData.js?rfv=6.9"></script>
-  <script src="js/app.reportDataProdEmail.js?rfv=6.9"></script>
-  <script src="js/app.reportDataExpires.js?rfv=6.9"></script>
-  <script src="js/app.search.js?rfv=6.9"></script>
-  <script src="js/app.subscription.js?rfv=6.9"></script>
-  <script src="js/app.subnotify.js?rfv=6.9"></script>
-  <script src="js/app.templates.js?rfv=6.9"></script>
-  <script src="js/app.templateEdit.js?rfv=6.9"></script>
-  <script src="js/app.inbox.js?rfv=6.9"></script>
-  <script src="js/app.mailEdit.js?rfv=6.9"></script>
-  <script src="js/app.rfcaseEdit.js?rfv=6.9"></script>
-  <script src="js/app.rfcases.js?rfv=6.9"></script>
-  <script src="js/app.rfsettings.js?rfv=6.9"></script>
-  <script src="js/app.ops.js?rfv=6.9"></script>
-  <script src="js/app.trials.js?rfv=6.9"></script>
-  <script src="js/app.trialEdit.js?rfv=6.9"></script>
-  <script src="js/app.ravLicenses.js?rfv=6.9"></script>
-  <script src="js/app.ravLicense.js?rfv=6.9"></script>
+  <script src="js/index.js?rfv=6.10"></script>
+  <script src="js/app.util.js?rfv=6.10"></script>
+  <script src="js/app.api.js?rfv=6.10"></script>
+  <script src="js/app.utilB.js?rfv=6.10"></script>
+  <script src="js/app.nav.js?rfv=6.10"></script>
+  <script src="js/app.shell.js?rfv=6.10"></script>
+  <script src="js/app.fourohfour.js?rfv=6.10"></script>
+  <script src="js/app.authenticate.js?rfv=6.10"></script>
+  <script src="js/app.customers.js?rfv=6.10"></script>
+  <script src="js/app.customerEdit.js?rfv=6.10"></script>
+  <script src="js/app.customerSites.js?rfv=6.10"></script>
+  <script src="js/app.customerSiteEdit.js?rfv=6.10"></script>
+  <script src="js/app.purchases.js?rfv=6.10"></script>
+  <script src="js/app.purchaseEdit.js?rfv=6.10"></script>
+  <script src="js/app.license.js?rfv=6.10"></script>
+  <script src="js/app.licenseTemplates.js?rfv=6.10"></script>
+  <script src="js/app.licenseRequestEdit.js?rfv=6.10"></script>
+  <script src="js/app.licenses.js?rfv=6.10"></script>
+  <script src="js/app.licenseView.js?rfv=6.10"></script>
+  <script src="js/app.reportData.js?rfv=6.10"></script>
+  <script src="js/app.reportDataProdEmail.js?rfv=6.10"></script>
+  <script src="js/app.reportDataExpires.js?rfv=6.10"></script>
+  <script src="js/app.search.js?rfv=6.10"></script>
+  <script src="js/app.subscription.js?rfv=6.10"></script>
+  <script src="js/app.subnotify.js?rfv=6.10"></script>
+  <script src="js/app.templates.js?rfv=6.10"></script>
+  <script src="js/app.templateEdit.js?rfv=6.10"></script>
+  <script src="js/app.inbox.js?rfv=6.10"></script>
+  <script src="js/app.mailEdit.js?rfv=6.10"></script>
+  <script src="js/app.rfcaseEdit.js?rfv=6.10"></script>
+  <script src="js/app.rfcases.js?rfv=6.10"></script>
+  <script src="js/app.rfsettings.js?rfv=6.10"></script>
+  <script src="js/app.ops.js?rfv=6.10"></script>
+  <script src="js/app.trials.js?rfv=6.10"></script>
+  <script src="js/app.trialEdit.js?rfv=6.10"></script>
+  <script src="js/app.ravLicenses.js?rfv=6.10"></script>
+  <script src="js/app.ravLicense.js?rfv=6.10"></script>
 
   <!-- handlebars templates -->
-  <script src="js/templates/templates.js?rfv=6.9"></script>
+  <script src="js/templates/templates.js?rfv=6.10"></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.9"></script>
+  <script src="js/lib/bootstrap.min.js?rfv=6.10"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/wwwroot/js/app.api.js b/wwwroot/js/app.api.js
index ae58e17..ede405e 100644
--- a/wwwroot/js/app.api.js
+++ b/wwwroot/js/app.api.js
@@ -29,7 +29,7 @@ app.api = (function () {
     generateFromRequest,
     licenseEmailResponse;
 
-  RockFishVersion = "6.9";
+  RockFishVersion = "6.10";
 
   //////////////////////////////////////////////////////////////////////////////////////
   //         NOT AUTHORIZED ERROR HANDLER
diff --git a/wwwroot/js/app.ops.js b/wwwroot/js/app.ops.js
index c7969e2..707d024 100644
--- a/wwwroot/js/app.ops.js
+++ b/wwwroot/js/app.ops.js
@@ -77,9 +77,7 @@ app.ops = (function() {
     checkService("MailMirror");
     checkService("AyaNovaSite");
     checkService("Backup");
-    checkService("ContactForm");
-    checkService("RequestForm");
-    checkService("RequestLiteForm");
+    checkService("ContactForm");  
     checkService("Forum");
     checkService("Subversion");
     checkService("DevOps");
diff --git a/wwwroot/js/templates/app.ops.handlebars b/wwwroot/js/templates/app.ops.handlebars
index ed12d69..7c1e61e 100644
--- a/wwwroot/js/templates/app.ops.handlebars
+++ b/wwwroot/js/templates/app.ops.handlebars
@@ -30,20 +30,6 @@
             </h5>
             <pre id="ContactForm-error" class="text-danger"></pre>
         </div>
-        <div>
-            <h5>
-                <i id="RequestForm" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
-                Request form
-            </h5>
-            <pre id="RequestForm-error" class="text-danger"></pre>
-        </div>
-        <div>
-            <h5>
-                <i id="RequestLiteForm" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
-                Request lite form
-            </h5>
-            <pre id="RequestLiteForm-error" class="text-danger"></pre>
-        </div>
         <div>
             <h5>
                 <i id="Forum" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>