From 8103e80fbf04f4ff065f9a872e2e927ba0557501 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 15 Aug 2018 12:46:59 -0400
Subject: [PATCH] Adding new field for messages.

Adding dashboard message field.
This can be displayed within the dashboard.
---
 classes/data/dataMessages.php                 |  8 ++++++
 index.php                                     |  2 +-
 models/admin/relay/index.php                  | 10 ++++---
 ..._V0.0.1.sql => create_database_V0.0.2.sql} |  3 ++-
 setup/databaseScripts/dbVersions.php          |  1 +
 .../update_database_V0.0.2.sql                | 10 +++++++
 views/admin/relay/edit.html                   | 26 +++++++++++++++----
 7 files changed, 49 insertions(+), 11 deletions(-)
 rename setup/databaseScripts/{create_database_V0.0.1.sql => create_database_V0.0.2.sql} (90%)
 create mode 100644 setup/databaseScripts/update_database_V0.0.2.sql

diff --git a/classes/data/dataMessages.php b/classes/data/dataMessages.php
index 79200dd..19de27e 100644
--- a/classes/data/dataMessages.php
+++ b/classes/data/dataMessages.php
@@ -140,6 +140,14 @@ class GlmDataMessages extends GlmDataAbstract
                 'use'      => 'a'
             ),
 
