Changeset 548366

Timestamp:

05/24/2012 03:54:42 AM (14 years ago)

Author:

claytantor

Message:

release 1.2.22 Support for Multiple Custom Post Types

Location:

welocally-places/trunk

Files:

• WelocallyWPPagination.class.php (modified) (1 diff)
• help/options-general-help.php (modified) (1 diff)
• menu.php (modified) (3 diffs)
• options/about.php (modified) (1 diff)
• options/options-general.php (modified) (3 diffs)
• options/options-infobar.php (modified) (2 diffs)
• options/places-manager.php (modified) (2 diffs)
• quickhelp.html (modified) (6 diffs)
• quickhelp.pdf (modified) (previous)
• readme.txt (modified) (7 diffs)
• resources/javascripts/wl_addplace_wp.js (modified) (4 diffs)
• resources/javascripts/wl_pager_wp.js (modified) (2 diffs)
• resources/javascripts/wl_placemgr.js (modified) (3 diffs)
• resources/stylesheets/ie/wl_places_admin.css (modified) (2 diffs)
• resources/stylesheets/wl_places_admin.css (modified) (5 diffs)
• template-tags.php (modified) (4 diffs)
• views/category-map-content-template.php (modified) (1 diff)
• views/place-content-template.php (modified) (1 diff)
• views/welocally-places-map-widget-display.php (modified) (1 diff)
• welocally-places-map-widget.class.php (modified) (2 diffs)
• welocally-places-tag-processor.class.php (modified) (3 diffs)
• welocally-places.class.php (modified) (29 diffs)
• welocally-places.php (modified) (5 diffs)

welocally-places/trunk/WelocallyWPPagination.class.php

@@ -272 +272 @@
             foreach($fields as $field){
                 $field = trim($field);
-                $content = str_replace("%$field%", $row[$field], $content);
+                
+                
+                if($field == "place"){
+                    $val = str_replace("'", "\'", $row[$field]);
+                    $content = str_replace("%$field%", "'".$val."'", $content);
+                } else {
+                    $content = str_replace("%$field%", $row[$field], $content);
+                }
+                
+                
             }
             return $content; 

welocally-places/trunk/help/options-general-help.php

@@ -1 @@
-<h1>Welocally Places Basic For Wordpress Guide</h1>
+<h1>Welocally Places Core For Wordpress Guide</h1>
 <a title="welocally places wordpress" href="http://wordpress.org/extend/plugins/welocally-places/">Welocally Places Plugin</a> for wordpress is intended to help site authors link real places to their content quickly, and then help their readers find those places quickly. This document is intended to help the blog owner or wordpress developer install, configure and use the plugin. It is structured by the administrative and user components associated with the plugin.
 

welocally-places/trunk/menu.php

@@ -1 +1 @@
 <?php
+/**
+ * this stuff should all be moved into the class.
+ * 
+ */
+
 function wl_menu_initialise() {
+    
+    //jquery ui
+    wp_register_style( 'jquery-ui-style', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css' );
 
     $main_slug = add_menu_page( 'Welocally Places Options', 'Welocally Places', 'manage_options', 'welocally-places-general', 'wl_general_options', WP_PLUGIN_URL . '/welocally-places/resources/images/welocally_places_button_color.png' );
@@ -6 +14 @@
     add_contextual_help( $main_slug, __( $main_content ) );
     
-    wl_add_submenu( 'Welocally Places About', 'About', 'welocally-places-about', 'wl_support_about' );
-    wl_add_submenu( 'Welocally Places Manager', 'Places Manager', 'welocally-places-manager', 'wl_places_manager' );
+    $about_slug = wl_add_submenu( 'Welocally Places About', 'About', 'welocally-places-about', 'wl_support_about' );
+    $placesmgr_slug = wl_add_submenu( 'Welocally Places Manager', 'Places Manager', 'welocally-places-manager', 'wl_places_manager' );
 
     add_filter( 'plugin_action_links', 'wl_places_add_settings_link', 10, 2 );
+    
+    //hook so only the admin placemgr screen get jquery ui, conflicts were occurring
+    add_action( 'admin_print_styles-' . $placesmgr_slug, 'wl_placesmgr_plugin_admin_styles' );
         
 }
+
 add_action( 'admin_menu','wl_menu_initialise' );
 add_filter( 'plugin_row_meta', 'wl_set_plugin_meta', 10, 2 );
 
+function wl_placesmgr_plugin_admin_styles() {   
+    wp_enqueue_style( 'jquery-ui-style' );      
+}
 
 function wl_general_options() {
@@ -96 +111 @@
     add_contextual_help( $profile_slug, __( $help_text ) );
 
-    return;
+    return $profile_slug;
 }
 

welocally-places/trunk/options/about.php

@@ -13 +13 @@
 <h2>Welocally Places About</h2>
 <div style="margin-top:20px;">
-<table class="form-table">
+<table class="wl-form-table">
     <tr valign="top">
         <th scope="row"><?php _e( 'Version' ); ?></th>

welocally-places/trunk/options/options-general.php

@@ -26 +26 @@
         $options['show_letters'] = 'off';
     } 
+    $options[ 'widget_post_type' ] = $_POST[ 'welocally_widget_post_type' ];
     
     //welocally_show_letters
@@ -74 +75 @@
 
 <form method="post" action="<?php echo bloginfo( 'wpurl' ).'/wp-admin/admin.php?page=welocally-places-general' ?>">
-<table class="form-table" style="margin-top:20px;">
+<table class="wl-form-table" style="margin-top:20px;">
     <tr valign="top">
         <th scope="row"><?php _e('General Map Options' ); ?></th>
@@ -90 +91 @@
                 <li><input type="checkbox" id="welocally_show_selection" name="welocally_show_selection" <?php if($options[ 'show_selection' ]=='on') { echo 'checked';  }  ?>>Show Selection Item List</li>
                 <li>Selection Item Style<br /><input style="width:400px" type="text" id="welocally_widget_selection_style" name="welocally_widget_selection_style" value="<?php echo $options[ 'widget_selection_style' ];?>"></li>
+                <li>Post Types (comma separated) <br /><input style="width:400px" type="text" id="welocally_widget_post_type" name="welocally_widget_post_type" value="<?php echo $options[ 'widget_post_type' ];?>"></li>
             </ul>
         </td>

welocally-places/trunk/options/options-infobar.php

@@ -3 +3 @@
 $options = $wlPlaces->getOptions();
 ?>
-<div id="action_bar">
+<div id="wl_action_bar">
     <div class="rollover" id="btn_support">
     <a href="http://support.welocally.com/categories/welocally-places-wp-basic" target="_new">
@@ -23 +23 @@
     </div>                                  
 </div>
+<?php
+$reqsMissing = $wlPlaces->databaseRequirementsMissing();
+if (count($reqsMissing)>0) {
+    $showReqsMissing = print_r($reqsMissing,true);
+    echo ('<div id="wl_info_bar"><div class="wl_error" style="margin 10px;">Reactivation is required to properly support required database changes for version '.WelocallyPlaces::VERSION.'. Please deactivate and re-activate now. '.$showReqsMissing.'</div></div>');             
+}
+?>  

welocally-places/trunk/options/places-manager.php

@@ -1 +1 @@
 <?php
-global $wlPlaces; 
+global $wlPlaces,$wpdb; 
 $places = $wlPlaces->getPlacesNew();
 ?>  
 <script type="text/javascript">
