BugFix: for add member with same name as another member.

Add member page now gives the error message when you try to add member
with the same name as another member.

diff --git a/models/admin/member/memberEdit.php b/models/admin/member/memberEdit.php
index 922e049..8e99123 100644 (file)
--- a/models/admin/member/memberEdit.php
+++ b/models/admin/member/memberEdit.php
@@ -106,16 +106,17 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers
     public function modelAction ($actionData = false)
     {
 
-        $success = true;
-        $option = false;
-        $haveMemberTypes = false;
-        $this->memberID = false;
-        $memberUpdated = false;
+        $success           = true;
+        $option            = false;
+        $haveMemberTypes   = false;
+        $this->memberID    = false;
+        $memberUpdated     = false;
         $memberUpdateError = false;
-        $memberData = false;
-        $haveMember = false;
-        $memberName = false;
-        $addingMember = false;
+        $memberAddingError = false;
+        $memberData        = false;
+        $haveMember        = false;
+        $memberName        = false;
+        $addingMember      = false;
 
         // Check for action option - Should be one of the values in the "switch" statement below
         $option = false;
@@ -172,11 +173,11 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers
         if ($this->memberID <= 0 && $option != 'add' && $option != 'addNew') {
 
             return array(
-                    'status' => true,
+                    'status'           => true,
                     'menuItemRedirect' => 'error',
-                    'modelRedirect' => 'index',
-                    'view' => 'admin/error/index.html',
-                    'data' => false
+                    'modelRedirect'    => 'index',
+                    'view'             => 'admin/error/index.html',
+                    'data'             => false
             );
 
         }
@@ -220,6 +221,7 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers
 
                 } else {
                     $memberUpdateError = true;
+                    $memberAddingError = true;
                 }
 
                 $haveMember = true;
@@ -234,7 +236,7 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers
                 $memberData = $this->insertEntry();
 
                 // If update was successful then use editEntry() to setup for the edit again.
-                if ($memberData['status']) {
+                if ( $memberData['status'] ) {
 
                     $this->memberID = $memberData['fieldData']['id'];
 
@@ -242,24 +244,26 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers
                     $slug = $this->updateSlug( $this->memberID );
 
                     // Set this member as the current one
-                    setcookie("glmMembersDatabaseMemberID", $this->memberID, time()+86400);
+                    setcookie( "glmMembersDatabaseMemberID", $this->memberID, time()+86400 );
                     $_COOKIE['glmMembersDatabaseMemberID'] = $this->memberID;
 
+                    // Clear the shortcode cache
+                    glmClearShortcodeCache();
+
                     // Redirect to the Member Dashboard where it will pick up on this member
                     return array(
-                        'status' => $success,
+                        'status'           => $success,
                         'menuItemRedirect' => 'member',
-                        'modelRedirect' => 'index',
-                        'view' => 'admin/member/memberEdit.html',
-                        'data' => array()
+                        'modelRedirect'    => 'index',
+                        'view'             => 'admin/member/memberEdit.html',
+                        'data'             => array()
                     );
 
                 } else {
-                    $memberUpdateError = true;
+                    $memberAddingError = true;
+                    $addingMember      = true;
                 }
 
-                glmClearShortcodeCache();
-
                 break;
 
                 // Delete this member
@@ -286,24 +290,25 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers
 
         // Compile template data
         $templateData = array(
-            'success' => $success,
-            'haveMemberTypes' => $haveMemberTypes,
-            'memberID' => $this->memberID,
-            'haveMember' => $haveMember,
-            'member' => $memberData,
-            'memberName' => $memberName,
-            'addingMember' => $addingMember,
-            'memberUpdated' => $memberUpdated,
-            'memberUpdateError' => $memberUpdateError
+            'success'           => $success,
+            'haveMemberTypes'   => $haveMemberTypes,
+            'memberID'          => $this->memberID,
+            'haveMember'        => $haveMember,
+            'member'            => $memberData,
+            'memberName'        => $memberName,
+            'addingMember'      => $addingMember,
+            'memberUpdated'     => $memberUpdated,
+            'memberUpdateError' => $memberUpdateError,
+            'memberAddingError' => $memberAddingError,
         );
 
         // Return status, suggested view, and data to controller
         return array(
-            'status' => $success,
+            'status'           => $success,
             'menuItemRedirect' => false,
-            'modelRedirect' => false,
-            'view' => 'admin/member/memberEdit.html',
-            'data' => $templateData
+            'modelRedirect'    => false,
+            'view'             => 'admin/member/memberEdit.html',
+            'data'             => $templateData
         );
 
     }

diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html
index 8445437..0569f36 100644 (file)
--- a/views/admin/member/memberEdit.html
+++ b/views/admin/member/memberEdit.html
@@ -12,6 +12,7 @@
   {/if}
         {if $memberUpdated}<span class="glm-notice glm-flash-updated glm-right">{$terms.term_member_cap} Updated</span>{/if}
         {if $memberUpdateError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_member_cap} Update Error</span>{/if}
+        {if $memberAddingError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_member_cap} Add Error</span>{/if}
     </h2>
     <div class="glm-admin-table glm-admin-table-inner">
     {if apply_filters('glm_members_permit_admin_member_index_edit_member', true)}
@@ -33,7 +34,7 @@
                   <h4 {if $member.fieldRequired.name}class="glm-required"{/if}>{$terms.term_member_cap} Name:</h4>
                   <td {if $member.fieldFail.name}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
                       <input type="text" name="name" value="{$member.fieldData.name}" class="glm-form-text-input-medium">
-                      {if $member.fieldFail.name}<p>{$member.fieldFail.name}</p>{/if}
+                      {if $member.fieldFail.name}<p class="glm-error">{$member.fieldFail.name}</p>{/if}
                   </td>
               </div>
 
@@ -147,5 +148,4 @@
         });
     </script>
 
-
 {include file='admin/footer.html'}