From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 28 Feb 2017 21:42:43 +0000 (-0500)
Subject: Update for password field and date_created
X-Git-Tag: v1.0.0^2~494
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5eedc0580a2b617e6df98420fa245d08e128ae32;p=WP-Plugins%2Fglm-member-db-registrations.git

Update for password field and date_created

Getting password field working correctly and the date_created field to
save on insert.
---

diff --git a/classes/data/dataAccount.php b/classes/data/dataAccount.php
index 0fe20ed..8c3c203 100644
--- a/classes/data/dataAccount.php
+++ b/classes/data/dataAccount.php
@@ -107,7 +107,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
          */
 
         $this->fields = array (
-            
+
             // ID
             'id' => array (
                 'field'     => 'id',
@@ -115,7 +115,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'view_only' => true,
                 'use'       => 'a'
             ),
-            
+
             // Is active flag (may be accessed or used) - default is true
             'active' => array (
                 'field'     => 'active',
@@ -123,7 +123,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'use'       => 'a',
                 'default'   => 1
             ),
-            
+
             // Account
             'registered_by' => array (
                 'field'     => 'registered_by',
@@ -131,7 +131,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => true,
                 'use'       => 'a'
             ),
-            
+
             // Account Primary Address
             'member_id' => array (
                 'field'     => 'member_id',
@@ -139,7 +139,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // First Name
             'fname' => array (
                 'field'     => 'fname',
@@ -147,7 +147,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // Last Name
             'lname' => array (
                 'field'     => 'lname',
@@ -155,7 +155,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // Organization
             'org' => array (
                 'field'     => 'org',
@@ -163,7 +163,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // Title
             'title' => array (
                 'field'     => 'title',
@@ -171,7 +171,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // Address 1
             'addr1' => array (
                 'field'     => 'addr1',
@@ -179,7 +179,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // Address 2
             'addr2' => array (
                 'field'     => 'addr2',
@@ -187,7 +187,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // City
             'city' => array (
                 'field'     => 'city',
@@ -195,7 +195,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // State
             'state' => array (
                 'field'     => 'state',
@@ -203,39 +203,39 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'zip' => array (
                 'field'     => 'zip',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'country' => array (
                 'field'     => 'country',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'phone' => array (
                 'field'     => 'phone',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'fax' => array (
                 'field'     => 'fax',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // Last used billing information - Also stored in each registration request
             'bill_fname' => array (
                 'field'     => 'bill_fname',
@@ -243,305 +243,307 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_lname' => array (
                 'field'     => 'bill_lname',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_org' => array (
                 'field'     => 'bill_org',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_title' => array (
                 'field'     => 'bill_title',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_addr1' => array (
                 'field'     => 'bill_addr1',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_addr2' => array (
                 'field'     => 'bill_addr2',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_city' => array (
                 'field'     => 'bill_city',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_state' => array (
                 'field'     => 'bill_state',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_zip' => array (
                 'field'     => 'bill_zip',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_country' => array (
                 'field'     => 'bill_country',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_phone' => array (
                 'field'     => 'bill_phone',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'bill_fax' => array (
                 'field'     => 'bill_fax',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'email' => array (
                 'field'     => 'email',
                 'type'      => 'text',
                 'required'  => true,
                 'use'       => 'a'
             ),
-            
+
             // Cryped password for login back into this account
             'password' => array (
                 'field'     => 'password',
-                'type'      => 'text',
-                'required'  => 'true',
+                'type'      => 'password',
+                'pw_type'   => 'strong',
+                'minLength' => 8,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'email_ok' => array (
                 'field'     => 'email_ok',
                 'type'      => 'checkbox',
                 'use'       => 'a',
                 'default'   => 0
             ),
-            
+
             // Is a member of the entity that owns the site
             'is_member' => array (
                 'field'     => 'is_member',
                 'type'      => 'checkbox',
                 'use'       => 'a',
                 'default'   => 0
-            ),            
-             
+            ),
+
             // Pointer to GLM Associate member contact record if account is for a member contact
             'contact_id' => array (
                 'field'     => 'contact_id',
                 'type'      => 'pointer',
-                    'p_table'   => GLM_MEMBERS_CONTACTS_PLUGIN_DB_PREFIX . 'contacts',
-                    'p_field'   => 'id',
-                    'p_static'  => true,
+                'p_table'   => GLM_MEMBERS_CONTACTS_PLUGIN_DB_PREFIX . 'contacts',
+                'p_field'   => 'id',
+                'p_static'  => true,
                 'required'  => true,
                 'use'       => 'lgneud'
             ),
-            
-            // 
+
+            //
             'contact_fname' => array (
                 'field'     => 'contact_fname',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_lname' => array (
                 'field'     => 'contact_lname',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_org' => array (
                 'field'     => 'contact_org',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_title' => array (
                 'field'     => 'contact_title',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_addr1' => array (
                 'field'     => 'contact_addr1',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_addr2' => array (
                 'field'     => 'contact_addr2',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_city' => array (
                 'field'     => 'contact_city',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_state' => array (
                 'field'     => 'contact_state',
                 'type'      => 'text',
                 'required'  => '',
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_zip' => array (
                 'field'     => 'contact_zip',
                 'type'      => 'text',
                 'required'  => '',
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_country' => array (
                 'field'     => 'contact_country',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_phone' => array (
                 'field'     => 'contact_phone',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_fax' => array (
                 'field'     => 'contact_fax',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_email' => array (
                 'field'     => 'contact_email',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'contact_email_ok' => array (
                 'field'     => 'contact_email_ok',
                 'type'      => 'checkbox',
                 'use'       => 'a',
                 'default'   => 0
             ),
-            
-            // 
+
+            //
             'guardian' => array (
                 'field'     => 'guardian',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'emer_contact' => array (
                 'field'     => 'emer_contact',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'emer_phone' => array (
                 'field'     => 'emer_phone',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'med_history' => array (
                 'field'     => 'med_history',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'allergy_med' => array (
                 'field'     => 'allergy_med',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
-            // 
+
+            //
             'date_created' => array (
                 'field'     => 'date_created',
                 'type'      => 'datetime',
-                'use'       => 'a'
+                'use'       => 'a',
+                'default'   => 'NOW()'
             ),
-            
-            // 
+
+            //
             'notes' => array (
                 'field'     => 'notes',
                 'type'      => 'text',
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
             // IP Address of user computer and timestamp
             'user_trace_info' => array (
                 'field'     => 'user_trace_info',
@@ -549,11 +551,30 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'required'  => false,
                 'use'       => 'a'
             ),
-            
+
         );
 
     }
 
-}
+    public function checkOther($r, $a)
+    {
 
-?>
\ No newline at end of file
+        // Only run these tests for insert or update
+        if (!($a == 'i' || $a == 'u')) {
+            return $r;
+        }
+
+        if ( $a == 'i' ) {
+            $r['fieldStore']['date_created'] = 'NOW()';
+        }
+
+        // If the password is empty then remove from fieldStore so it is not wiped out
+        if ( trim( $r['fieldData']['password'] ) == '' ) {
+            unset( $r['fieldStore']['password'] );
+        }
+
+        // Required
+        return $r;
+    }
+
+}
diff --git a/models/admin/registrations/accounts.php b/models/admin/registrations/accounts.php
index 2f8d2d5..cba13cc 100644
--- a/models/admin/registrations/accounts.php
+++ b/models/admin/registrations/accounts.php
@@ -154,6 +154,7 @@ class GlmMembersAdmin_registrations_accounts extends GlmDataRegistrationsAccount
             $account = $this->updateEntry( $this->accountID );
 
             if ( $account['status'] ) {
+                //echo '<pre>$account: ' . print_r( $account, true ) . '</pre>';
                 $accountUpdated = true;
                 // Retrieve the Edit Entry again
                 $account = $this->editEntry( $this->accountID );
@@ -168,7 +169,8 @@ class GlmMembersAdmin_registrations_accounts extends GlmDataRegistrationsAccount
             break;
 
         case 'delete':
-            break;
+            $oldAccount = $this->deleteEntry( $this->accountID, true );
+            $view   = 'account';
 
         default:
             $accounts    = $this->getList();
diff --git a/views/admin/registrations/edit.html b/views/admin/registrations/edit.html
index 87287f6..7e6aac2 100644
--- a/views/admin/registrations/edit.html
+++ b/views/admin/registrations/edit.html
@@ -1,9 +1,27 @@
 {include file='admin/registrations/header.html'}
 
-    <a href="{$thisUrl}?page={$thisPage}&glm_action=accounts" class="button button-secondary glm-button glm-right">Return to Account List</a>
+    <a href="{$thisUrl}?page={$thisPage}&glm_action=accounts"
+       class="button button-secondary glm-button glm-right">Return to Account List</a>
 
   {if $option == 'edit' || $option == 'update'}
     <a id="deleteAccountButton" class="button button-secondary glm-button glm-right">Delete this Account</a>
+    <div id="deleteAccountDialog" class="glm-dialog-box" title="Delete Account">
+        <center>
+            <p><a id="deleteAccountCancel" class="button button-primary">Cancel</a></p>
+            <p><input id="deleteAccountSubmit" type="submit" value="Delete this contact"></p>
+        </center>
+        <div class="glm-item-container">
+            <p><center><span class="glm-error">WARNING:</span></center></p>
+            <p>
+                <span class="glm-warning">Clicking the "Delete this Account" button above will
+                delete all of the data and images associated with this contact.
+                </span>
+            </p>
+            <p>
+                <span class="glm-error">Once deleted, this information will no longer be available and cannot be retrieved!</span>
+            </p>
+        </div>
+    </div>
     <h2>Edit Account
   {else}
     <h2>Add new Account
@@ -20,19 +38,19 @@
         <input type="hidden" name="glm_action" value="accounts">
     {if $haveAccount}
         <input type="hidden" name="option" value="update">
-        <input type="hidden" name="account" value="{$account.fieldData.id}">
+        <input type="hidden" name="account" value="{$accountID}">
     {else}
         <input type="hidden" name="option" value="insert">
     {/if}
         <input type="hidden" name="contact_id" value="0">
         <input type="hidden" name="registered_by" value="0">
         <table id="glm-table-account" class="glm-admin-table glm-account-table">
-            {if $haveAccount} <input type="hidden" name="account" value="{$accountID}"> {/if}
 
         <tr>
             <th {if $account.fieldRequired.date_created} class="glm-required"}{/if}>Date Created</th>
             <td {if $account.fieldFail.date_created}class="glm-form-bad-input" data-tabid="glm-date-created"{/if}>
             {$account.fieldData.date_created.timestamp|date_format:"%D"}
+            <input type="hidden" name="date_created" value="{$account.fieldData.date_created.timestamp|date_format:"%D"}">
             {if $account.fieldFail.date_created}<p>{$account.fieldFail.date_created}</p>{/if}<br>
             </td>
         </tr>
@@ -53,12 +71,12 @@
             </td>
         </tr>
 
-        <tr><th colspan="2">Information:</th></tr>
+        <tr><th colspan="2">Information</th></tr>
 
         <tr>
             <th {if $account.fieldRequired.fname} class="glm-required"}{/if}>First Name</th>
             <td {if $account.fieldFail.fname}class="glm-form-bad-input" data-tabid="glm-fname"{/if}>
-                <input type="text" name="fname" value="{$account.fieldData.fname}" class="glm-form-text-input-short">
+                <input type="text" name="fname" value="{$account.fieldData.fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.fname}<p>{$account.fieldFail.fname}</p>{/if}<br>
             </td>
         </tr>
@@ -66,7 +84,7 @@
         <tr>
             <th {if $account.fieldRequired.lname} class="glm-required"}{/if}>Last Name</th>
             <td {if $account.fieldFail.lname}class="glm-form-bad-input" data-tabid="glm-lname"{/if}>
-                <input type="text" name="lname" value="{$account.fieldData.lname}" class="glm-form-text-input-short">
+                <input type="text" name="lname" value="{$account.fieldData.lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.lname}<p>{$account.fieldFail.lname}</p>{/if}<br>
             </td>
         </tr>
@@ -74,7 +92,7 @@
         <tr>
             <th {if $account.fieldRequired.org} class="glm-required"}{/if}>Organization</th>
             <td {if $account.fieldFail.org}class="glm-form-bad-input" data-tabid="glm-org"{/if}>
-                <input type="text" name="org" value="{$account.fieldData.org}" class="glm-form-text-input-short">
+                <input type="text" name="org" value="{$account.fieldData.org}" class="glm-form-text-input-medium">
             {if $account.fieldFail.org}<p>{$account.fieldFail.org}</p>{/if}<br>
             </td>
         </tr>
@@ -82,7 +100,7 @@
         <tr>
             <th {if $account.fieldRequired.title} class="glm-required"}{/if}>Title</th>
             <td {if $account.fieldFail.title}class="glm-form-bad-input" data-tabid="glm-title"{/if}>
-                <input type="text" name="title" value="{$account.fieldData.title}" class="glm-form-text-input-short">
+                <input type="text" name="title" value="{$account.fieldData.title}" class="glm-form-text-input-medium">
             {if $account.fieldFail.title}<p>{$account.fieldFail.title}</p>{/if}<br>
             </td>
         </tr>
@@ -90,7 +108,7 @@
         <tr>
             <th {if $account.fieldRequired.addr1} class="glm-required"}{/if}>Address 1</th>
             <td {if $account.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-addr1"{/if}>
-                <input type="text" name="addr1" value="{$account.fieldData.addr1}" class="glm-form-text-input-short">
+                <input type="text" name="addr1" value="{$account.fieldData.addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.addr1}<p>{$account.fieldFail.addr1}</p>{/if}<br>
             </td>
         </tr>
@@ -98,7 +116,7 @@
         <tr>
             <th {if $account.fieldRequired.addr2} class="glm-required"}{/if}>Address 2</th>
             <td {if $account.fieldFail.addr2}class="glm-form-bad-input" data-tabid="glm-addr2"{/if}>
-                <input type="text" name="addr2" value="{$account.fieldData.addr2}" class="glm-form-text-input-short">
+                <input type="text" name="addr2" value="{$account.fieldData.addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.addr2}<p>{$account.fieldFail.addr2}</p>{/if}<br>
             </td>
         </tr>
@@ -106,7 +124,7 @@
         <tr>
             <th {if $account.fieldRequired.city} class="glm-required"}{/if}>City</th>
             <td {if $account.fieldFail.city}class="glm-form-bad-input" data-tabid="glm-city"{/if}>
-                <input type="text" name="city" value="{$account.fieldData.city}" class="glm-form-text-input-short">
+                <input type="text" name="city" value="{$account.fieldData.city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.city}<p>{$account.fieldFail.city}</p>{/if}<br>
             </td>
         </tr>
@@ -114,7 +132,7 @@
         <tr>
             <th {if $account.fieldRequired.state} class="glm-required"}{/if}>State</th>
             <td {if $account.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-state"{/if}>
-                <input type="text" name="state" value="{$account.fieldData.state}" class="glm-form-text-input-short">
+                <input type="text" name="state" value="{$account.fieldData.state}" class="glm-form-text-input-medium">
             {if $account.fieldFail.state}<p>{$account.fieldFail.state}</p>{/if}<br>
             </td>
         </tr>
@@ -122,7 +140,7 @@
         <tr>
             <th {if $account.fieldRequired.zip} class="glm-required"}{/if}>ZIP</th>
             <td {if $account.fieldFail.zip}class="glm-form-bad-input" data-tabid="glm-zip"{/if}>
-                <input type="text" name="zip" value="{$account.fieldData.zip}" class="glm-form-text-input-short">
+                <input type="text" name="zip" value="{$account.fieldData.zip}" class="glm-form-text-input-medium">
             {if $account.fieldFail.zip}<p>{$account.fieldFail.zip}</p>{/if}<br>
             </td>
         </tr>
@@ -130,7 +148,7 @@
         <tr>
             <th {if $account.fieldRequired.country} class="glm-required"}{/if}>Country</th>
             <td {if $account.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-country"{/if}>
-                <input type="text" name="country" value="{$account.fieldData.country}" class="glm-form-text-input-short">
+                <input type="text" name="country" value="{$account.fieldData.country}" class="glm-form-text-input-medium">
             {if $account.fieldFail.country}<p>{$account.fieldFail.country}</p>{/if}<br>
             </td>
         </tr>
@@ -138,7 +156,7 @@
         <tr>
             <th {if $account.fieldRequired.phone} class="glm-required"}{/if}>Phone</th>
             <td {if $account.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-phone"{/if}>
-                <input type="text" name="phone" value="{$account.fieldData.phone}" class="glm-form-text-input-short">
+                <input type="text" name="phone" value="{$account.fieldData.phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.phone}<p>{$account.fieldFail.phone}</p>{/if}<br>
             </td>
         </tr>
@@ -146,17 +164,17 @@
         <tr>
             <th {if $account.fieldRequired.fax} class="glm-required"}{/if}>Fax</th>
             <td {if $account.fieldFail.fax}class="glm-form-bad-input" data-tabid="glm-fax"{/if}>
-                <input type="text" name="fax" value="{$account.fieldData.fax}" class="glm-form-text-input-short">
+                <input type="text" name="fax" value="{$account.fieldData.fax}" class="glm-form-text-input-medium">
             {if $account.fieldFail.fax}<p>{$account.fieldFail.fax}</p>{/if}<br>
             </td>
         </tr>
 
-        <tr><th colspan="2">Billing Information:</th></tr>
+        <tr><th colspan="2">Billing Information</th></tr>
 
         <tr>
             <th {if $account.fieldRequired.bill_fname} class="glm-required"}{/if}>First Name</th>
             <td {if $account.fieldFail.bill_fname}class="glm-form-bad-input" data-tabid="glm-bill-fname"{/if}>
-                <input type="text" name="bill_fname" value="{$account.fieldData.bill_fname}" class="glm-form-text-input-short">
+                <input type="text" name="bill_fname" value="{$account.fieldData.bill_fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_fname}<p>{$account.fieldFail.bill_fname}</p>{/if}<br>
             </td>
         </tr>
@@ -164,7 +182,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_lname} class="glm-required"}{/if}>Last Name</th>
             <td {if $account.fieldFail.bill_lname}class="glm-form-bad-input" data-tabid="glm-bill-lname"{/if}>
-                <input type="text" name="bill_lname" value="{$account.fieldData.bill_lname}" class="glm-form-text-input-short">
+                <input type="text" name="bill_lname" value="{$account.fieldData.bill_lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_lname}<p>{$account.fieldFail.bill_lname}</p>{/if}<br>
             </td>
         </tr>
@@ -172,7 +190,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_org} class="glm-required"}{/if}>Organization</th>
             <td {if $account.fieldFail.bill_org}class="glm-form-bad-input" data-tabid="glm-bill-org"{/if}>
-                <input type="text" name="bill_org" value="{$account.fieldData.bill_org}" class="glm-form-text-input-short">
+                <input type="text" name="bill_org" value="{$account.fieldData.bill_org}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_org}<p>{$account.fieldFail.bill_org}</p>{/if}<br>
             </td>
         </tr>
@@ -180,7 +198,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_title} class="glm-required"}{/if}>Title</th>
             <td {if $account.fieldFail.bill_title}class="glm-form-bad-input" data-tabid="glm-bill-title"{/if}>
-                <input type="text" name="bill_title" value="{$account.fieldData.bill_title}" class="glm-form-text-input-short">
+                <input type="text" name="bill_title" value="{$account.fieldData.bill_title}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_title}<p>{$account.fieldFail.bill_title}</p>{/if}<br>
             </td>
         </tr>
@@ -188,7 +206,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_addr1} class="glm-required"}{/if}>Address 1</th>
             <td {if $account.fieldFail.bill_addr1}class="glm-form-bad-input" data-tabid="glm-bill-addr1"{/if}>
-                <input type="text" name="bill_addr1" value="{$account.fieldData.bill_addr1}" class="glm-form-text-input-short">
+                <input type="text" name="bill_addr1" value="{$account.fieldData.bill_addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_addr1}<p>{$account.fieldFail.bill_addr1}</p>{/if}<br>
             </td>
         </tr>
@@ -196,7 +214,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_addr2} class="glm-required"}{/if}>Address 2</th>
             <td {if $account.fieldFail.bill_addr2}class="glm-form-bad-input" data-tabid="glm-bill-addr2"{/if}>
