From 9952d6f117475bac02f2b54bd7cc79e1b9c5c7bb Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 3 Nov 2014 13:10:31 -0500
Subject: [PATCH] switching name

---
 controllers/Admin.php                         | 78 ++++++++++---------
 controllers/Front.php                         | 12 +--
 GlmQuickSite.php => glm-client-info.php       | 12 +--
 ...te_Widget.php => Glmclientinfo_Widget.php} |  6 +-
 views/stateSelect.php                         |  6 +-
 views/text.php                                |  2 +-
 views/textArea.php                            |  2 +-
 7 files changed, 61 insertions(+), 57 deletions(-)
 rename GlmQuickSite.php => glm-client-info.php (66%)
 rename models/{QuickSite_Widget.php => Glmclientinfo_Widget.php} (93%)

diff --git a/controllers/Admin.php b/controllers/Admin.php
index d074919..3aeccbb 100644
--- a/controllers/Admin.php
+++ b/controllers/Admin.php
@@ -27,17 +27,18 @@
  * @release   Release: (0.1)
  * @link      <>
  */
-class QuickSite_Admin_Controller
+class Glmclientinfo_Admin_Controller
 {
     public $path;
 
     public function __construct($path)
     {
         $this->path = $path;
-        add_action('admin_menu', array($this, 'glmQuickSite_add_admin_menu'));
-        add_action('admin_init', array($this, 'glmQuickSite_settings_init'));
-        register_activation_hook(__FILE__, array($this, 'glmQuickSite_install_plugin_data'));
-        register_deactivation_hook(__FILE__, array($this, 'glmQuickSite_remove_plugin_data'));
+        add_action('admin_menu', array($this, 'glmclientinfo_add_admin_menu'));
+        add_action('admin_init', array($this, 'glmclientinfo_settings_init'));
+        register_activation_hook(__FILE__, array($this, 'glmclientinfo_install_plugin_data'));
+        register_deactivation_hook(__FILE__, array($this, 'glmclientinfo_remove_plugin_data'));
+        register_uninstall_hook(__FILE__, array('Glmclientinfo_Admin_Controller', 'glmclientinfo_uninstall'));
     }
 
     public function add_capability()
@@ -60,10 +61,16 @@ class QuickSite_Admin_Controller
         }
     }
 
-    public function glmQuickSite_install_plugin_data()
+    static public function glmclientinfo_uninstall()
+    {
+        delete_option('glmquicksite_settings');
+        delete_option('glmquicksite_states');
+    }
+
+    public function glmclientinfo_install_plugin_data()
     {
         add_capability();
-        glm_add_state_list_option();
+        $this->glm_add_state_list_option();
     }
 
     public function glm_add_state_list_option()
@@ -154,18 +161,12 @@ class QuickSite_Admin_Controller
         }
     }
 
-    public function glmQuickSite_remove_plugin_data()
+    public function glmclientinfo_remove_plugin_data()
     {
         remove_capability();
     }
 
-    public function glmQuickSite_uninstall()
-    {
-        delete_option('glmquicksite_settings');
-        delete_option('glmquicksite_states');
-    }
-
-    public function glmQuickSite_add_admin_menu()
+    public function glmclientinfo_add_admin_menu()
     {
         add_menu_page(
             'Gaslight Client Info',
@@ -177,24 +178,24 @@ class QuickSite_Admin_Controller
         );
     }
 
-    public function glmQuickSite_settings_exist()
+    public function glmclientinfo_settings_exist()
     {
         if (false == get_option('glmquicksite_settings')) {
             add_option('glmquicksite_settings');
         }
     }
 
-    public function glmQuickSiteAddSettingTextField($name, $label, $type)
+    public function glmclientinfoAddSettingTextField($name, $label, $type)
     {
         switch ($type) {
             case 'text':
-                $callback = 'glmQuickSiteRenderText';
+                $callback = 'glmclientinfoRenderText';
                 break;
             case 'textarea':
-                $callback = 'glmQuickSiteRenderTextArea';
+                $callback = 'glmclientinfoRenderTextArea';
                 break;
             case 'state':
-                $callback = 'glmQuickSiteRenderStateSelect';
+                $callback = 'glmclientinfoRenderStateSelect';
                 break;
             default:
                 return false;
@@ -205,21 +206,21 @@ class QuickSite_Admin_Controller
             __($label, 'wordpress'),
             array($this, $callback),
             'pluginPage',
-            'glmQuickSite_pluginPage_section',
+            'glmclientinfo_pluginPage_section',
             $name
         );
     }
 
