From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 8 Feb 2017 21:35:18 +0000 (-0500)
Subject: L#5
X-Git-Tag: v1.0.0^2~509
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b93caa0404fda0bc09e5f5073d18ba77b7a040ec;p=WP-Plugins%2Fglm-member-db-registrations.git

L#5
---

diff --git a/models/admin/management/registrations.php b/models/admin/management/registrations.php
index 37bd058..7809dc0 100644
--- a/models/admin/management/registrations.php
+++ b/models/admin/management/registrations.php
@@ -108,8 +108,15 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
      */
     public function modelAction($actionData = false)
     {       
+        $option                 = false;
+        $option2                = 'registrations';
+        $settings_updated       = false;
+        $settings_update_error  = false;
+        $reg_settings           = false;
+        
         // General settings are always stored in a record with ID=1.
-        $id = 1;
+        $id                     = 1;
+        
         // Determine if current user can edit configurations
         if (!current_user_can('glm_members_management')) {
             return array(
@@ -123,9 +130,6 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
             );
         }
 
-        // Check for submission option
-        // Check for submission option
-
         // Check for submission option
         $option = '';
         if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'submit') {
@@ -136,9 +140,15 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
 
             // Update the settings and redisplay the form
             case 'submit':
-
+                
                 // Update the general settings
-                $reg_settings = $this->updateEntry( 1 );
+                $reg_settings = $this->updateEntry( $id );
+                
+                if ($reg_settings['status']) {
+                    $settings_updated = true;
+                } else {
+                    $settings_update_error = true;
+                }
 
                 //echo "<pre>" . print_r($reg_settings, true) . "</pre>";
                 
@@ -151,7 +161,7 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
             default:
 
                 // Try to get the first (should be only) entry for general settings.
-                $reg_settings = $this->editEntry( 1 );
+                $reg_settings = $this->editEntry( $id );
 
                 //echo "<pre>" . print_r($reg_settings, true) . "</pre>";
                 
@@ -180,9 +190,9 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
         // Compile template data
         $template_data = array(
             'regSettings'           => $reg_settings,
-            'option'                => $option,
-//            'settingsUpdated'       => $settings_updated,
-//            'settingsUpdateError'   => $settings_update_error,
+            'option2'                => $option2,
+            'settingsUpdated'       => $settings_updated,
+            'settingsUpdateError'   => $settings_update_error,
         );
         
         //echo "<pre>" . print_r($regSettings, true) . "</pre>";
diff --git a/views/admin/management/registrations.html b/views/admin/management/registrations.html
index f89cd53..52b83e7 100644
--- a/views/admin/management/registrations.html
+++ b/views/admin/management/registrations.html
@@ -2,12 +2,12 @@
 <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
         
     <a id="glm-settings" data-show-table="glm-table-registrations" href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=registrations" 
-       class="glm-settings-tab nav-tab{if $option=='registrations' || $option==''} nav-tab-active{/if}">
+       class="glm-settings-tab nav-tab{if ($option2=='registrations') || ($option2=='')} nav-tab-active{/if}">
         General
     </a>
     
     <a id="glm-settings" data-show-table="glm-table-regterms" href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=regterms"  
-       class="glm-settings-tab nav-tab{if $option=='regterms'} nav-tab-active{/if}">
+       class="glm-settings-tab nav-tab{if $option2=='regterms'} nav-tab-active{/if}">
         Terms
     </a>
     
@@ -17,8 +17,8 @@
 <table id="glm-table-settings" class="glm-admin-table glm-settings-table">
     <tr>
         <td colspan="2">
-<!--            {if $settingsUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Settings Updated</h2>{/if}
-            {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}-->
+            {if $settingsUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Settings Updated</h2>{/if}
+            {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
             <h3>Registrations General Settings</h3>
         </td>
     </tr>
@@ -27,6 +27,7 @@
             <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
                 <input type="hidden" name="glm_action" value="registrations">
                 <input type="hidden" name="option" value="submit">
+                <input type="hidden" name="option2" value="registrations">
 
                 <table>
                     <tr>