-                <input type="text" name="bill_addr2" value="{$account.fieldData.bill_addr2}" class="glm-form-text-input-short">
+                <input type="text" name="bill_addr2" value="{$account.fieldData.bill_addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_addr2}<p>{$account.fieldFail.bill_addr2}</p>{/if}<br>
             </td>
         </tr>
@@ -204,7 +222,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_city} class="glm-required"}{/if}>City</th>
             <td {if $account.fieldFail.bill_city}class="glm-form-bad-input" data-tabid="glm-bill-city"{/if}>
-                <input type="text" name="bill_city" value="{$account.fieldData.bill_city}" class="glm-form-text-input-short">
+                <input type="text" name="bill_city" value="{$account.fieldData.bill_city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_city}<p>{$account.fieldFail.bill_city}</p>{/if}<br>
             </td>
         </tr>
@@ -212,7 +230,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_state} class="glm-required"}{/if}>State</th>
             <td {if $account.fieldFail.bill_state}class="glm-form-bad-input" data-tabid="glm-bill-state"{/if}>
-                <input type="text" name="bill_state" value="{$account.fieldData.bill_state}" class="glm-form-text-input-short">
+                <input type="text" name="bill_state" value="{$account.fieldData.bill_state}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_state}<p>{$account.fieldFail.bill_state}</p>{/if}<br>
             </td>
         </tr>