+            // dashboard message
+            'dashboard_message' => array(
+              'field'   => 'dashboard_message',
+              'type'    => 'text',
+              'require' => false,
+              'use'     => 'a'
+            ),
+
             // message
             'message' => array(
               'field'   => 'message',
diff --git a/index.php b/index.php
index 2ce37e2..1c0516b 100644
--- a/index.php
+++ b/index.php
@@ -44,7 +44,7 @@ if (!defined('ABSPATH')) {
  *  version from this plugin.
  */
 define('GLM_MEMBERS_RELAY_PLUGIN_VERSION', '1.0.0');
-define('GLM_MEMBERS_RELAY_PLUGIN_DB_VERSION', '0.0.1');
+define('GLM_MEMBERS_RELAY_PLUGIN_DB_VERSION', '0.0.2');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_RELAY_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0');
diff --git a/models/admin/relay/index.php b/models/admin/relay/index.php
index df206a8..30d6b06 100644
--- a/models/admin/relay/index.php
+++ b/models/admin/relay/index.php
@@ -97,13 +97,13 @@ class GlmMembersAdmin_relay_index extends GlmDataMessages
         switch ( $option ) {
         case 'add':
             $message = $this->newEntry();
-            $view = 'edit.html';
+            $view    = 'edit.html';
             break;
         case 'insert':
             $_REQUEST['created'] = date( 'Y-m-d H:i:s' );
             $_REQUEST['updated'] = date( 'Y-m-d H:i:s' );
-            $message = $this->insertEntry();
-            $view = 'edit.html';
+            $message             = $this->insertEntry();
+            $view                = 'edit.html';
             break;
         case 'edit':
             if ( isset( $_REQUEST['id'] ) && $message_id = filter_var( $_REQUEST['id'] ) ) {
@@ -113,8 +113,10 @@ class GlmMembersAdmin_relay_index extends GlmDataMessages
             break;
         case 'update':
             if ( isset( $_REQUEST['id'] ) && $message_id = filter_var( $_REQUEST['id'] ) ) {
+
+                // Set the updated time to now
                 $_REQUEST['updated'] = date( 'Y-m-d H:i:s' );
-                $message = $this->updateEntry( $message_id );
+                $message             = $this->updateEntry( $message_id );
 
                 if ( $message['status'] ) {
                     $updated = true;
diff --git a/setup/databaseScripts/create_database_V0.0.1.sql b/setup/databaseScripts/create_database_V0.0.2.sql
similarity index 90%
rename from setup/databaseScripts/create_database_V0.0.1.sql
rename to setup/databaseScripts/create_database_V0.0.2.sql
index 73ab97a..aa173b1 100644
--- a/setup/databaseScripts/create_database_V0.0.1.sql
+++ b/setup/databaseScripts/create_database_V0.0.2.sql
@@ -1,6 +1,6 @@
 -- Gaslight Media Members Database - Relay Add-On
 -- File Created: 2018-06-01
--- Database Version: 0.0.1
+-- Database Version: 0.0.2
 -- Database Creation Script
 --
 -- This file is called to create a new set of tables for this
@@ -17,6 +17,7 @@ CREATE TABLE {prefix}messages (
     id INT NOT NULL AUTO_INCREMENT,
     status TINYINT(1) NULL,                   -- Message Status (Active, Inactive etc.)
     title TINYTEXT NULL,                      -- Title of Message
+    dashboard_message TEXT NULL,              -- Dashboard Message
     message TEXT NULL,                        -- Message Details
     created DATETIME NOT NULL,                -- Created timestamp
     updated DATETIME NOT NULL,                -- Updated timestamp
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index dfd37b7..e380faf 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -28,6 +28,7 @@
  */
 $glmMembersRelayDbVersions = array(
     '0.0.1' => array('version' => '0.0.1', 'tables' => 1, 'date' => '06/01/2018'),
+    '0.0.2' => array('version' => '0.0.2', 'tables' => 1, 'date' => '08/15/2018'),
 );
 
 
diff --git a/setup/databaseScripts/update_database_V0.0.2.sql b/setup/databaseScripts/update_database_V0.0.2.sql
new file mode 100644
index 0000000..1ba70eb
--- /dev/null
+++ b/setup/databaseScripts/update_database_V0.0.2.sql
@@ -0,0 +1,10 @@
+-- Gaslight Media Members Database  - Relay Add-On
+-- File Created: 08/15/18
+-- Database Version: 0.0.2
+-- Database Update From Previous Version Script
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+-- new field in messages
+ALTER TABLE {prefix}messages ADD COLUMN dashboard_message TEXT NULL;  -- Dashboard Message
diff --git a/views/admin/relay/edit.html b/views/admin/relay/edit.html
index 1248dd5..79807e0 100644
--- a/views/admin/relay/edit.html
+++ b/views/admin/relay/edit.html
@@ -14,7 +14,7 @@
         <input type="hidden" name="option" value="insert" />
     {/if}
 
-    <table id="glm-table-message" class="glm-admin-table glm-event-table">
+    <table id="glm-table-message" class="glm-admin-table glm-event-table" style="width: 900px;">
 
         <tr>
             <th {if $message.fieldRequired.status} class="glm-required"}{/if}>Status</th>
@@ -32,19 +32,35 @@
         <tr>
             <th {if $message.fieldRequired.title} class="glm-required"}{/if}>Title</th>
             <td {if $message.fieldFail.title}class="glm-form-bad-input" data-tabid="glm-title"{/if}>
-                <input type="text" name="title" value="{$message.fieldData.title}" class="glm-form-text-input-medium">
+                <input type="text" name="title" value="{$message.fieldData.title|escape:'html'}" class="glm-form-text-input-medium">
                 {if $message.fieldFail.title}<p>{$message.fieldFail.title}</p>{/if}<br>
             </td>
         </tr>
 
+        <tr>
+            <th {if $message.fieldRequired.dashboard_message} class="glm-required"}{/if}>Dashboard Message</th>
+            <td {if $message.fieldFail.dashboard_message}class="glm-form-bad-input" data-tabid="glm-dashboard_message"{/if}>
+            {php}
+                wp_editor('{$message.fieldData.dashboard_message|escape:quotes}', 'dashboard_message', array(
+                    'wpautop'       => false,
+                    'textarea_name' => 'dashboard_message',
+                    'editor_height' => 200,
+                    'teeny'         => true,
+                ));
+            {/php}
+                {if $message.fieldFail.dashboard_message}<p>{$message.fieldFail.dashboard_message}</p>{/if}<br>
+            </td>
+        </tr>
+
         <tr>
             <th {if $message.fieldRequired.message} class="glm-required"}{/if}>Message</th>
             <td {if $message.fieldFail.message}class="glm-form-bad-input" data-tabid="glm-message"{/if}>
             {php}
-                wp_editor('{$message.fieldData.message|escape:quotes}', 'glm_descr', array(
-                    'wpautop' => false,
+                wp_editor('{$message.fieldData.message|escape:quotes}', 'message', array(
+                    'wpautop'       => false,
                     'textarea_name' => 'message',
-                    'editor_height' => 400,     // Height in px, overrides editor_rows
+                    'editor_height' => 400,
+                    'teeny'         => true,
                 ));
             {/php}
                 {if $message.fieldFail.message}<p>{$message.fieldFail.message}</p>{/if}<br>
-- 
2.17.1