-    public function glmQuickSite_settings_init()
+    public function glmclientinfo_settings_init()
     {
-        register_setting('pluginPage', 'glmQuickSite_settings');
+        register_setting('pluginPage', 'glmclientinfo_settings');
         add_filter('option_page_capability_pluginPage',
-                   'glmQuickSite_option_page_capability');
+                   'glmclientinfo_option_page_capability');
 
         add_settings_section(
-            'glmQuickSite_pluginPage_section',
+            'glmclientinfo_pluginPage_section',
             __('Edit your Client Info', 'wordpress'),
-            array($this, 'glmQuickSite_settings_section_callback'),
+            array($this, 'glmclientinfo_settings_section_callback'),
             'pluginPage'
         );
 
@@ -287,41 +288,44 @@ class QuickSite_Admin_Controller
         );
 
         foreach ($fieldNames as $field) {
-            $this->glmQuickSiteAddSettingTextField($field['name'], $field['label'],
-                                            $field['type']);
+            $this->glmclientinfoAddSettingTextField(
+                $field['name'],
+                $field['label'],
+                $field['type']
+            );
         }
     }
 
-    public function glmQuickSiteRenderText($fieldName)
+    public function glmclientinfoRenderText($fieldName)
     {
         static $options;
         if (!$options) {
-            $options = get_option('glmQuickSite_settings');
+            $options = get_option('glmclientinfo_settings');
         }
         include $this->path . 'views/text.php';
     }
 
-    public function glmQuickSiteRenderTextArea($fieldName)
+    public function glmclientinfoRenderTextArea($fieldName)
     {
         static $options;
-        $options = get_option('glmQuickSite_settings');
+        $options = get_option('glmclientinfo_settings');
         include $this->path . 'views/textArea.php';
     }
 
-    public function glmQuickSiteRenderStateSelect($fieldName)
+    public function glmclientinfoRenderStateSelect($fieldName)
     {
         static $options;
-        $options = get_option('glmQuickSite_settings');
-        $states  = get_option('glmQuickSite_states');
+        $options = get_option('glmclientinfo_settings');
+        $states  = get_option('glmclientinfo_states');
         include $this->path . 'views/stateSelect.php';
     }
 
-    public function glmQuickSite_settings_section_callback()
+    public function glmclientinfo_settings_section_callback()
     {
         echo __('Business Name, Address and phone numbers', 'wordpress');
     }
 
-    public function glmQuickSite_option_page_capability($capability)
+    public function glmclientinfo_option_page_capability($capability)
     {
         return GLM_NEW_CAPABILITY;
     }
diff --git a/controllers/Front.php b/controllers/Front.php
index a180138..e7b51f4 100644
--- a/controllers/Front.php
+++ b/controllers/Front.php
@@ -27,12 +27,12 @@
  * @release   Release: (0.1)
  * @link      <>
  */
-class QuickSite_Front_controller
+class Glmclientinfo_Front_controller
 {
 
     /**
      * Plugin Path
-     * 
+     *
      * @var type String
      */
     public $path;
@@ -45,16 +45,16 @@ class QuickSite_Front_controller
     function __construct($path)
     {
         $this->path = $path;
-        add_action('widgets_init', array($this, 'glmQuickSite_register_widget'));
+        add_action('widgets_init', array($this, 'glmclientinfo_register_widget'));
     }
 
     /**
      * Register the QuickSite Widget with WordPress
      */
-    function glmQuickSite_register_widget()
+    function glmclientinfo_register_widget()
     {
-        include $this->path . 'models/QuickSite_Widget.php';
-        register_widget('QuickSite_Widget');
+        include $this->path . 'models/Glmclientinfo_Widget.php';
+        register_widget('Glmclientinfo_Widget');
     }
 
 }