@@ -220,7 +238,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_country} class="glm-required"}{/if}>Country</th>
             <td {if $account.fieldFail.bill_country}class="glm-form-bad-input" data-tabid="glm-bill-country"{/if}>
-                <input type="text" name="bill_country" value="{$account.fieldData.bill_country}" class="glm-form-text-input-short">
+                <input type="text" name="bill_country" value="{$account.fieldData.bill_country}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_country}<p>{$account.fieldFail.bill_country}</p>{/if}<br>
             </td>
         </tr>
@@ -228,7 +246,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_phone} class="glm-required"}{/if}>Phone</th>
             <td {if $account.fieldFail.bill_phone}class="glm-form-bad-input" data-tabid="glm-bill-phone"{/if}>
-                <input type="text" name="bill_phone" value="{$account.fieldData.bill_phone}" class="glm-form-text-input-short">
+                <input type="text" name="bill_phone" value="{$account.fieldData.bill_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_phone}<p>{$account.fieldFail.bill_phone}</p>{/if}<br>
             </td>
         </tr>
@@ -236,7 +254,7 @@
         <tr>
             <th {if $account.fieldRequired.bill_fax} class="glm-required"}{/if}>Fax</th>
             <td {if $account.fieldFail.bill_fax}class="glm-form-bad-input" data-tabid="glm-bill-fax"{/if}>
