From: Chuck Scott <cscott@gaslightmedia.com>
Date: Wed, 27 Jan 2016 20:11:49 +0000 (-0500)
Subject: Various bug fixes for bugs reported by Laury
X-Git-Tag: v1.1.0^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ff8c2edf9f32f4111bfbf431dfdd80c8f54cee91;p=WP-Plugins%2Fglm-member-db.git

Various bug fixes for bugs reported by Laury
---

diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php
index 66b1c62d..d6e5169c 100644
--- a/classes/data/dataMemberInfo.php
+++ b/classes/data/dataMemberInfo.php
@@ -227,7 +227,6 @@ class GlmDataMemberInfo extends GlmDataAbstract
                     'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'cities',
                     'p_field' => 'name',
                     'p_orderby' => 'name',
-                    'p_blank' => true,
                 'use' => 'a'
             ),
 
diff --git a/models/admin/configure/categories.php b/models/admin/configure/categories.php
index 2be9fa02..b1b23efd 100644
--- a/models/admin/configure/categories.php
+++ b/models/admin/configure/categories.php
@@ -128,6 +128,14 @@ class GlmMembersAdmin_configure_categories extends GlmDataCategories
                 case 'delete':
                     if ($id > 0) {
                         $this->deleteEntry($id, true);
+
+                        // Also delete from member info
+                        $this->wpdb->delete(
+                            GLM_MEMBERS_PLUGIN_DB_PREFIX . 'category_member_info',
+                            array(
+                                'category' => $id
+                            )
+                        );
                     }
                     break;
 
diff --git a/models/admin/configure/index.php b/models/admin/configure/index.php
index 4b42f0da..d6ecc937 100644
--- a/models/admin/configure/index.php
+++ b/models/admin/configure/index.php
@@ -102,6 +102,7 @@ class GlmMembersAdmin_configure_index extends GlmDataMemberTypes
         $success = true;
         $haveMemberTypes = false;
         $memberTypes = false;
+        $couldNotDelete = false;
         $error = false;
 
         // Check for member type id
@@ -127,7 +128,19 @@ class GlmMembersAdmin_configure_index extends GlmDataMemberTypes
 
                 case 'delete':
                     if ($id > 0) {
-                        $this->deleteEntry($id, true);
+                        // First check if any members are using this type
+                        $inUse = $this->wpdb->get_var("
+                             SELECT COUNT(id)
+                               FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."members
+                              WHERE member_type = $id;
+                        ");
+
+                        // If there's no members with this type
+                        if (($inUse-0) == 0) {
+                            $this->deleteEntry($id, true);
+                        } else {
+                            $couldNotDelete = true;
+                        }
                     }
                     break;
 
@@ -173,7 +186,8 @@ class GlmMembersAdmin_configure_index extends GlmDataMemberTypes
         // Compile template data
         $templateData = array(
             'haveMemberTypes' => $haveMemberTypes,
-            'memberTypes' => $memberTypes
+            'memberTypes' => $memberTypes,
+            'couldNotDelete' => $couldNotDelete
         );
 
         // Return status, suggested view, and data to controller
diff --git a/models/admin/management/import.php b/models/admin/management/import.php
index 31503cdc..48fa2e90 100644
--- a/models/admin/management/import.php
+++ b/models/admin/management/import.php
@@ -914,6 +914,10 @@ class GlmMembersAdmin_management_import
                             }
                         }
 
