From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 Apr 2019 13:31:49 +0000 (-0400)
Subject: Update config
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2FconfigRegistry;p=WP-Plugins%2Fglm-member-db.git

Update config

Put the items in as arrays instead of objects. They don't have to be
objects.
---

diff --git a/classes/configRegistry.php b/classes/configRegistry.php
index 8055e282..2291a85a 100644
--- a/classes/configRegistry.php
+++ b/classes/configRegistry.php
@@ -1,5 +1,6 @@
 <?php
 namespace GlmAssociate\Config;
+
 /**
  * configRegistry.php
  *
@@ -27,20 +28,6 @@ namespace GlmAssociate\Config;
  * @version   Release: 1.0
  * @link      <>
  */
-class GlmConfig
-{
-    private $_store;
-
-    public function __construct( $data )
-    {
-        $this->_store = $data;
-    }
-
-    public function getConfig()
-    {
-        return $this->_store;
-    }
-}
 
 class Registry
 {
@@ -59,8 +46,6 @@ class Registry
         // Use the class name if no name given, simulates singleton
         $name = ( !\is_null( $name ) ) ? $name: \get_class( $object );
 
-        \trigger_error( $name, E_USER_NOTICE );
-
         $return = null;
         if ( isset( self::$_store[$name] ) ) {
             // Store the old object for returning
diff --git a/index.php b/index.php
index 85efac51..dc439ee2 100755
--- a/index.php
+++ b/index.php
@@ -8,9 +8,9 @@
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
  */
-
 require_once 'classes/configRegistry.php';
 use \GlmAssociate\Config as GlmConfig;
+
 /**
  * GLM Associate - Members Plugin
  * Index
@@ -938,14 +938,13 @@ if (GLM_MEMBERS_PLUGIN_DEBUG_VERBOSE) {
     trigger_error("GLM Associate Index End: ".glmAssociateMemoryUsage()." - Start glm-member-db setup",E_USER_NOTICE);
 }
 
-// Add config to the Registry
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['addOns'] ), 'addOns' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['validActions'] ), 'validActions' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['shortcodes'] ), 'shortcodes' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['imageSizes'] ), 'imageSizes' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['states'] ), 'states' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['countries'] ), 'countries' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['settings'] ), 'settings' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['terms'] ), 'terms' );
-GlmConfig\Registry::add( new GlmConfig\GlmConfig( $config['loggedInUser'] ), 'loggedInUser' );
-
+// Add config arrays to the Registry (configRegistry)
+GlmConfig\Registry::add( $config['addOns'], 'addOns' );
+GlmConfig\Registry::add( $config['validActions'], 'validActions' );
+GlmConfig\Registry::add( $config['shortcodes'], 'shortcodes' );
+GlmConfig\Registry::add( $config['imageSizes'], 'imageSizes' );
+GlmConfig\Registry::add( $config['states'], 'states' );
+GlmConfig\Registry::add( $config['countries'], 'countries' );
+GlmConfig\Registry::add( $config['settings'], 'settings' );
+GlmConfig\Registry::add( $config['terms'], 'terms' );
+GlmConfig\Registry::add( $config['loggedInUser'], 'loggedInUser' );
diff --git a/models/admin/management/index.php b/models/admin/management/index.php
index 093349e2..77036054 100755
--- a/models/admin/management/index.php
+++ b/models/admin/management/index.php
@@ -1,6 +1,5 @@
 <?php
 use \GlmAssociate\Config as GlmConfig;
-
 /**
  * Gaslight Media Members Database
  * Admin Configure
@@ -236,8 +235,8 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
             $settings_updated = false;
         }
 
-        $config = GlmConfig\Registry::get( 'settings' )->getConfig();
-        trigger_error( print_r( $config, true ), E_USER_NOTICE );
+        $settings = GlmConfig\Registry::get( 'settings' );
+        trigger_error( print_r( $settings, true ), E_USER_NOTICE );
 
         wp_register_script( 'glm-api', GLM_MEMBERS_PLUGIN_BASE_URL . '/js/glmApiSettings.js' );