-                <input type="text" name="bill_fax" value="{$account.fieldData.bill_fax}" class="glm-form-text-input-short">
+                <input type="text" name="bill_fax" value="{$account.fieldData.bill_fax}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_fax}<p>{$account.fieldFail.bill_fax}</p>{/if}<br>
             </td>
         </tr>
@@ -244,15 +262,25 @@
         <tr>
             <th {if $account.fieldRequired.email} class="glm-required"}{/if}>Email</th>
             <td {if $account.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-email"{/if}>
-                <input type="text" name="email" value="{$account.fieldData.email}" class="glm-form-text-input-short">
+                <input type="text" name="email" value="{$account.fieldData.email}" class="glm-form-text-input-medium">
             {if $account.fieldFail.email}<p>{$account.fieldFail.email}</p>{/if}<br>
             </td>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.password} class="glm-required"}{/if}>Password</th>
+            <th {if $account.fieldRequired.password} class="glm-required"}{/if}>Login Password</th>
             <td {if $account.fieldFail.password}class="glm-form-bad-input" data-tabid="glm-password"{/if}>
-                <input type="text" name="password" value="{$account.fieldData.password}" class="glm-form-text-input-short">
+                <input type="text" name="password" value="{$account.fieldData.password}" class="glm-form-text-input-medium" placeholder="{if $option=='create'}(no spaces permitted){else}(Password does not show, only enter to change password.){/if}">
+                {if $option == 'create'}
+                    <span class="glm-notice">Save this password.</span>
+                    <br>A randomly generated password has been supplied. You may change this as desired.
+                    There is no way to view a password once it's set. However, a user may recover a password using their
+                    Email address at the login page.
+                {else}
+                    <br>NOTE: Enter a password here <b><i>only</i></b> if you need to change it.
+                {/if}
+                    <br>The password must be at least 8 characters and include at least one number, one letter, and at least one
+                    special character. (# . - _ , $ % & !)</b>
             {if $account.fieldFail.password}<p>{$account.fieldFail.password}</p>{/if}<br>
             </td>
         </tr>
@@ -273,12 +301,12 @@
             </td>
         </tr>
 
-        <tr><th colspan="2">Contact Information:</th></tr>
+        <tr><th colspan="2">Contact Information</th></tr>
 
         <tr>
             <th {if $account.fieldRequired.contact_fname} class="glm-required"}{/if}>First Name</th>
             <td {if $account.fieldFail.contact_fname}class="glm-form-bad-input" data-tabid="glm-contact-fname"{/if}>