-
-
-function setPlaceRow(i, place){
+function setPlaceRow(i, placeJSON){
+    var place = jQuery.parseJSON(placeJSON);
     window.wlPlacesManager.setPlaceRow(i, place, jQuery('#wl_placemgr_place_'+i));
 }
-
 </script>
 <?php 
@@ -54 +52 @@
                   new WELOCALLY_PlaceManager();         
             window.wlPlacesManager.initCfg(cfg);
-            jQuery('#wl_places_mgr_wrapper' ).html(window.wlPlacesManager.makeWrapper());
-                        
+            jQuery('#wl_places_mgr_wrapper' ).html(window.wlPlacesManager.makeWrapper());       
          
              </script>

welocally-places/trunk/quickhelp.html

@@ -5 +5 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Welocally Places Basic Quick Help</title>
+    <title>Welocally Places Core Quick Help</title>
     <meta name="author" content="Welocally">
     <link rel="stylesheet" href="css/wl_pager_admin.css" media="all">   
@@ -18 +18 @@
 <div class="wrap wl_pager_admin">
     <div class="header section">
-        <div class="header-title">Welocally Places Basic Quick Help</div>
+        <div class="header-title">Welocally Places Core For Wordpress Quick Help</div>
         <div class="header-subtitle">Quick Help Guide</div>
-        <div>version 1.2.19</div>               
-        <div>Last Updated May 7, 2012</div>     
+        <div>version 1.2.22</div>               
+        <div>Last Updated May 21, 2012</div>        
     </div>
-<h1>Welocally Places Basic For Wordpress Guide</h1>
+<h1>Welocally Places Core For Wordpress Guide</h1>
 <a title="welocally places wordpress" href="http://wordpress.org/extend/plugins/welocally-places/">Welocally Places Plugin</a> for wordpress is intended to help site authors link real places to their content quickly, and then help their readers find those places quickly. This document is intended to help the blog owner or wordpress developer install, configure and use the plugin. It is structured by the administrative and user components associated with the plugin.
 
@@ -60 +60 @@
 </li>
 </ol>
+<h3>Manual Upgrading</h3>
+If you are upgrading and an install this manually make sure to re-activate the plugin, activation does important database updates. 
+
 <h2><a name="User_Components"></a>User Components</h2>
 <h3>Basics</h3>
@@ -71 +74 @@
 
 It acts identically like the Category Tag Map by making a map with selectable markers and a list which can also be selected. When a user selects either a marker or a list item an infobox will pop up at the location of the selected item on the map.
-
-<span style="font-size: 15px; font-weight: bold; clear: both;">Category Map Tag</span>
-
-<a href="http://welocally.com/wp-content/uploads/2011/07/Screen-Shot-2012-04-09-at-4.06.56-PM.png"><img class="alignleft size-full wp-image-1029" style="margin-top: 10px;" title="Screen Shot 2012-04-09 at 4.06.56 PM" src="http://welocally.com/wp-content/uploads/2011/07/Screen-Shot-2012-04-09-at-4.06.56-PM.png" alt="" width="207" height="354" /></a>
+<div style="clear: both;">&nbsp;</div>
+<h4>Category Map Tag</h4>
 The category map allows your users to filter the posts associated with specific categories on a single map, just like the Map Widget. This is helpful if you want to segment different places by type and show them to your readers on a page. making a directory? Just insert the tag "Shopping" or "Bars &amp; Pubs" on a page and you have a simple map for a shopping guide of all the places you have written about.
+<div style="clear: both;">&nbsp;</div>
+<p style="text-align: center;"><a href="http://welocally.com/wp-content/uploads/2011/07/Screen-Shot-2012-04-09-at-4.06.56-PM.png"><img class="aligncenter size-full wp-image-1029" style="margin-top: 10px;" title="Screen Shot 2012-04-09 at 4.06.56 PM" src="http://welocally.com/wp-content/uploads/2011/07/Screen-Shot-2012-04-09-at-4.06.56-PM.png" alt="" width="207" height="354" /></a></p>
 <p style="text-align: center;"><a href="http://welocally.com/wp-content/uploads/2012/04/Screen-Shot-2012-04-09-at-5.37.34-PM.png"><img class="aligncenter size-full wp-image-1064" title="Screen Shot 2012-04-09 at 5.37.34 PM" src="http://welocally.com/wp-content/uploads/2012/04/Screen-Shot-2012-04-09-at-5.37.34-PM.png" alt="" width="354" height="24" /></a></p>
 For example; if you had a pizza blog you might assign The Ugly Duck Pizza with the "Thin Cust" and "Rustic Wood Oven" categories. When your reader was looking for the pizzas of the New York Style only the pizza restaurants that had thin crust pizzas would show as ordered markers, and it would link the places back to the posts where you wrote about them. When a user selects a specific post excerpt, an info box identifying that place on the map will appear.
@@ -90 +93 @@
 <p style="text-align: center;"><a href="http://welocally.com/wp-content/uploads/2011/09/Screen-Shot-2012-05-12-at-11.52.38-AM.png"><img class="aligncenter size-full wp-image-1263" title="Screen Shot 2012-05-12 at 11.52.38 AM" src="http://welocally.com/wp-content/uploads/2011/09/Screen-Shot-2012-05-12-at-11.52.38-AM.png" alt="" width="482" height="43" /></a></p>
 
+<h4>Custom Post Types</h4>
+<p>Many wordpress themes such as <a href="http://themeforest.net/item/swagmag-wordpress-magazinereview-theme/1576310">SwagMag - WordPress Magazine/Review Theme</a> use the concept of custom post types to manage an maintain posts. Welocally Places supports one or many custom post types, but you must use the post type name in the database for it to work properly. <strong>Multiple custom post types are supported byt they must be comma delimitated no spaces.</strong></p>
+<p><a href="http://welocally.com/wp-content/uploads/2011/09/tag_custom_post.png"><img class="aligncenter size-full wp-image-1323" title="tag_custom_post" src="http://welocally.com/wp-content/uploads/2011/09/tag_custom_post.png" alt="" width="500" height="30" /></a></p>
+<p style="text-align: left;">You can configure the widget to use custom post types in the same way using the options.</p>
+<p style="text-align: center;"><img class="aligncenter size-full wp-image-1324" title="Screen Shot 2012-05-23 at 7.13.51 PM" src="http://welocally.com/wp-content/uploads/2011/09/Screen-Shot-2012-05-23-at-7.13.51-PM.png" alt="" width="618" height="344" /></p>
+
+
 <h2>Administration</h2>
 Options allow you to control the plugin, and we have created a custom option. We have a custom sidebar options tab, so in setting up welocally places just select the side tab item.
@@ -101 +111 @@
 </ul>
 <h3><strong>Welocally Places General Options</strong></h3>
-<p style="text-align: center;"><a href="http://welocally.com/wp-content/uploads/2011/09/Screen-Shot-2012-05-12-at-11.33.10-AM.png"><img class="aligncenter size-full wp-image-1259" title="Screen Shot 2012-05-12 at 11.33.10 AM" src="http://welocally.com/wp-content/uploads/2011/09/Screen-Shot-2012-05-12-at-11.33.10-AM.png" alt="" width="602" height="255" /></a></p>
+<p style="text-align: center;"><img class="aligncenter size-full wp-image-1324" title="Screen Shot 2012-05-23 at 7.13.51 PM" src="http://welocally.com/wp-content/uploads/2011/09/Screen-Shot-2012-05-23-at-7.13.51-PM.png" alt="" width="618" height="344" /></p>
 
 <h4 style="text-align: left;">General Map Options, Infobox Place Links</h4>

welocally-places/trunk/readme.txt

@@ -1 @@
-=== Welocally Places Basic ===
+=== Welocally Places Core ===
 Contributors: claytantor 
 Tags: hyperlocal, geocoding, places, maps, foodie, travel, real estate, business directories
@@ -7 +7 @@
 License: GPL v2 (GNU General Public License v2)
 
-The Welocally Places Basic plugin lets easily associate places with rich maps and place info with your wordpress content. 
+The Welocally Places Core plugin lets easily associate places with rich maps and place info with your wordpress content. 
 
 == Description ==
@@ -20 +20 @@
 * Integrated driving directions
 * Category based map tags help you make directories quickly
+* Support for custom post types
 
 Product Overview: http://welocally.com/?page_id=2
@@ -35 +36 @@
 
 Q:What Browsers Do You Support?
-A:For Publishers we have tested creating places for and recommend versions starting at least Chrome 17.0.963.56, Safari Version 5.1.2 and Firefox 10.0.2. We *do not* reccomend the use of IE for site owners using welocally places, but we have tested site vistors successfully using Welocally Places with IE 5.3.2 or greater. 
+A:For Publishers we have tested creating places for and recommend versions starting at least Chrome 17.0.963.56, Safari Version 5.1.2 and Firefox 10.0.2. We *do not* recommend the use of IE for site owners using welocally places, but we have tested site vistors successfully using Welocally Places with IE 5.3.2 or greater. 
  
 Q:What is a POI? 
@@ -51 +52 @@
 
 == Changelog ==
+1.2.22
+222 Add activation notice if missing 1.2.22 fields  
+221 jQuery UI override  
+220 Change Name To Welocally Places Core    
+219 Support for Multiple Custom Post Types  
+218 Edit broken 
+217 Apostrophe in place json causes places manager to fail. 
+213 Refactor shortcode handler  
+209 Custom post types   
+208 University Offices, Wellington Square, Oxford, OX1 2JD, United Kingdom  
+206 Places manager breaks on null place 
+
 1.2.21
 203 Update documentation to include proper version requirements
@@ -62 +75 @@
 
 1.2.19
-196 Feature Remove Registration Requirement 
-195 Feature Remove any CURL Concepts    
-194 Feature Pagination  
-192 Feature Local Category Tag  
-191 Feature Local Place Tag 
-190 Feature No key geocoding
-189 Feature Local Database  
-186 Bug Refactor options    
-185 Bug Category and fields showing on add place.
+196 Remove Registration Requirement 
+195 Remove any CURL Concepts    
+194 Pagination  
+192 Local Category Tag  
+191 Local Place Tag 
+190 No key geocoding
+189 Local Database  
+186 Refactor options    
+185 Category and fields showing on add place.
 
 1.1.18
-Feature #56: Welocally Namespace Javascript Refactoring
-Feature #87: Widgetize Place Finder
-Feature #100: Refactor wp_postmeta to remove obsolete concepts
-Feature #128: Category Map Tag Support
-Feature #140: API Keys incorporated into web services
-Feature #152: Widgetize Places
-Feature #154: Remove Font Customization
-Feature #156: Support for post links as title anchors
-Feature #160: Multi widget support for style overrides
-Feature #161: Use sprited markers
-Feature #169: Widgetize Registration
-Feature #170: Multisite licensing
-Feature #171: Map selector improvements
-Feature #174: Catgerory map widget should be context aware
+56: Welocally Namespace Javascript Refactoring
+87: Widgetize Place Finder
+100: Refactor wp_postmeta to remove obsolete concepts
+128: Category Map Tag Support
+140: API Keys incorporated into web services
+152: Widgetize Places
+154: Remove Font Customization
+156: Support for post links as title anchors
+160: Multi widget support for style overrides
+161: Use sprited markers
+169: Widgetize Registration
+170: Multisite licensing
+171: Map selector improvements
+174: Catgerory map widget should be context aware
 
 1.1.17
@@ -92 +105 @@
 
 1.1.16
-99  "Places DB Tool In Options"
-94  "Place Finder for Pages"
-71  "Share Tag Support"
-54  "Refactor Metadata Approach for Place Persistence"
-53  "Extended Tag Support"
-43  "Places Support On Pages"
-42  "Transform Post Save Approach to Tags and Place Metadata"
-41  "Custom Theme Support For List Widget"
-40  "Custom Theme Support For Map Widget"
-38  "Add Custom Theme Options Settings"
-36  "iFeature Theme Support"
-34  "zBench Theme Support"
-21  "Add Change Login/Key Support"
-10  "Theme Support for Delicate "
-3   "Integrate New Add Place Workflow"
-
-1.0.13
-361 Options settings to suppress the display of the the "sele...    
-360 Infobox close deselects peer infoboxes. 
-363 Support Thumbnails in Map Infobox
-364 Sight Theme Support 
-
-1.0.12
-354 critical    P1  Archive summaries are showing javascript for theme.
-353 critical    P1  Setting "Yes" to place with no selection should not persist on Update
-352 enhancement P1  Picman still broken in some themes
-351 enhancement P2  Improve theme support in About options
-
-1.0.11
-349 maj P1  Map is Showing Up On Category Archive   1.0.11
-346 maj P2  Add Place Appends Extra to website prefix   ---
-344 cri P1  Place Name Links To Incorrect Post  1.0.11
-343 enh P1  Bypass Filter When No Category Hits 1.0.11
-341 enh P2  Some theme img css effects map tiles    1.0.11
-
-1.0.10
-333 FIXE    1.0.9   Need to quote templated javascript
-334 FIXE    1.0.9   Where marker not showing up on non custom maps
-336 FIXE    1.0.9   HTTPS support for all ajax calls
-337 FIXE    1.0.9   Url and Website Confusion
-338 WORK    1.0.9   Cannot exit add place mode
-340 FIXE    1.0.9   Plugin causes problem when inserting images
-
-1.0.9
-332 FIXE    1.0.8   Jquery version < 1.4 is not parsing JSON
-304 WONT    1.0.7   Seachability for Simple Geo Store
-327 FIXE    1.0.7   Improve subscription prompting and workflow
-331 LATE    1.0.8   Post excerpts are not full text
-
-1.0.8  
-320 FIXE    Post map not showing up on new posts    
-321 FIXE    Infobox missing URL link for places
-327 FIXE    Improve subscription prompting and workflow
-
-1.0.7 Initial version. Includes: Places List Widget, Places Map Widget and  
-Category Browser for supported themes
+99  Places DB Tool In Options
+94  Place Finder for Pages
+71  Share Tag Support
+54  Refactor Metadata Approach for Place Persistence
+53  Extended Tag Support
+43  Places Support On Pages
+42  Transform Post Save Approach to Tags and Place Metadata
+41  Custom Theme Support For List Widget
+40  Custom Theme Support For Map Widget
+38  Add Custom Theme Options Settings
+36  iFeature Theme Support
+34  zBench Theme Support
+21  Add Change Login/Key Support
+10  Theme Support for Delicate 
+3   Integrate New Add Place Workflow
 
 == Upgrade Notice ==
-No notices at this time.
+If you are upgrading and an install this manually make sure to re-activate the plugin, activation does important database updates. 
 
 == Screenshots ==

welocally-places/trunk/resources/javascripts/wl_addplace_wp.js

@@ -531 +531 @@
       type: 'POST',       
       url: ajaxurl,
+      datatype: 'json',
       data: data,
       beforeSend: function(jqXHR){
@@ -540 +541 @@
         }       
       },          
