Updated some itmes to match corrections found when deploying Leads add-on

diff --git a/classes/data/dataSample.php b/classes/data/dataSample.php
index 052a759..95fc63a 100644 (file)
--- a/classes/data/dataSample.php
+++ b/classes/data/dataSample.php
@@ -23,9 +23,6 @@
  *  Remove this message before using this file in production!
  **********************************************************************/
 
-// Member Info Data required
-require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php');
-
 /**
  * GlmDataSample class
  *
@@ -86,13 +83,6 @@ class GlmDataSample extends GlmDataAbstract
      * @access public
      */
     public $fields = false;
-    /**
-     * MemberInfo DB object
-     *
-     * @var $MemberInfo
-     * @access public
-     */
-    public $MemberInfo;
 
     /**
      * Constructor
@@ -154,7 +144,7 @@ class GlmDataSample extends GlmDataAbstract
      * Perform post-processing for all result entries.
      *
      * In this case we're using it to append an array of category
-     * data to each member result and also sort by member name.
+     * data to each row result and also sort by name.
      *
      * @param array $r Array of field result data for a single entry
      * @param string $a Action being performed (l, i, g, ...)

diff --git a/index.php b/index.php
index 5990586..242efcd 100644 (file)
--- a/index.php
+++ b/index.php
@@ -111,6 +111,10 @@ if (is_file(GLM_MEMBERS_SAMPLE_PLUGIN_PATH.'/setup/databaseScripts/dbVersions.ph
     die('You have database scripts but have not defined a current database version at the top of index.php for this plugin/add-on!');
 }
 
+/*
+ * Check installation, activation, and version of main Member DB plugin
+ */
+
 // Check for main plugin and that it's active
 function glmMembersSamplePluginRequired() {
     echo '

diff --git a/models/admin/members/sample.php b/models/admin/members/sample.php
index ed2fac9..c9cd6ca 100644 (file)
--- a/models/admin/members/sample.php
+++ b/models/admin/members/sample.php
@@ -13,10 +13,10 @@
  * @link     http://dev.gaslightmedia.com/
  */
 
-// Load Contacts data abstract
-//require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php');
+// Load Sample data abstract
+require_once(GLM_MEMBERS_SAMPLE_PLUGIN_CLASS_PATH.'/data/dataSample.php');
 
-class GlmMembersAdmin_members_sample // extends GlmDataContacts
+class GlmMembersAdmin_members_sample extends GlmDataSample
 {
 
     /**
@@ -33,28 +33,6 @@ class GlmMembersAdmin_members_sample // extends GlmDataContacts
      * @access public
      */
     public $config;
-    /**
-     * Contact Info
-     *
-     * @var $contactInfo
-     * @access public
-     */
-    public $contactInfo = false;
-    /**
-     * Member ID
-     *
-     * @var $memberID
-     * @access public
-     */
-    public $memberID = false;
-    /**
-     * Contact ID
-     *
-     * @var $contactID
-     * @access public
-     */
-    public $contactID = false;
-
 
     /*
      * Constructor
@@ -104,7 +82,7 @@ class GlmMembersAdmin_members_sample // extends GlmDataContacts
     public function modelAction($actionData = false)
     {
 
-        $displayData = 'This is the Sample "Members" "Sample" model talking to you from inside WordPress.';
+        $displayData = 'This is the Sample model talking to you from inside WordPress.';
 
         // Compile template data
         $templateData = array(

diff --git a/setup/databaseScripts/examples/dbVersions.php b/setup/databaseScripts/examples/dbVersions.php
index 1b9b48b..8966611 100644 (file)
--- a/setup/databaseScripts/examples/dbVersions.php
+++ b/setup/databaseScripts/examples/dbVersions.php
@@ -34,7 +34,7 @@
 
 
 $glmMembersSampleDbVersions = array(
-            '0.0.1' => array('version' => '0.0.1', 'tables' => 1),
+            '0.0.1' => array('version' => '0.0.1', 'tables' => 1, 'date' => '1/1/2016'),
             '0.0.2' => array('version' => '0.0.2', 'tables' => 2)
 );