-                <input type="text" name="contact_fname" value="{$account.fieldData.contact_fname}" class="glm-form-text-input-short">
+                <input type="text" name="contact_fname" value="{$account.fieldData.contact_fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_fname}<p>{$account.fieldFail.contact_fname}</p>{/if}<br>
             </td>
         </tr>
@@ -286,7 +314,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_lname} class="glm-required"}{/if}>Last Name</th>
             <td {if $account.fieldFail.contact_lname}class="glm-form-bad-input" data-tabid="glm-contact-lname"{/if}>
-                <input type="text" name="contact_lname" value="{$account.fieldData.contact_lname}" class="glm-form-text-input-short">
+                <input type="text" name="contact_lname" value="{$account.fieldData.contact_lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_lname}<p>{$account.fieldFail.contact_lname}</p>{/if}<br>
             </td>
         </tr>
@@ -294,7 +322,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_org} class="glm-required"}{/if}>Organization</th>
             <td {if $account.fieldFail.contact_org}class="glm-form-bad-input" data-tabid="glm-contact-org"{/if}>
-                <input type="text" name="contact_org" value="{$account.fieldData.contact_org}" class="glm-form-text-input-short">
+                <input type="text" name="contact_org" value="{$account.fieldData.contact_org}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_org}<p>{$account.fieldFail.contact_org}</p>{/if}<br>
             </td>
         </tr>