-      success : function(data, textStatus, jqXHR) {
+      success : function(data, textStatus, jqXHR, dataType) {
         if(data != null && data.errors != null) {
             _instance.setStatus(_instance.statusArea,'ERROR:'+WELOCALLY.util.getErrorString(data.errors), 'wl_error', false);
@@ -546 +547 @@
             _instance.setStatus(_instance.statusArea,'Could not save place:'+WELOCALLY.util.getErrorString(data.errors), 'wl_error', false);
         } else {
-            var response = jQuery.parseJSON(data);
-            var tag = '[welocally id="'+response.id+'"/]';
-            
-            _instance.setStatus(_instance.statusArea,'Your place has been saved! <br/><span class="wl_placemgr_place_tag">'+tag+'</span>', 'wl_message', false);
-            _instance.savedPlace = selectedPlace;
+            try{
+                var response = jQuery.parseJSON(data);
+                var tag = '[welocally id="'+response.id+'"/]';              
+                _instance.setStatus(_instance.statusArea,'Your place has been saved! <br/><span class="wl_placemgr_place_tag">'+tag+'</span>', 'wl_message', false);
+                _instance.savedPlace = selectedPlace;
+            } catch(e) {
+                _instance.setStatus(_instance.statusArea,'ERROR: Can Not Parse Response.'+data, 'wl_error', false);
+            }
+            
+            
+            
         }
       }
@@ -626 +633 @@
     
     var hasAll = _instance.hasType("country", geocode.address_components);
-    hasAll = hasAll && _instance.hasType("street_number", geocode.address_components);
     hasAll = hasAll && _instance.hasType("route", geocode.address_components);
     hasAll = hasAll && _instance.hasType("locality", geocode.address_components);

welocally-places/trunk/resources/javascripts/wl_pager_wp.js

@@ -268 +268 @@
         content: _instance.cfg.content
     };
-           
+    
+    jQuery(_instance.wrapper).show();   
+    
     _instance.jqxhr = jQuery.ajax({
       type: 'POST',       
@@ -285 +287 @@
           _instance.setStatus(_instance.statusArea,'', 'wl_message', false);
           jQuery(_instance.wrapper).find('.wl_pager_content').html(res);
-          jQuery(_instance.wrapper).show(); 
       }
     });

welocally-places/trunk/resources/javascripts/wl_placemgr.js