+                        // Fix bad LAT/LON values. Anything that's not a number should be set to 0 (ZERO)
+                        $latVal = ($val['lat']-0);
+                        $lonVal = ($val['lon']-0);
+
                         // Insert Member Information Record
                         $res = $this->wpdb->insert(
                                 GLM_MEMBERS_PLUGIN_DB_PREFIX.'member_info',
@@ -930,8 +934,8 @@ class GlmMembersAdmin_management_import
                                         'state' => $state[$val['state_id']]['state_abb'],
                                         'country' => 'US',
                                         'zip' => $val['zip'],
-                                        'lat' => $val['lat'],
-                                        'lon' => $val['lon'],
+                                        'lat' => $latVal,
+                                        'lon' => $lonVal,
                                         'region' => (isset($region[$val['region']]) ? $region[$val['region']]['new_id'] : 0),
                                         'phone' => $val['phone'],
                                         'toll_free' => $val['toll_free'],
diff --git a/setup/databaseScripts/create_database_V1.0.43.sql b/setup/databaseScripts/create_database_V1.0.43.sql
index f243f0f7..30917282 100644
--- a/setup/databaseScripts/create_database_V1.0.43.sql
+++ b/setup/databaseScripts/create_database_V1.0.43.sql
@@ -609,9 +609,9 @@ CREATE TABLE {prefix}settings_general (
 
 -- Set default entry
 INSERT INTO {prefix}settings_general
-    ( id, time_zone, canonical_member_page )
+    ( id, time_zone, canonical_member_page, list_logo_size, list_map_logo_size, detail_logo_size, detail_map_logo_size )
    VALUES
-    ( 1, 'America/Detroit', 'member-detail' )
+    ( 1, 'America/Detroit', 'member-detail', 'large', 'thumb', 'large', 'thumb' )
 ;
 
 ----
diff --git a/views/admin/configure/categories.html b/views/admin/configure/categories.html
index 42a7bfdc..a0f01705 100644
--- a/views/admin/configure/categories.html
+++ b/views/admin/configure/categories.html
@@ -18,7 +18,7 @@
                     <th>Parent Category:</th>
                     <td>
                         <select name="parent">
-                            <option value=""></option>
+                            <option value="0">(none)</option>
             {if $haveCategories}
                 {foreach $categories as $t}
                     {if !$t.parent.value} <!-- don't show child categories -->
@@ -74,7 +74,7 @@
                     <th>Parent Category:</th>
                     <td>
                         <select id="editCategoryParent" name="parent">
-                            <option value=""></option>
+                            <option value="0">(none)</option>
             {if $haveCategories}
                 {foreach $categories as $t}
                     {if !$t.parent.value} <!-- don't show child categories -->
@@ -127,9 +127,9 @@
         {/if}
                 <td>{$t.id}</td>
                 <td>
-                    <span{if $t.parent.value} class="glm-indent"{/if}>
+                    <div{if $t.parent.value} class="glm-indent"{/if}>
                         <a class="editCategory" data-categoryID="{$t.id}" data-categoryParent="{$t.parent.value}">{$t.name}</a>
-                    </span>
+                    </div>
                 </td>
                 <td id="editCategoryDescr_{$t.id}">
                     {$t.descr}
@@ -154,16 +154,19 @@
             $("#newCategoryDialog").dialog({
             	autoOpen: false,
             	minWidth: 400,
+            	width:    'auto',
                 dialogClass: "glm-dialog-no-close"
             });
             $("#editCategoryDialog").dialog({
                 autoOpen: false,
                 minWidth: 400,
+                width:    'auto',
                 dialogClass: "glm-dialog-no-close"
             });
             $("#deleteCategoryDialog").dialog({
                 autoOpen: false,
                 minWidth: 400,
+                width:    'auto',
                 dialogClass: "glm-dialog-no-close"
             });
 
diff --git a/views/admin/configure/index.html b/views/admin/configure/index.html
index 46369abc..823b5762 100644
--- a/views/admin/configure/index.html
+++ b/views/admin/configure/index.html
@@ -64,6 +64,13 @@
     
     <h2>Member Types</h2>
 
+{if $couldNotDelete}
+    <h3 class="glm-error">
+        Member Type could not be deleted. Type is in use by at least one member.
+        <a href="{$thisURL}?page=glm-members-admin-menu-members&glm_action=list">Click here to see the members list.</a>
+    </h3>
+    
+{/if}
     <table class="wp-list-table widefat fixed posts glm-admin-table">
         <thead>
             <tr>
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index b256e283..436c1adf 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -197,7 +197,7 @@
                     <!-- City Selection -->
                     <input id="cityName" type="hidden" name="newCityName" value=""><!-- this field is only used if adding a new city to pass the new name -->
                     <select name="city" id="city" class="glm-geocodeAction">
-                        <option value="0"><option>
+                        <option value="0"></option>
         {foreach from=$memberInfo.fieldData.city.list item=v}
                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
                             {$v.name}
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 03469d64..2481fbcb 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -295,7 +295,11 @@
              */
              
             var myLocation = false;
+          {if $member.lat != 0 && $member.lon != 0}
             var memberlocation = new google.maps.LatLng({$member.lat}, {$member.lon});
+          {else}
+            var memberlocation = new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon});
+          {/if}
             
             function initMap() {
                 
@@ -308,6 +312,7 @@
                 });  
     
                 // Create a marker for this member
+             {if $member.lat != 0 && $member.lon != 0}
                 var marker = new google.maps.Marker({  
                     map: map,  
                     position: new google.maps.LatLng({$member.lat}, {$member.lon}),
@@ -315,7 +320,7 @@
                     animation: google.maps.Animation.DROP,  
                     title: '{$member.member|escape}'
                 });
-                
+             {/if}
                 // Try HTML5 to get user geolocation
                 if(navigator.geolocation) {
                   navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 35e57c80..e1d2e3fe 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -304,7 +304,8 @@
                 
         {if $haveMembers}
             {foreach $members as $m}
-    
+              {if $m.lat != 0 && $m.lon != 0}
+
                 // Create a marker for this member
                 var marker = new google.maps.Marker({  
                     map: map,  
@@ -326,7 +327,8 @@
                 
                 // Extend the map bounds to include this marker
                 bounds.extend(marker.position);
-                
+              
+             {/if}
             {/foreach}
     
                 // Fit map to bounds of all markers