@@ -302,7 +330,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_title} class="glm-required"}{/if}>Title</th>
             <td {if $account.fieldFail.contact_title}class="glm-form-bad-input" data-tabid="glm-contact-title"{/if}>
-                <input type="text" name="contact_title" value="{$account.fieldData.contact_title}" class="glm-form-text-input-short">
+                <input type="text" name="contact_title" value="{$account.fieldData.contact_title}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_title}<p>{$account.fieldFail.contact_title}</p>{/if}<br>
             </td>
         </tr>
@@ -310,7 +338,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_addr1} class="glm-required"}{/if}>Address 1</th>
             <td {if $account.fieldFail.contact_addr1}class="glm-form-bad-input" data-tabid="glm-contact-addr1"{/if}>
-                <input type="text" name="contact_addr1" value="{$account.fieldData.contact_addr1}" class="glm-form-text-input-short">
+                <input type="text" name="contact_addr1" value="{$account.fieldData.contact_addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_addr1}<p>{$account.fieldFail.contact_addr1}</p>{/if}<br>
             </td>
         </tr>
@@ -318,7 +346,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_addr2} class="glm-required"}{/if}>Address 2</th>
             <td {if $account.fieldFail.contact_addr2}class="glm-form-bad-input" data-tabid="glm-contact-addr2"{/if}>