@@ -84 +84 @@
 WELOCALLY_PlaceManager.prototype.setPlaceRow = function(i, place, row) {
     
-    jQuery(this.wrapper).find('#wl_placesmgr_searchterm').show();
-    
-    
-    var placeRowContent = jQuery('<div></div>');    
-    jQuery(placeRowContent).append('<div class="wl_placemgr_place_tag">[welocally id="'+place._id+'" /]</div>');    
-    
-    var placeInfo = jQuery('<div class="wl_placemgr_place_info"></div>');
-
-    jQuery(placeInfo).append('<div class="place_field">'+place.properties.name+'</div>');
-    jQuery(placeInfo).append('<div class="place_field">'+place.properties.address+'</div>');
-    jQuery(placeInfo).append('<div class="place_field">'+place.properties.city+'</div>');
-    jQuery(placeInfo).append('<div class="place_field">'+place.properties.province+'</div>');
-    jQuery(placeInfo).append('<div class="place_field">'+place.properties.postcode+'</div>');
-    if(place.properties.website)
-        jQuery(placeInfo).append('<div class="place_field">'+place.properties.website+'</div>');
-    if(place.properties.phone)
-        jQuery(placeInfo).append('<div class="place_field">'+place.properties.phone+'</div>');
-    jQuery(placeRowContent).append(placeInfo);
-    
-    var actions = jQuery('<div class="wl_placemgr_actions"></div>');
-    var btnEdit = jQuery('<a class="wl_placemgr_button" href="#">edit</a>');
-    jQuery(btnEdit).bind('click',{instance: this, place: place, index: i, row: row}, this.editHandler);
-
-    var btnDelete = jQuery('<a class="wl_placemgr_button" href="#">delete</a>');
-    
-    jQuery(btnDelete).bind('click',{instance: this, place: place, index: i, row: row}, this.deleteDialogHandler);
-    
-    jQuery(actions).append(btnEdit);
-    jQuery(actions).append(btnDelete);      
-    jQuery(placeRowContent).append(actions);
-        
-    jQuery(row).html(placeRowContent);
+    if(place){
+        jQuery(this.wrapper).find('#wl_placesmgr_searchterm').show();
+        
+        
+        var placeRowContent = jQuery('<div></div>');    
+        jQuery(placeRowContent).append('<div class="wl_placemgr_place_tag">[welocally id="'+place._id+'" /]</div>');    
+        
+        var placeInfo = jQuery('<div class="wl_placemgr_place_info"></div>');
+
+        jQuery(placeInfo).append('<div class="place_field">'+place.properties.name+'</div>');
+        jQuery(placeInfo).append('<div class="place_field">'+place.properties.address+'</div>');
+        jQuery(placeInfo).append('<div class="place_field">'+place.properties.city+'</div>');
+        jQuery(placeInfo).append('<div class="place_field">'+place.properties.province+'</div>');
+        jQuery(placeInfo).append('<div class="place_field">'+place.properties.postcode+'</div>');
+        if(place.properties.website)
+            jQuery(placeInfo).append('<div class="place_field">'+place.properties.website+'</div>');
+        if(place.properties.phone)
+            jQuery(placeInfo).append('<div class="place_field">'+place.properties.phone+'</div>');
+        jQuery(placeRowContent).append(placeInfo);
+        
+        var actions = jQuery('<div class="wl_placemgr_actions"></div>');
+        var btnEdit = jQuery('<a class="wl_placemgr_button" href="#">edit</a>');
+        jQuery(btnEdit).bind('click',{instance: this, place: place, index: i, row: row}, this.editHandler);
+
+        var btnDelete = jQuery('<a class="wl_placemgr_button" href="#">delete</a>');
+        
+        jQuery(btnDelete).bind('click',{instance: this, place: place, index: i, row: row}, this.deleteDialogHandler);
+        
+        jQuery(actions).append(btnEdit);
+        jQuery(actions).append(btnDelete);      
+        jQuery(placeRowContent).append(actions);
+            
+        jQuery(row).html(placeRowContent);
+    } else {
+        
+        jQuery(this.wrapper).find('#wl_placesmgr_searchterm').show();
+        
+        
+        var placeRowContent = jQuery('<div></div>');    
+        
+        var placeInfo = jQuery('<div class="wl_placemgr_place_info">PLACE EMPTY PLEASE DELETE AND ADD A NEW ONE</div>');
+        jQuery(placeRowContent).append(placeInfo);
+        
+        var actions = jQuery('<div class="wl_placemgr_actions"></div>');
+        var btnDelete = jQuery('<a class="wl_placemgr_button" href="#">delete</a>');
+        
+        jQuery(btnDelete).bind('click',{instance: this, place: place, index: i, row: row}, this.deleteDialogHandler);
+        
+        jQuery(actions).append(btnDelete);      
+        jQuery(placeRowContent).append(actions);
+            
+        jQuery(row).html(placeRowContent);
+    }
+    
 };
 
@@ -192 +214 @@
             event.data, 
             _instance.deleteHandler);