diff --git a/GlmQuickSite.php b/glm-client-info.php
similarity index 66%
rename from GlmQuickSite.php
rename to glm-client-info.php
index 9dedfce..95e57ed 100644
--- a/GlmQuickSite.php
+++ b/glm-client-info.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * Plugin Name: QuickSite Options
- * Description: Option Setting for the name address and phone numbers for the * quicksite
- * Version: 1.0
+ * Plugin Name: GLM Client Info
+ * Description: Option Setting for the name address and phone numbers
+ * Version: 1.1
  * Author: Steve Sutton
  * Author URI: http://www.gaslightmedia.com
  * License: All right reserved
  */
-define('GLM_NEW_CAPABILITY', 'glmquicksite_edit_client');
+define('GLM_NEW_CAPABILITY', 'glmclientinfo_edit_client');
 define('BUILT_IN_CAPABILITY', 'edit_posts');
 
 // call the Admin Controller to setup the Admin of the plugin
 require_once 'controllers/Admin.php';
-$adminController = new QuickSite_Admin_Controller(
+$adminController = new Glmclientinfo_Admin_Controller(
     plugin_dir_path(__FILE__)
 );
 
 // call the Front Controller to setup the widget
 require_once 'controllers/Front.php';
-$frontController = new QuickSite_Front_controller(
+$frontController = new Glmclientinfo_Front_controller(
     plugin_dir_path(__FILE__)
 );
diff --git a/models/QuickSite_Widget.php b/models/Glmclientinfo_Widget.php
similarity index 93%
rename from models/QuickSite_Widget.php
rename to models/Glmclientinfo_Widget.php
index 4a634da..2d0bc80 100644
--- a/models/QuickSite_Widget.php
+++ b/models/Glmclientinfo_Widget.php
@@ -27,7 +27,7 @@
  * @release   Release: (0.1)
  * @link      <>
  */
-class QuickSite_Widget
+class Glmclientinfo_Widget
     extends WP_widget
 {
 
@@ -71,8 +71,8 @@ class QuickSite_Widget
      */
     function glm_get_quicksite_option($name)
     {
-        $settings = get_option('glmQuickSite_settings');
-        $states   = get_option('glmQuickSite_states');
+        $settings = get_option('glmclientinfo_settings');
+        $states   = get_option('glmclientinfo_states');
         if ($name == 'stateFull' && $settings['state']) {
             return $states[$settings['state']];
         }
diff --git a/views/stateSelect.php b/views/stateSelect.php
index c561bd6..c0a0ca5 100644
--- a/views/stateSelect.php
+++ b/views/stateSelect.php
@@ -1,9 +1,9 @@
-<select name="glmQuickSite_settings[<?php echo $fieldName; ?>]">
-    <?php foreach ($states as $stateAbbr => $stateName) : ?>
+<select name="glmclientinfo_settings[<?php echo $fieldName; ?>]">
+    <?php if (!empty($states)) : foreach ($states as $stateAbbr => $stateName) : ?>
         <option value="<?php echo $stateAbbr; ?>"<?php if ($options[$fieldName] == $stateAbbr) {
         echo ' selected';
     }; ?>>
         <?php echo $stateName; ?>
         </option>
-<?php endforeach; ?>
+<?php endforeach; endif;?>
 </select>
\ No newline at end of file
diff --git a/views/text.php b/views/text.php
index 61473f8..a00fba9 100644
--- a/views/text.php
+++ b/views/text.php
@@ -1,2 +1,2 @@
-<input type="text" name="glmQuickSite_settings[<?php echo $fieldName;?>]"
+<input type="text" name="glmclientinfo_settings[<?php echo $fieldName;?>]"
            value="<?php echo str_replace('"', '&quote;', $options[$fieldName]); ?>">
\ No newline at end of file
diff --git a/views/textArea.php b/views/textArea.php
index cb8ba6a..1f58fef 100644
--- a/views/textArea.php
+++ b/views/textArea.php
@@ -1 +1 @@
-<textarea cols="40" rows="5" name="glmQuickSite_settings[<?php echo $fieldName;?>]"><?php echo htmlspecialchars($options[$fieldName]); ?></textarea>
\ No newline at end of file
+<textarea cols="40" rows="5" name="glmclientinfo_settings[<?php echo $fieldName;?>]"><?php echo htmlspecialchars($options[$fieldName]); ?></textarea>
\ No newline at end of file
-- 
2.17.1