-                <input type="text" name="contact_addr2" value="{$account.fieldData.contact_addr2}" class="glm-form-text-input-short">
+                <input type="text" name="contact_addr2" value="{$account.fieldData.contact_addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_addr2}<p>{$account.fieldFail.contact_addr2}</p>{/if}<br>
             </td>
         </tr>
@@ -326,7 +354,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_city} class="glm-required"}{/if}>City</th>
             <td {if $account.fieldFail.contact_city}class="glm-form-bad-input" data-tabid="glm-contact-cite"{/if}>
-                <input type="text" name="contact_city" value="{$account.fieldData.contact_city}" class="glm-form-text-input-short">
+                <input type="text" name="contact_city" value="{$account.fieldData.contact_city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_city}<p>{$account.fieldFail.contact_city}</p>{/if}<br>
             </td>
         </tr>
@@ -334,7 +362,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_state} class="glm-required"}{/if}>State</th>
             <td {if $account.fieldFail.contact_state}class="glm-form-bad-input" data-tabid="glm-contact-state"{/if}>
-                <input type="text" name="contact_state" value="{$account.fieldData.contact_state}" class="glm-form-text-input-short">
+                <input type="text" name="contact_state" value="{$account.fieldData.contact_state}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_state}<p>{$account.fieldFail.contact_state}</p>{/if}<br>
             </td>
         </tr>
@@ -342,7 +370,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_zip} class="glm-required"}{/if}>ZIP</th>
             <td {if $account.fieldFail.contact_zip}class="glm-form-bad-input" data-tabid="glm-contact-zip"{/if}>
-                <input type="text" name="contact_zip" value="{$account.fieldData.contact_zip}" class="glm-form-text-input-short">
+                <input type="text" name="contact_zip" value="{$account.fieldData.contact_zip}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_zip}<p>{$account.fieldFail.contact_zip}</p>{/if}<br>
             </td>
         </tr>
@@ -350,7 +378,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_country} class="glm-required"}{/if}>Country</th>
             <td {if $account.fieldFail.contact_country}class="glm-form-bad-input" data-tabid="glm-contact-country"{/if}>
-                <input type="text" name="contact_country" value="{$account.fieldData.contact_country}" class="glm-form-text-input-short">
+                <input type="text" name="contact_country" value="{$account.fieldData.contact_country}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_country}<p>{$account.fieldFail.contact_country}</p>{/if}<br>
             </td>
         </tr>
@@ -358,7 +386,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_phone} class="glm-required"}{/if}>Phone</th>
             <td {if $account.fieldFail.contact_phone}class="glm-form-bad-input" data-tabid="glm-contact-phone"{/if}>
-                <input type="text" name="contact_phone" value="{$account.fieldData.contact_phone}" class="glm-form-text-input-short">
+                <input type="text" name="contact_phone" value="{$account.fieldData.contact_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_phone}<p>{$account.fieldFail.contact_phone}</p>{/if}<br>
             </td>
         </tr>
@@ -366,7 +394,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_fax} class="glm-required"}{/if}>Fax</th>
             <td {if $account.fieldFail.contact_fax}class="glm-form-bad-input" data-tabid="glm-contact-fax"{/if}>
-                <input type="text" name="contact_fax" value="{$account.fieldData.contact_fax}" class="glm-form-text-input-short">
+                <input type="text" name="contact_fax" value="{$account.fieldData.contact_fax}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_fax}<p>{$account.fieldFail.contact_fax}</p>{/if}<br>
             </td>
         </tr>