-    jQuery( _instance.deleteDialog).html('Please confirm that you would like to delete '+
-            event.data.place.properties.name+' at '+event.data.place.properties.address+
-            '. <strong>This action can not be undone.</strong> You will also need to delete the tag from your post.');
+    var title = 'Delete Place?';
+    if(event.data.place) {
+        jQuery( _instance.deleteDialog).html('Please confirm that you would like to delete '+
+                event.data.place.properties.name+' at '+event.data.place.properties.address+
+                '. <strong>This action can not be undone.</strong> You will also need to delete the tag from your post.');
+        title = 'Delete '+event.data.place.properties.name+'?'
+    } else {
+        jQuery( _instance.deleteDialog).html('The place is missing from this record, you should go ahead and delete it and add a new place');
+    }
+    
     jQuery( _instance.deleteDialog).dialog({
         resizable: false,
-        title: 'Delete '+event.data.place.properties.name+'?',
+        title: title,
         width: 400,
         height:200,
@@ -224 +253 @@
     var data = {
             action: 'delete_place',
-            id: event.data.index,
-            wl_id: event.data.place._id
+            id: event.data.index
     };
            

welocally-places/trunk/resources/stylesheets/ie/wl_places_admin.css

@@ -5 +5 @@
 text-transform:uppercase}
 
-.form-table {  
+.wl-form-table {  
     border-collapse: separate;
     -webkit-border-radius: 4px;
@@ -24 +24 @@
 }
 
-#action_bar {  width:100%; text-align:right; }
+#wl_action_bar {  width:100%; text-align:right; }
+#wl_info_bar {  width:95%;  text-align:center; padding:10px; }
  
 #btn_support a{ 

welocally-places/trunk/resources/stylesheets/wl_places_admin.css

@@ -7 +7 @@
 text-transform:uppercase}
 
-.form-table {  
+.wl-form-table {  
     border-collapse: separate;
     -webkit-border-radius: 4px;
@@ -16 +16 @@
     border: 1px solid #034D96; 
     background: #DFEFF2; padding: 5px; } 
-        
+    
+table.wl-form-table tr  > td {
+    padding-bottom: 1.2em;
+}
+    
+table.wl-form-table tr  > th {
+    vertical-align: top;
+    text-align: right;
+    padding-right: 5px;
+    width: 250px;
+}
+    
+            
 .rollover {
     display: inline-block;
@@ -26 +38 @@
 }
 
-#action_bar {  width:100%; text-align:right; }
+#wl_action_bar {  width:100%; text-align:right; }
+#wl_info_bar {  width:95%;  text-align:center; padding:10px; }
  
 #btn_support a{ 
@@ -166 +179 @@
 text-transform:uppercase}
 
-.form-table {  
-    border-collapse: separate;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    padding: 4px;
-    width:98%; margin-bottom:10px;  
-    border: 1px solid #034D96; 
-    background: #DFEFF2; padding: 5px; } 
         
 .rollover {
@@ -185 +189 @@
 }
 
-#action_bar {  width:100%; text-align:right; }
- 
+
 #btn_support a{ 
 width: 80px; height: 30px; 

welocally-places/trunk/template-tags.php

@@ -19 +19 @@
         $wlPlaces->saveOptions($options);
         
-        //update places
-        if ( array_key_exists( 'update_places', $options )) {
-            update_places();
-        }
     }
     
@@ -83 +79 @@
     
     
-    function update_places(){
-        global $wlPlaces;
-        $cat_ID = $wlPlaces->placeCategory();       
-        $places_in_category_posts = $wlPlaces->getPlacePostsInCategory($cat_ID, null);
-        
-        $index = 0;
-        foreach( $places_in_category_posts as $post ) { 
-            
-            
-            $placeJsonRaw = str_replace(
-                        "\'", "", 
-                        get_post_meta( $post->ID, '_PlaceSelected', true ));        
-                                            
-            $placeJson = 
-                json_decode($placeJsonRaw, true); 
-            
-            $pname = str_replace("\\'", "'", $placeJson{'name'});
-            
-            if($pname != null){
-                $newPlaceJson = convert_legacy_place($placeJsonRaw);
-                update_post_meta( $post->ID, '_PlaceSelected',  $newPlaceJson);
-            }
-                    
-        }       
-        
-    }
+
     
     /**
@@ -235 +206 @@
         return $wlPlaces->getPlacePostsInCategory($categoryId, 'post');
     }
-    
-    
-    /*function get_places_for_category($categoryId){
-        global $wlPlaces;
-        $options = $wlPlaces->getOptions();
-        $result = array();
-        $places_in_category_posts = $wlPlaces->getPlacePostsInCategory($categoryId, 'post');
-        foreach( $places_in_category_posts as $post ){
-            $places = get_post_places($post->ID);  
-            foreach ($places as $place){
-                if($options['infobox_title_link']=='on'){
-                    $place->properties->titlelink=get_permalink( $post->ID ) ;  
-                }                           
-                array_push($result, $place);
-            }
-        }       
-        return json_encode($result);        
-    }*/
-    
-        
+            
     function get_legacy_place_by_post_id( $postId = null) {
         global $wpdb;
@@ -289 +241 @@
     }
     
-    
-    /*function wl_get_post_excerpt( $postId = null) {
-        global $wpdb;
-        
-        $query = "
-            SELECT $wpdb->posts.*
-                FROM $wpdb->posts 
-            WHERE $wpdb->posts.post_status = 'publish'
-            AND $wpdb->posts.ID = $postId
-            GROUP BY $wpdb->posts.ID LIMIT 1";
-            
-        $queryResult = $wpdb->get_results($query, OBJECT);
-        
-        $excerpt = wl_trim_excerpt($queryResult[0]->post_content, $queryResult[0]->post_excerpt);   
-        $excerpt = WelocallyPlaces_Tag::searchAndReplace($excerpt, create_function('$tag,$tag_str', 'return "";'));
-        $excerpt = str_replace( '\'', '', $excerpt );
-        $excerpt = trim( preg_replace( '/\s+/', ' ', $excerpt ) );
-        
-        return $excerpt;
-    }*/
-    
-    /*function wl_trim_excerpt($text, $excerpt)
-    {
-        if ($excerpt) return $excerpt;
-    
-        $text = strip_shortcodes( $text );
-    
-        $text = str_replace(']]>', ']]>', $text);
-        $text = strip_tags($text);
-        $excerpt_length = apply_filters('excerpt_length', 55);
-        $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
-        $words = preg_split("/[\n\r\t ]+/", $text, $excerpt_length + 1, PREG_SPLIT_NO_EMPTY);
-        if ( count($words) > $excerpt_length ) {
-                array_pop($words);
-                $text = implode(' ', $words);
-                $text = $text . $excerpt_more;
-        } else {
-                $text = implode(' ', $words);
-        }
-    
-        return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
-    }*/
-    
     function places_get_mapview_link( ) {
         global $wlPlaces;

welocally-places/trunk/views/category-map-content-template.php

@@ -5 +5 @@
  <div class="wl_category_container_tag"> 
     <div id="wl_category_map">
-      <script type="text/javascript">
-//<![CDATA[
-        
-        var placeSelected = new WELOCALLY_PlaceWidget({hidePlaceSectionMap: true}).init();
-        var cfg = { 
-                id:'multi_<?php echo $t->uid; ?>',
-                hideDistance: true,                 
-                <?php if($options['show_letters_tag']=='on'):?> showLetters: true,<?php else: ?>showLetters: false,<?php endif;?>
-                <?php if(!empty($options['tag_selection_style'])):?> overrideSelectableStyle:<?php echo('\''.$options['tag_selection_style'].'\''.',');?><?php else: ?>overrideSelectableStyle: 'margin: 3px; padding: 2px; float: left; width: 150px; height: 60px;',<?php endif;?>
-                imagePath:'<?php echo($marker_image_path); ?>',
-                endpoint:'<?php echo($endpoint); ?>',
-                <?php if($options['show_selection_tag']=='on'):?>showSelection: true,<?php else: ?>showSelection: false,<?php endif;?>
-                observers:[placeSelected],
-                <?php if(isset($custom_style)):?> styles:<?php echo($custom_style.','); endif;?>
-                places: <?php echo json_encode($t->places); ?>
-        };
-        var placesMulti = 
-              new WELOCALLY_PlacesMultiWidget(cfg)
-                .init();
-        
-        //now register the display for the place
-        placeSelected.initCfg(cfg);
-        placesMulti.getSelectedArea().append(placeSelected.makeWrapper());         
-     
-      //]]>
-      </script>
+<script type="text/javascript">
+var placeSelected = new WELOCALLY_PlaceWidget({hidePlaceSectionMap: true}).init();
+var cfg = { 
+        id:'multi_<?php echo $t->uid; ?>',
+        hideDistance: true,                 
+        <?php if($options['show_letters_tag']=='on'):?> showLetters: true,<?php else: ?>showLetters: false,<?php endif;?>
+        <?php if(!empty($options['tag_selection_style'])):?> overrideSelectableStyle:<?php echo('\''.$options['tag_selection_style'].'\''.',');?><?php else: ?>overrideSelectableStyle: 'margin: 3px; padding: 2px; float: left; width: 150px; height: 60px;',<?php endif;?>
+        imagePath:'<?php echo($marker_image_path); ?>',
+        endpoint:'<?php echo($endpoint); ?>',
+        <?php if($options['show_selection_tag']=='on'):?>showSelection: true,<?php else: ?>showSelection: false,<?php endif;?>
+        observers:[placeSelected],
+        <?php if(isset($custom_style)):?> styles:<?php echo($custom_style.','); endif;?>
+        places: <?php echo json_encode($t->places); ?>
+    };
+    var placesMulti = 
+          new WELOCALLY_PlacesMultiWidget(cfg)
+            .init();
+    placeSelected.initCfg(cfg);
+    placesMulti.getSelectedArea().append(placeSelected.makeWrapper());         
+</script>
     </div>
   </div>

welocally-places/trunk/views/place-content-template.php

@@ -20 +20 @@
 
 ?>
-
-<script type="text/javascript">
-jQuery(document).ready(function() { 
-    
-
-});
-</script>
-
 <div id="wl-place-content-<?php echo $t->uid; ?>" class="wl-place-content">
     <div class="template-wrapper">
         <div>
-        <script type="text/javascript" charset="utf-8">
-        var place<?php echo $t->uid; ?> = <?php echo $t->placeJSON; ?>;
-        var cfg = { 
-            id:  place<?php echo $t->uid; ?>._id, 
-            imagePath:'<?php echo($marker_image_path); ?>', 
-            endpoint:'<?php echo($endpoint); ?>', 
-            <?php if(isset($custom_style)):?> styles:<?php echo($custom_style.','); endif;?>
-            showShare: false,
-            placehoundPath: 'http://placehound.com'
-        };
-                        
-        var placeWidget<?php echo $t->uid; ?> = 
-              new WELOCALLY_PlaceWidget(cfg)
-                .init();
-        
-        placeWidget<?php echo $t->uid; ?>.load(place<?php echo $t->uid; ?>);     
-        
-        </script>
+<script type="text/javascript" charset="utf-8">
+var place<?php echo $t->uid; ?> = <?php echo $t->placeJSON; ?>;
+var cfg = { 
+    id:  place<?php echo $t->uid; ?>._id, 
+    imagePath:'<?php echo($marker_image_path); ?>', 
+    endpoint:'<?php echo($endpoint); ?>', 
+    <?php if(isset($custom_style)):?> styles:<?php echo($custom_style.','); endif;?>
+    showShare: false,
+    placehoundPath: 'http://placehound.com'
+};
+var placeWidget<?php echo $t->uid; ?> = 
+      new WELOCALLY_PlaceWidget(cfg)
+        .init();
+placeWidget<?php echo $t->uid; ?>.load(place<?php echo $t->uid; ?>);            
+</script>
         </div>
     </div>

welocally-places/trunk/views/welocally-places-map-widget-display.php

@@ -6 +6 @@
  <div class="wl_category_container_widget">  
     <div id="main">
-      <script type="text/javascript">
-//<![CDATA[
-                
-        var placeSelected = new WELOCALLY_PlaceWidget({hidePlaceSectionMap: true}).init();
-        var cfg = { 
-                id:'multi_<?php echo $t->uid; ?>',  
-                <?php if($options['show_letters']=='on'):?> showLetters: true,<?php else: ?>showLetters: false,<?php endif;?>
-                <?php if(!empty($options['widget_selection_style'])):?> overrideSelectableStyle:<?php echo('\''.$options['widget_selection_style'].'\''.',');?><?php else: ?>overrideSelectableStyle: 'width:98%;',<?php endif;?>
-                imagePath:'<?php echo($marker_image_path); ?>',
-                endpoint:'<?php echo($endpoint); ?>',
-                <?php if($options['show_selection']=='on'):?>showSelection: true,<?php else: ?>showSelection: false,<?php endif;?>
-                observers:[placeSelected],
-                <?php if(isset($custom_style)):?> styles:<?php echo($custom_style.','); endif;?>
-                places: <?php echo json_encode($t->places); ?>
-        };
-        
-        var placesMulti = 
-              new WELOCALLY_PlacesMultiWidget(cfg)
-                .init();
-        
-        //now register the display for the place
-        placeSelected.initCfg(cfg);
-        placesMulti.getSelectedArea().append(placeSelected.makeWrapper());           
-     
-      //]]>
-      </script>
+<script type="text/javascript"> 
+var placeSelected = new WELOCALLY_PlaceWidget({hidePlaceSectionMap: true}).init();
+var cfg = { 
+        id:'multi_<?php echo $t->uid; ?>',  
+        <?php if($options['show_letters']=='on'):?> showLetters: true,<?php else: ?>showLetters: false,<?php endif;?>
+        <?php if(!empty($options['widget_selection_style'])):?> overrideSelectableStyle:<?php echo('\''.$options['widget_selection_style'].'\''.',');?><?php else: ?>overrideSelectableStyle: 'width:98%;',<?php endif;?>
+        imagePath:'<?php echo($marker_image_path); ?>',
+        endpoint:'<?php echo($endpoint); ?>',
+        <?php if($options['show_selection']=='on'):?>showSelection: true,<?php else: ?>showSelection: false,<?php endif;?>
+        observers:[placeSelected],
+        <?php if(isset($custom_style)):?> styles:<?php echo($custom_style.','); endif;?>
+        places: <?php echo json_encode($t->places); ?>
+    };      
+    var placesMulti = 
+          new WELOCALLY_PlacesMultiWidget(cfg)
+            .init();
+    placeSelected.initCfg(cfg);
+    placesMulti.getSelectedArea().append(placeSelected.makeWrapper());           
+</script>
     </div>
   </div>

welocally-places/trunk/welocally-places-map-widget.class.php

@@ -25 +25 @@
             }
         
+        
+            /**
+             * needs to be refactored
+             * 
+             */
             function widget( $args, $instance ) {
-                global $wp_query,$wlPlaces;
+                
+                global $wlPlaces;
                 $options = $wlPlaces->getOptions();
                 extract( $args );
 
-                /* User-selected settings. */
-                $title = $instance['title'];
-                $limit = $instance['limit'];
+    
+                $post_type = $options['widget_post_type'];                  
                 
-                if( function_exists( 'get_places' ) ) {
-                    $old_display = $wp_query->get('placeMapDisplay');
-                    $wp_query->set('placeMapDisplay', 'places');
-                    $posts = get_places($limit, null, null);
-                }
+                $cat = $wlPlaces->placeCategory();
                 
-                if( $posts ) {
-                    /* Display list of places. */
-                        if( function_exists( 'get_places' ) ) {
-                            //$templateLoc = apply_filters('map_widget_template','');
-                            //view
-                            //include( $templateLoc );
-                            
-                            $currentCat = get_query_var( 'cat' );
-                            
-                            if(!$currentCat){
-                                $currentCat = $wlPlaces->placeCategory();
+                $cat_var = get_query_var('cat');
+                
+                
+                if (!empty($cat_var) && !(is_home() || is_front_page())) {          
+                    $cat = get_category(intval($cat_var));
+                }                   
+                elseif (isset($post) && !(is_home() || is_front_page())){
+                    //try to get category for post if possible
+                    $post_categories = wp_get_post_categories( $post->ID );
+                    if($post_categories){       
+                        foreach ($post_categories as $postCatId) {
+                            $catObj = get_category( $postCatId );
+                            if($catObj->name != 'Uncategorized' && $catObj->name != 'Place'){
+                                $cat = $postCatId;
                             }
-                            echo($wlPlaces->getCategoryMapMarkup(
-                                $currentCat, 
-                                dirname( __FILE__ ).'/views/welocally-places-map-widget-display.php',
-                                true));
-                            
-                            
-                            
-                            $wp_query->set('placeMapDisplay', $old_display);
                         }
+                    }
+                }               
                     
-                        
-                } else if( !$posts ) _e('There are no places.', $this->pluginDomain);
-
+                
+                if(!isset($post_type))
+                    $post_type = 'post';
+    
+                //add support for custom post type
+                echo $wlPlaces->getCategoryMapMarkup(
+                    $cat, 
+                    dirname( __FILE__ ).'/views/welocally-places-map-widget-display.php',
+                    true, 
+                    25, 
+                    $post_type);    
                 
             }   
         
             function update( $new_instance, $old_instance ) {
-                    $instance = $old_instance;
-
-                    /* Strip tags (if needed) and update the widget settings. */
-                    $instance['title'] = strip_tags( $new_instance['title'] );                  
-                    $instance['limit'] = strip_tags( $new_instance['limit'] );
-                    /*if(eval($instance['limit'])>25)
-                        $instance['limit'] = '25';*/
-                    
-
+                    $instance = $old_instance;                  
                     return $instance;
             }
@@ -83 +81 @@
             function form( $instance ) {
                 /* Set up default widget settings. */
-                $defaults = array( 'style'=>'aside', 'title' => 'Published Places', 'limit' => '25');
+                $defaults = array( 'style'=>'aside', 'title' => 'Published Places', 'limit' => '25', 'post_type'=>'post');
                 $instance = wp_parse_args( (array) $instance, $defaults );          
                 include( dirname( __FILE__ ) . '/views/welocally-places-map-widget-admin.php' );

welocally-places/trunk/welocally-places-tag-processor.class.php

@@ -7 +7 @@
         }
         
-        private function queryPlace($tag) {
-            if (!$tag->id)
-                return false;
-                
-//            $response = json_decode($json_response);
-//            return $response[0];
-        }
-        
         public function processTag($tag, $postId=0) {
             
@@ -20 +12 @@
             global $wlPlaces;
             
-            
-            if (!$tag->id || $tag->type != 'post')
-                return false;
-                
             $postId = intval($postId);
             
             $place = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}wl_places WHERE wl_id = %s", $tag->id));
             
-                      
-            if ($place == null) {
-                $place_info = $this->queryPlace($tag);
-
-                if ($wpdb->insert("{$wpdb->prefix}wl_places", array('wl_id' => $tag->id,
-                                                                    'place' => json_encode($place_info))) ) {
-                                                                        
-                    $place = $wpdb->get_row( 
-                        $wpdb->prepare("SELECT * FROM {$wpdb->prefix}wl_places WHERE wl_id = %s", $tag->id) );
-                }
-                
-            }
-            
-            if (!$place)
-                return false;
-            
-            if ($postId) {
+            if ($place && $postId) {
                 $wpdb->insert("{$wpdb->prefix}wl_places_posts", array('place_id' => $place->id,
                                                                       'post_id' => $postId));
-                //make sure its categorized as place no matter what 
+                
+                //make sure its categorized as place no matter what 
                 $postCategories = wp_get_post_categories($postId);                                                      
                 $customCategories = array(); 
@@ -61 +34 @@
                 $newCategories = array_merge($postCategories, $customCategories);
                 wp_set_post_categories($postId, $newCategories);
-                
-                update_post_meta($this->postId, '_isWLPlace', true);
-                
-                // delete post metadata from previous versions of the plugin
-                delete_post_meta($postId, '_PlaceSelected');
-                delete_post_meta($postId, '_WLPlaces');
-            } else {
-                
-            }
             
-            return $place;
-
+            } 
+            
+            
+            
         }
         

welocally-places/trunk/welocally-places.class.php

@@ -9 +9 @@
     class WelocallyPlaces {
         
-        const VERSION               = '1.2.21';
+        const VERSION               = '1.2.22';
         const DB_VERSION            = '2.0';
         const WLERROROPT            = '_welocally_errors';
@@ -24 +24 @@
         public $pluginUrl;
         public $pluginDomain = 'welocallyPlaces';
-        
-        public $metaTags = array(
-                    '_isWLPlace',
-                    '_PlaceSelected',
-                    '_ShowPlaceAddress',
-                    self::WLERROROPT
-                    );
-        
         
         /**
@@ -62 +54 @@
             add_action( 'admin_enqueue_scripts',        array( $this, 'loadAdminDomainStylesScripts' ) );
             add_action( 'admin_menu',       array( $this, 'addPlaceBox' ) );
-            add_action( 'save_post',        array( $this, 'tagHandling'));
+            add_action( 'save_post',        array( $this, 'handlePublish'));
             
             add_action( 'sp_places_post_errors', array( 'WLPLACES_Post_Exception', 'displayMessage' ) );
             add_action( 'sp_places_options_top', array( 'WLPLACES_Options_Exception', 'displayMessage') );
 
-            add_filter( 'the_content', array( $this, 'replaceTagsInContent') );
+            add_shortcode('welocally', array ($this,'handleWelocallyPlacesShortcode'));
            
-            
-                       
+                           
         }
         
@@ -80 +71 @@
         function wl_admin_message($message='empty message', $error = false) {
             echo '<div class="updated fade"><p>'.$message.'</p></div>';
-
-        }
-        
-                
+        }
+                        
         /**
          * @return 
          */
-        public function in_category() {
-            
+        public function in_category() {         
             $cat_id = get_query_var( 'cat' );
             
@@ -94 +82 @@
                 return true;
             }
-
         }
         
@@ -129 +116 @@
             wp_enqueue_script( 'jquery' ); 
             wp_enqueue_script('jquery-ui-all' , 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js');
-                                
-                    
-            //jquery ui
-            wp_register_style( 'jquery-ui-style', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css' );
-            wp_enqueue_style( 'jquery-ui-style' );  
-            
+                                                    
             //welocally
             wp_enqueue_script('wl_base_script', WP_PLUGIN_URL.'/welocally-places/resources/javascripts/wl_base.js', array('jquery'), WelocallyPlaces::VERSION);
@@ -176 +158 @@
             wp_enqueue_script('jquery-ui-all' , 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js');
                                                     
-            //jquery ui
-            wp_register_style( 'jquery-ui-style', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css' );
-            wp_enqueue_style( 'jquery-ui-style' );  
-            
-                                    
+                                                
             wp_enqueue_script('media-upload');
             wp_enqueue_script('thickbox');
@@ -192 +170 @@
             //add places
             wp_enqueue_style( 'wl_places_addplace_style',WP_PLUGIN_URL.'/welocally-places/resources/stylesheets/wl_places_addplace.css',array(), WelocallyPlaces::VERSION, 'screen' );  
-            
-            
+                        
             global $wp_styles;
         
@@ -218 +195 @@
             
         }
+        
+        public function handleWelocallyPlacesShortcode($attrs,$content = null) {
+            
+            global $post;
+            
+            extract(shortcode_atts(array (
+                'categories' => null,
+                'category' => null,
+                'id' => null,
+                'post_type'=> null              
+            ), $attrs));            
+            
+            //strip paragragh tags if exists this is required
+            if ( '</p>' == substr( $content, 0, 4 )
+            and '<p>' == substr( $content, strlen( $content ) - 3 ) )
+                $content = substr( $content, 4, strlen( $content ) - 7 );
+            
+            //template for javscript
+            $t = new StdClass();
+            $t->uid = uniqid();
+            
+            if(!empty($id)) {
+                //this is a place
+                $t->wl_id = $id;
+                
+                $this->processPlaceTag($t, $post->ID);
+                
+                if(isset($t->place)){
+                    ob_start();
+                    include(dirname(__FILE__) . '/views/place-content-template.php');
+                    $resultContent = ob_get_contents();
+                    ob_end_clean();                     
+                    $t = null;                
+                    return $resultContent;                      
+                } else {
+                    return false;
+                }                   
+            }
+            
+            //right now only one is supported
+            $catsSlug = array();                        
+            if(!empty($categories)) 
+                $catsSlug = explode(",", $categories);
+            else if(!empty($category))
+                $catsSlug = explode(",", $category);
+                
+            $string = preg_replace('/&(?!amp;)/', '&amp;', $catsSlug[0]);
+            $string = preg_replace('/#038;/', '', $string);
+        
+            $term = get_term_by('name',$string,'category');
+            if(!isset($post_type))
+                $post_type = 'post';
+
+            return $this->getCategoryMapMarkup($term->term_id, null, null, 25, $post_type);     
+
+        }
+        
+        
+        public function processPlaceTag($tag, $postId=0) {
+            
+            global $wpdb;
+            global $wlPlaces;
+                       
+            if (!$tag->wl_id)
+                return false;
+                
+            $postId = intval($postId);
+            
+            $place = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}wl_places WHERE wl_id = %s", $tag->wl_id));
+            
+            //there is a problem
+            if (!$place)
+                return false;
+            else {
+                $tag->place = $place;
+                $tag->placeJSON = $place->place;
+                
+            }
+            
+            return $place;
+
+        }
         
         public function makeUniqueGoogleFontList($fontList){
@@ -253 +312 @@
         
         /**
-         * Creates the category and sets up the theme resource folder with sample config files. Calls updateMapPostMeta().
+         * Creates the category and sets up the theme resource folder with sample 
+         * config files. Calls updateMapPostMeta(). Does all the hard work of figuring out
+         * what the database should look like.
          * 
          * @return void
@@ -263 +324 @@
             $firstTime = $now - ($now % 66400);
             $this->create_category_if_not_exists( );
-            
-            // create places table
-            $db_version = get_option('Welocally_DBVersion');
-            
-            if ($db_version != self::DB_VERSION) {
-                require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+                        
+            
+            //never created before
+            if (!$this->tableExists($wpdb->prefix.'wl_places')) {
+                require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
                 
                 $sql = "CREATE TABLE {$wpdb->prefix}wl_places (
                     id INT PRIMARY KEY AUTO_INCREMENT,
                     wl_id VARCHAR(255) NOT NULL,
-                    place TEXT NULL,
+                    place TEXT NULL, " .
+                    "likes INT NULL DEFAULT 0, ".
+                    "lat DOUBLE NULL, " .
+                    "lng DOUBLE NULL,
                     created DATETIME NOT NULL
                 );";
-                dbDelta($sql);
-
+                dbDelta($sql);              
+            }
+            
+            if (!$this->tableExists($wpdb->prefix.'wl_places_posts')) {
+                require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+                
                 $sql = "CREATE TABLE {$wpdb->prefix}wl_places_posts (
                     id INT PRIMARY KEY AUTO_INCREMENT,
@@ -284 +351 @@
                     created DATETIME NOT NULL
                 );";
-                dbDelta($sql);
-            }
-            
-            update_option('Welocally_DBVersion', self::DB_VERSION);
-            
-            
+                dbDelta($sql);          
+            }
+            
+            //version 1.2.21 and earler had places table but not geo
+            if (!$this->columnExists($wpdb->prefix.'wl_places', 'likes')) {
+                
+                $sql = "ALTER TABLE {$wpdb->prefix}wl_places ".
+                    "ADD COLUMN likes INT NULL DEFAULT 0 AFTER place";
+
+                $wpdb->query($sql);                
+            }
+            
+            $upgrade_g1 = false;
+            if (!$this->columnExists($wpdb->prefix.'wl_places', 'lat')) {
+                $upgrade_g1 = true;
+                
+                $sql = "ALTER TABLE {$wpdb->prefix}wl_places " .
+                        "ADD COLUMN lat DOUBLE NULL AFTER likes";
+                $wpdb->query($sql);     
+            }
+        
+            if (!$this->columnExists($wpdb->prefix.'wl_places', 'lng')) {
+                                
+                $upgrade_g1 = true;
+                
+                $sql = "ALTER TABLE {$wpdb->prefix}wl_places " .
+                        "ADD COLUMN lng DOUBLE NULL AFTER lat";
+                
+                $wpdb->query($sql);
+            }
+            
+            //put the latlng for all the places in the table
+            if(true){
+                $query = "SELECT id,place FROM {$wpdb->prefix}wl_places";
+                $results = $wpdb->get_results($query, ARRAY_A);
+                $count = count($results);
+                for ($i = 0; $i < $count; $i++) {
+                    $row = $results[$i];
+                    $place = json_decode($row['place']);
+                    
+                    $lat = $place->geometry->coordinates[1];
+                    $lng = $place->geometry->coordinates[0];
+                    
+                    //update row
+                    $wpdb->update( 
+                        $wpdb->prefix.'wl_places', 
+                        array( 
+                            'lat' => $lat,  // float
+                            'lng' => $lng   // float 
+                        ), 
+                        array( 'id' => $row['id'] ), 
+                        array( 
+                            '%s',   // value1
+                            '%s'    // value2
+                        ), 
+                        array( '%d' ) 
+                    );
+                                        
+                }
+            }
+                            
+        }
+        
+        //checks all schema changes and makes sure all is ok.
+        public function databaseRequirementsMissing(){
+            global $wpdb;
+            $reqs = array();
+            if(!$this->tableExists($wpdb->prefix.'wl_places'))
+                array_push($reqs,'table missing '.$wpdb->prefix.'wl_places');
+            if(!$this->tableExists($wpdb->prefix.'wl_places_posts'))
+                array_push($reqs,'table missing '.$wpdb->prefix.'wl_places_posts');
+            if(!$this->columnExists($wpdb->prefix.'wl_places', 'likes'))
+                array_push($reqs,'column missing '.$wpdb->prefix.'wl_places.likes');
+            if(!$this->columnExists($wpdb->prefix.'wl_places', 'lat'))
+                array_push($reqs,'column missing '.$wpdb->prefix.'wl_places.lat');
+            if(!$this->columnExists($wpdb->prefix.'wl_places', 'lng'))
+                array_push($reqs,'column missing '.$wpdb->prefix.'wl_places.lng');
+                
+
+            return $reqs;
+                        
+        }
+        
+        function showTables() {
+            global $wpdb;
+            $return = $wpdb->get_results("show tables", ARRAY_A);
+            foreach ( $return as $row ) {
+                echo("<div><pre>");
+                echo($row["Tables_in_wordpress"]);  
+                echo("</pre></div>");    
+            }
+            return $return;
+        }
+        
+        function describeTable($table_name) {
+            global $wpdb;
+            $return = $wpdb->get_results(sprintf("describe %s",$table_name), ARRAY_A);
+            foreach ( $return as $row ) {
+                echo("<div><pre>");
+                echo($row["Field"]);
+                echo("\t");  
+                echo($row["Type"]); 
+                echo("</pre></div>");    
+            }
+            return $return;
+        }
+        
+        public function tableExists($tableName){
+            global $wpdb;
+            $query = sprintf("SHOW TABLES LIKE '%s' ",$tableName);
+            $result = $wpdb->get_var( $wpdb->prepare( $query ) );
+            
+            if($result == $tableName){
+                return true;
+            } else {
+                return false;
+            }
+        }
+        
+        public function columnExists($tableName, $columnName){
+
+            global $wpdb;
+            $query = sprintf("SHOW COLUMNS FROM %s LIKE '%s'",$tableName, $columnName);
+            $result = $wpdb->get_var( $wpdb->prepare( $query ) );
+            if($result == $columnName){
+                return true;
+            } else {
+                return false;
+            }
         }
 
@@ -320 +510 @@
         public function addPlaceMetaBox() {
             global $post;
-            
-            $options = '';
-            $style = '';
-            $postId = $post->ID;
-            foreach ( $this->metaTags as $tag ) {
-                if ( $postId ) {
-                    $$tag = get_post_meta( $postId, $tag, true );
-                } else {
-                    $$tag = '';
-                }
-            }
-            
-            $isWLPlace = get_post_meta( $postId, '_isWLPlace', true );
-            $ShowPlaceAddress = get_post_meta( $postId, '_ShowPlaceAddress', true );
-            
-            $isPlaceChecked     = ( $isWLPlace == 'true' ) ? 'checked' : '';
-            $isNotPlaceChecked      = ( $isWLPlace == 'false' || $isWLPlace == '' || is_null(  $isWLPlace ) ) ? 'checked' : '';
-            $PlaceSelected = get_post_meta( $postId, '_PlaceSelected', true );
-                        
             include( dirname( __FILE__ ) . '/views/addplace-meta-box.php' );
         }
 
-        public function replaceTagsInContent($content) {
-            return WelocallyPlaces_Tag::searchAndReplace($content, array($this, 'addTagMarkup'));
-        }
-
-        public function addTagMarkup($tag, $str) {
-            switch ($tag->type) {
-                case 'post':
-                default:
-                    /* handle [welocally id="..." /] tags */
-                    if (!$tag->id) return $str;
-
-                    return $this->getPlaceMapMarkup($tag);
-                    break;
-                case 'category':
-                    /* handle [welocally categories="..." /] tag */
-
-                    $categoryIds = array();
-
-                    if (!$tag->categories):
-                        $categoryIds = array(get_query_var('cat')); // fetch category from request
-                    else:
-                        $newcats = array();
-                        //required for special chars
-                        foreach ( $tag->categories as $cat ) {
-
-                            //this seems rediculous to have to do
-                            $string = preg_replace('/&(?!amp;)/', '&amp;', $cat);
-                            $string = preg_replace('/#038;/', '', $string);
-
-                            array_push($categoryIds, get_cat_ID($string));
-                        }                   
-
-                    endif;
-
-                    if (!$categoryIds) return $str;
-
-                    $html = '';
-                    foreach ($categoryIds as $cat)
-                        $html .= $this->getCategoryMapMarkup(
-                            $cat,
-                            dirname(__FILE__) . '/views/category-map-content-template.php',
-                            false,
-                            25
-                            );
-
-                    return $html;
-
-                    break;
-            }
-        }
 
         /**
@@ -402 +523 @@
             global $wpdb;
             static $placecount = 0;
-            
-            //$place = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}wl_places WHERE wl_id = %s", $tag->id));
-            
+                        
             //changing this to join so it actually must be in post places, someone please
             //use your sprintf magic!
@@ -473 +592 @@
             return $result;     
         
-//          $places = $wpdb->get_col($wpdb->prepare("SELECT DISTINCT place FROM {$wpdb->prefix}wl_places p"));
-//          
-//          if ($places) 
-//              return array_map('json_decode', $places);
-            
-        
-        }
-        
-        public function getPlaces($cat=null, $maxElements=25, $filter=true) {
+        }
+        
+        
+        /**
+         * this takes the category name, consider consolidating getplacesnew and this
+         */
+        public function getPlaces($cat=null, $maxElements=25, $filter=true, $post_type='post') {
+            
             
             global $post;           
@@ -494 +612 @@
                 //try to get category for post if possible
                 $post_categories = wp_get_post_categories( $post->ID );
-                if($post_categories){
-        
+                if($post_categories){       
                     foreach ($post_categories as $postCatId) {
                         $catObj = get_category( $postCatId );
@@ -504 +621 @@
                 }
             }
-
-            $posts = $this->getPlacePostsInCategory($cat);
+                    
+            $posts = $this->getPlacePostsInCategory($cat,$post_type);
 
             $t = new StdClass();
@@ -522 +639 @@
 
                 foreach ($post_places as $place) {
+                    
                     
                     //determin if we are filtering
@@ -543 +661 @@
                 }
             }   
-                                
+                    
             return $t;
         }
@@ -553 +671 @@
          */
         public function getCategoryMapMarkup(
-            $cat=null, $template=null, $showIfEmpty=null, $maxElements=25) {
-            
-            
-            $t = $this->getPlaces($cat, $maxElements);      
+            $cat=null, $template=null, $showIfEmpty=null, $maxElements=25, $post_type='post') {
+            
+            
+            $t = $this->getPlaces($cat, $maxElements, true, $post_type);
+                
                     
             //setup options
@@ -583 +702 @@
                 //this is being done so we can show all places if none are found in the cat
                 if($showIfEmpty && ($cat != $this->placeCategory())){
-                    return $this->getCategoryMapMarkup($this->placeCategory(), $template, false);                   
+                    return $this->getCategoryMapMarkup($this->placeCategory(), $template, false, $post_type);                   
                 } else {
                     include(dirname(__FILE__) . '/views/category-map-content-empty.php');
@@ -683 +802 @@
             }
             
-    
-        }
-        
-        public function tagHandling($post_id) {
+        }
+
+        /**
+         * we do this instead of using the shortcode handler because if we didnt
+         * we would have an extra database call on every tag hit
+         */
+        public function handlePublish($post_id) {           
             if (!wp_is_post_revision($post_id)) {
                 $post = get_post($post_id);
@@ -696 +818 @@
             }
         }
+        
         
         
@@ -721 +844 @@
         
             $default_marker_icon = plugins_url() . "/welocally-places/resources/images/marker_all_base.png";
-            $default_update_places = 'off';
             
             $default_show_letters = 'on'; 
@@ -733 +855 @@
             $default_show_selection_tag = 'on';         
             $default_infobox_title_link_tag = 'on'; 
+            
+            $default_widget_post_type = 'post'; 
+                        
                     
             // Set current version level. Because this can be used to detect version changes (and to what extent), this
@@ -745 +870 @@
             if ( !array_key_exists( 'show_selection', $options ) ) { $options[ 'show_selection' ] = $default_show_selection; $changed = true; }
             if ( !array_key_exists( 'infobox_title_link', $options ) ) { $options[ 'infobox_title_link' ] = $default_infobox_title_link; $changed = true; }
+            if ( !array_key_exists( 'widget_post_type', $options ) ) { $options[ 'widget_post_type' ] = $default_widget_post_type; $changed = true; }
                     
             //tag
@@ -944 +1070 @@
             global $wpdb, $wlPlaces;
             $wlPlaces->setOptions();
+            
+            $post_type = explode(",",$post_type);
 
             $post_type_and = '1=1';
@@ -965 +1093 @@
                                     ON $wpdb->posts.ID = {$wpdb->prefix}wl_places_posts.post_id
                                     GROUP BY $wpdb->posts.ID)";
+            
 
             $return = $wpdb->get_results($categories_query, OBJECT);
@@ -971 +1100 @@
         
         public function generatePlaceId($lat,$lng) {
-            //WL_10RyqzlSSjAd gMCImmeXYj_37.801379_-122.263600@1303263345
             $guid = substr(uniqid().uniqid(), 0, 22);
             $parts = explode(" ", microtime());

welocally-places/trunk/welocally-places.php

@@ -2 +2 @@
 
 /*
-Plugin Name: Welocally Places Basic
+Plugin Name: Welocally Places Core
 Plugin URI: http://www.welocally.com/wordpress/?page_id=2
-Description: Great maps that link to your content. The Welocally Places plugin lets easily associate places to your content without manual geocoding. Add any place to your database and link it to your posts and categories with simple shortcodes. The map widget makes it easy for your users to find the places your are writing about on a map and is smart enough to automatically relate places by category.
-Version: 1.2.21
+Description: Great maps that link to your content. The Welocally Places plugin lets easily associate places to your content without manual geocoding. Add any place to your database and link it to your posts and categories with simple shortcodes. The map widget makes it easy for your users to find the places your are writing about on a map and is smart enough to automatically relate places by category. If you are upgrading and an install this manually make sure to re-activate the plugin, activation does important database updates. 
+Version: 1.2.22
 Author: Welocally  
 Author URI: http://welocally.com
@@ -68 +68 @@
 }
 
+/**
+ * consider moving core impl to the class
+ */
 function welocally_save_place() {
     
@@ -82 +85 @@
         $mysqldate = date( 'Y-m-d H:i:s', time() );
         $placeToSave['_id'] = $wlPlaces->generatePlaceId($placeToSave['geometry']['coordinates'][1],$placeToSave['geometry']['coordinates'][0]); 
-    
+                    
             //save to places table
         if ($wpdb->insert("{$wpdb->prefix}wl_places", 
-            array('wl_id' => $placeToSave['_id'], 'place' => json_encode($placeToSave), 'created' =>$mysqldate )) ) {
+            array('wl_id' => $placeToSave['_id'], 'place' => json_encode($placeToSave), 'lat' =>  $placeToSave['geometry']['coordinates'][1], 'lng' =>  $placeToSave['geometry']['coordinates'][0], 'created' =>$mysqldate )) ) {
                 $place = $wpdb->get_row(
                 $wpdb->prepare("SELECT * FROM {$wpdb->prefix}wl_places WHERE wl_id = %s", $placeToSave['_id']) );
@@ -95 +98 @@
         
         $placeId = $placeToSave['_id'];
-        $statement = "UPDATE {$wpdb->prefix}wl_places SET place='".json_encode($placeToSave)."' WHERE wl_id = '".$placeId."'";
+        $placeJSON = addslashes(json_encode($placeToSave));
+        
+        $statement = "UPDATE {$wpdb->prefix}wl_places SET place='".$placeJSON."' WHERE wl_id = '".$placeId."'";
         $wpdb->query($wpdb->prepare($statement));
+        
+        echo '{ "id": "'.$placeToSave['_id'].'"}';
     }   
 
@@ -157 +164 @@
     global $wpdb, $wlPlaces;
 
-    $placeId = $_POST['wl_id'];
+    //$placeId = $_POST['wl_id'];
     $recordId = $_POST['id'];
-    $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}wl_places WHERE wl_id = %s", $placeId));
+    $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}wl_places WHERE id = %d", $recordId));
         
     echo '{ "id":'.$recordId.',"status": "SUCCEED", "action": "DELETE" }';