From 66d7d24788c9081ce7c5a7158f601b16d4c8b463 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 15 Sep 2016 15:37:09 -0400
Subject: [PATCH] Removed active flag from configuration form and improved
 input error display.

---
 ...e8a6603e49a.file.adminServerStats.html.php |  6 +++---
 ...0d4cf.file.adminServerStatsConfig.html.php | 20 +++++++------------
 views/adminServerStats.html                   |  2 +-
 views/adminServerStatsConfig.html             | 15 +++++---------
 4 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/misc/smarty/templates_c/424fa8075e980e0b540d7353dc3dee8a6603e49a.file.adminServerStats.html.php b/misc/smarty/templates_c/424fa8075e980e0b540d7353dc3dee8a6603e49a.file.adminServerStats.html.php
index 0be8243..ae82f6d 100644
--- a/misc/smarty/templates_c/424fa8075e980e0b540d7353dc3dee8a6603e49a.file.adminServerStats.html.php
+++ b/misc/smarty/templates_c/424fa8075e980e0b540d7353dc3dee8a6603e49a.file.adminServerStats.html.php
@@ -1,4 +1,4 @@
-<?php /* Smarty version Smarty-3.1.21-dev, created on 2016-09-15 17:00:27
+<?php /* Smarty version Smarty-3.1.21-dev, created on 2016-09-15 19:14:37
          compiled from "/var/www/server/discoverkalamazoo.com/wp-content/plugins/glm-serverstats/views/adminServerStats.html" */ ?>
 <?php /*%%SmartyHeaderCode:110119019657d98b9ab16155-83023790%%*/if(!defined('SMARTY_DIR')) exit('no direct access allowed');
 $_valid = $_smarty_tpl->decodeProperties(array (
@@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     '424fa8075e980e0b540d7353dc3dee8a6603e49a' => 
     array (
       0 => '/var/www/server/discoverkalamazoo.com/wp-content/plugins/glm-serverstats/views/adminServerStats.html',
-      1 => 1473958725,
+      1 => 1473963237,
       2 => 'file',
     ),
   ),
@@ -48,7 +48,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
         to set the <b>Target</b> bandwidth for billing purposes. The target bandwidth is per-month
         and is indicated as a dotted line on the "2 Years" graph included below. 
     </p><p>
-        Server Bandwidth is displayed below in <b>Megabytes</b> (millions of bytes) and <b>Gigabytes</b>
+        Server Bandwidth is displayed below in <b>Megabytes</b> (Millions of bytes) and <b>Gigabytes</b>
         (Billions of bytes). A byte is roughly equivalent to one character.
     </p>  
    
diff --git a/misc/smarty/templates_c/5cc7f37bdbecb309b4681cb8d3e4e23f95a0d4cf.file.adminServerStatsConfig.html.php b/misc/smarty/templates_c/5cc7f37bdbecb309b4681cb8d3e4e23f95a0d4cf.file.adminServerStatsConfig.html.php
index 49dfa77..63ffd9a 100644
--- a/misc/smarty/templates_c/5cc7f37bdbecb309b4681cb8d3e4e23f95a0d4cf.file.adminServerStatsConfig.html.php
+++ b/misc/smarty/templates_c/5cc7f37bdbecb309b4681cb8d3e4e23f95a0d4cf.file.adminServerStatsConfig.html.php
@@ -1,4 +1,4 @@
-<?php /* Smarty version Smarty-3.1.21-dev, created on 2016-09-15 14:39:55
+<?php /* Smarty version Smarty-3.1.21-dev, created on 2016-09-15 19:35:46
          compiled from "/var/www/server/discoverkalamazoo.com/wp-content/plugins/glm-serverstats/views/adminServerStatsConfig.html" */ ?>
 <?php /*%%SmartyHeaderCode:8830363857d98e67f03272-04963035%%*/if(!defined('SMARTY_DIR')) exit('no direct access allowed');
 $_valid = $_smarty_tpl->decodeProperties(array (
@@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     '5cc7f37bdbecb309b4681cb8d3e4e23f95a0d4cf' => 
     array (
       0 => '/var/www/server/discoverkalamazoo.com/wp-content/plugins/glm-serverstats/views/adminServerStatsConfig.html',
-      1 => 1473950391,
+      1 => 1473968140,
       2 => 'file',
     ),
   ),
@@ -24,7 +24,6 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     'dbError' => 0,
     'thisUrl' => 0,
     'thisPage' => 0,
-    'active' => 0,
     'db_name' => 0,
     'db_host' => 0,
     'db_user' => 0,
@@ -58,11 +57,6 @@ $_valid = $_smarty_tpl->decodeProperties(array (
             
                 <!-- Settings for talking with the Bandwidth Database -->
                 <tr>
-                    <th>Enabled:</th>
-                    <td>
-                        <input type="checkbox" name="active"<?php if ($_smarty_tpl->tpl_vars['active']->value) {?> checked="checked"<?php }?>>
-                    </td>
-                </tr>
                     <th class="glm-required">Database Name:</th>
                     <td <?php if (!$_smarty_tpl->tpl_vars['db_name']->value) {?>class="glm-form-bad-input glm-form-bad-input-misc"<?php }?>>
                         <input type="text" name="db_name" value="<?php echo $_smarty_tpl->tpl_vars['db_name']->value;?>
@@ -72,28 +66,28 @@ $_valid = $_smarty_tpl->decodeProperties(array (
                 </tr>
                 <tr>
                     <th class="glm-required">Database Server Hostname:</th>
-                    <td>
+                    <td <?php if (!$_smarty_tpl->tpl_vars['db_host']->value) {?>class="glm-form-bad-input glm-form-bad-input-misc"<?php }?>>
                         <input type="text" name="db_host" value="<?php echo $_smarty_tpl->tpl_vars['db_host']->value;?>
 " class="glm-form-text-input-medium">
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Database Username:</th>
-                    <td>
+                    <td <?php if (!$_smarty_tpl->tpl_vars['db_user']->value) {?>class="glm-form-bad-input glm-form-bad-input-misc"<?php }?>>
                         <input type="text" name="db_user" value="<?php echo $_smarty_tpl->tpl_vars['db_user']->value;?>
 " class="glm-form-text-input-medium">
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Database Password:</th>
-                    <td>
+                    <td <?php if (!$_smarty_tpl->tpl_vars['db_pass']->value) {?>class="glm-form-bad-input glm-form-bad-input-misc"<?php }?>>
                         <input type="text" name="db_pass" value="<?php echo $_smarty_tpl->tpl_vars['db_pass']->value;?>
 " class="glm-form-text-input-medium">
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Website Name:</th>
-                    <td>
+                    <td <?php if (!$_smarty_tpl->tpl_vars['website']->value) {?>class="glm-form-bad-input glm-form-bad-input-misc"<?php }?>>
                         <input type="text" name="website" value="<?php echo $_smarty_tpl->tpl_vars['website']->value;?>
 " class="glm-form-text-input-medium">
                         <br>This is the name of the Website as it's listed in the server stats database. Normally does not include 'www'.
@@ -101,7 +95,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
                 </tr>
                 <tr>
                     <th class="glm-required">Monthly Target Bandwidth:</th>
-                    <td>
+                    <td <?php if (!$_smarty_tpl->tpl_vars['target']->value) {?>class="glm-form-bad-input glm-form-bad-input-misc"<?php }?>>
                         <input type="text" name="target" value="<?php echo $_smarty_tpl->tpl_vars['target']->value;?>
 " class="glm-form-text-input-medium">
                         <br>Monthly target bandwidth is entered in Megabytes without any fractions.
diff --git a/views/adminServerStats.html b/views/adminServerStats.html
index 4f0851a..6352ecc 100644
--- a/views/adminServerStats.html
+++ b/views/adminServerStats.html
@@ -18,7 +18,7 @@
         to set the <b>Target</b> bandwidth for billing purposes. The target bandwidth is per-month
         and is indicated as a dotted line on the "2 Years" graph included below. 
     </p><p>
-        Server Bandwidth is displayed below in <b>Megabytes</b> (millions of bytes) and <b>Gigabytes</b>
+        Server Bandwidth is displayed below in <b>Megabytes</b> (Millions of bytes) and <b>Gigabytes</b>
         (Billions of bytes). A byte is roughly equivalent to one character.
     </p>  
    
diff --git a/views/adminServerStatsConfig.html b/views/adminServerStatsConfig.html
index 970ac49..e190d2c 100644
--- a/views/adminServerStatsConfig.html
+++ b/views/adminServerStatsConfig.html
@@ -18,11 +18,6 @@
             
                 <!-- Settings for talking with the Bandwidth Database -->
                 <tr>
-                    <th>Enabled:</th>
-                    <td>
-                        <input type="checkbox" name="active"{if $active} checked="checked"{/if}>
-                    </td>
-                </tr>
                     <th class="glm-required">Database Name:</th>
                     <td {if !$db_name}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
                         <input type="text" name="db_name" value="{$db_name}" class="glm-form-text-input-medium">
@@ -31,32 +26,32 @@
                 </tr>
                 <tr>
                     <th class="glm-required">Database Server Hostname:</th>
-                    <td>
+                    <td {if !$db_host}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
                         <input type="text" name="db_host" value="{$db_host}" class="glm-form-text-input-medium">
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Database Username:</th>
-                    <td>
+                    <td {if !$db_user}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
                         <input type="text" name="db_user" value="{$db_user}" class="glm-form-text-input-medium">
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Database Password:</th>
-                    <td>
+                    <td {if !$db_pass}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
                         <input type="text" name="db_pass" value="{$db_pass}" class="glm-form-text-input-medium">
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Website Name:</th>
-                    <td>
+                    <td {if !$website}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
                         <input type="text" name="website" value="{$website}" class="glm-form-text-input-medium">
                         <br>This is the name of the Website as it's listed in the server stats database. Normally does not include 'www'.
                     </td>
                 </tr>
                 <tr>
                     <th class="glm-required">Monthly Target Bandwidth:</th>
-                    <td>
+                    <td {if !$target}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
                         <input type="text" name="target" value="{$target}" class="glm-form-text-input-medium">
                         <br>Monthly target bandwidth is entered in Megabytes without any fractions.
                     </td>
-- 
2.17.1