@@ -374,7 +402,7 @@
         <tr>
             <th {if $account.fieldRequired.contact_email} class="glm-required"}{/if}>Email</th>
             <td {if $account.fieldFail.contact_email}class="glm-form-bad-input" data-tabid="glm-contact-email"{/if}>
-                <input type="text" name="contact_email" value="{$account.fieldData.contact_email}" class="glm-form-text-input-short">
+                <input type="text" name="contact_email" value="{$account.fieldData.contact_email}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_email}<p>{$account.fieldFail.contact_email}</p>{/if}<br>
             </td>
         </tr>
@@ -390,7 +418,7 @@
         <tr>
             <th {if $account.fieldRequired.guardian} class="glm-required"}{/if}>Guardian</th>
             <td {if $account.fieldFail.guardian}class="glm-form-bad-input" data-tabid="glm-guardian"{/if}>
-                <input type="text" name="guardian" value="{$account.fieldData.guardian}" class="glm-form-text-input-short">
+                <input type="text" name="guardian" value="{$account.fieldData.guardian}" class="glm-form-text-input-medium">
             {if $account.fieldFail.guardian}<p>{$account.fieldFail.guardian}</p>{/if}<br>
             </td>
         </tr>
@@ -398,7 +426,7 @@
         <tr>
             <th {if $account.fieldRequired.emer_contact} class="glm-required"}{/if}>Emergency Contact</th>
             <td {if $account.fieldFail.emer_contact}class="glm-form-bad-input" data-tabid="glm-emer-contact"{/if}>
-                <input type="text" name="emer_contact" value="{$account.fieldData.emer_contact}" class="glm-form-text-input-short">
+                <input type="text" name="emer_contact" value="{$account.fieldData.emer_contact}" class="glm-form-text-input-medium">
             {if $account.fieldFail.emer_contact}<p>{$account.fieldFail.emer_contact}</p>{/if}<br>
             </td>
         </tr>
@@ -406,7 +434,7 @@
         <tr>
             <th {if $account.fieldRequired.emer_phone} class="glm-required"}{/if}>Emergency Phone</th>
             <td {if $account.fieldFail.emer_phone}class="glm-form-bad-input" data-tabid="glm-emer-phone"{/if}>
-                <input type="text" name="emer_phone" value="{$account.fieldData.emer_phone}" class="glm-form-text-input-short">
+                <input type="text" name="emer_phone" value="{$account.fieldData.emer_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.emer_phone}<p>{$account.fieldFail.emer_phone}</p>{/if}<br>
             </td>
         </tr>
@@ -414,7 +442,7 @@
         <tr>
             <th {if $account.fieldRequired.med_history} class="glm-required"}{/if}>Medical History</th>
             <td {if $account.fieldFail.med_history}class="glm-form-bad-input" data-tabid="glm-med-history"{/if}>
-                <input type="text" name="med_history" value="{$account.fieldData.med_history}" class="glm-form-text-input-short">
+                <input type="text" name="med_history" value="{$account.fieldData.med_history}" class="glm-form-text-input-medium">
             {if $account.fieldFail.med_history}<p>{$account.fieldFail.med_history}</p>{/if}<br>
             </td>
         </tr>
@@ -422,7 +450,7 @@
         <tr>
             <th {if $account.fieldRequired.allergy_med} class="glm-required"}{/if}>Allergy Medication</th>
             <td {if $account.fieldFail.allergy_med}class="glm-form-bad-input" data-tabid="glm-allergy-med"{/if}>
-                <input type="text" name="allergy_med" value="{$account.fieldData.allergy_med}" class="glm-form-text-input-short">
+                <input type="text" name="allergy_med" value="{$account.fieldData.allergy_med}" class="glm-form-text-input-medium">
             {if $account.fieldFail.allergy_med}<p>{$account.fieldFail.allergy_med}</p>{/if}<br>
             </td>
         </tr>
@@ -444,6 +472,23 @@
     </form>
     <script>
         jQuery(document).ready(function($) {
+
+            // Delete Account dialog
+            $("#deleteAccountDialog").dialog({
+                autoOpen: false,
+                minWidth: 400,
+                dialogClass: "glm-dialog-no-close"
+            });
+            $('#deleteAccountButton').click( function() {
+                $('#deleteAccountDialog').dialog('open');
+            });
+            $('#deleteAccountCancel').click( function() {
+                $("#deleteAccountDialog").dialog("close");
+            });
+            $('#deleteAccountSubmit').click( function() {
+                window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=accounts&option=delete&account={$account.fieldData.id}");
+            });
+
             $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
         });