Changeset 1256026
- Timestamp:
- 09/29/2015 06:36:09 PM (10 years ago)
- Location:
- gps-tracker
- Files:
-
- 10 added
- 1 deleted
- 15 edited
-
tags/1.0.1/public/class-gpstracker.php (modified) (2 diffs)
-
tags/1.0.2/gpstracker.php (modified) (2 diffs)
-
tags/1.0.2/public/class-gpstracker.php (modified) (3 diffs)
-
tags/1.0.2/readme.txt (modified) (3 diffs)
-
trunk/admin/class-gpstracker-admin.php (modified) (1 diff)
-
trunk/gpstracker.php (modified) (3 diffs)
-
trunk/includes/class-gpstracker-gamajo-template-loader.php (modified) (1 diff)
-
trunk/includes/class-gpstracker-setup.php (modified) (1 diff)
-
trunk/includes/class-gpstracker-template-loader.php (modified) (1 diff)
-
trunk/public/assets/js/gpstracker-map.js (modified) (1 diff)
-
trunk/public/assets/js/leaflet-0.7.3 (deleted)
-
trunk/public/assets/js/leaflet-0.7.5 (added)
-
trunk/public/assets/js/leaflet-0.7.5/images (added)
-
trunk/public/assets/js/leaflet-0.7.5/images/layers-2x.png (added)
-
trunk/public/assets/js/leaflet-0.7.5/images/layers.png (added)
-
trunk/public/assets/js/leaflet-0.7.5/images/marker-icon-2x.png (added)
-
trunk/public/assets/js/leaflet-0.7.5/images/marker-icon.png (added)
-
trunk/public/assets/js/leaflet-0.7.5/images/marker-shadow.png (added)
-
trunk/public/assets/js/leaflet-0.7.5/leaflet-src.js (added)
-
trunk/public/assets/js/leaflet-0.7.5/leaflet.css (added)
-
trunk/public/assets/js/leaflet-0.7.5/leaflet.js (added)
-
trunk/public/class-gpstracker.php (modified) (4 diffs)
-
trunk/public/includes/class-gpstracker-ajax.php (modified) (1 diff)
-
trunk/public/includes/class-gpstracker-endpoint.php (modified) (4 diffs)
-
trunk/readme.txt (modified) (4 diffs)
-
trunk/uninstall.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
gps-tracker/tags/1.0.1/public/class-gpstracker.php
r1026546 r1256026 197 197 // wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css', false, '3.2.0', 'all'); 198 198 199 wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7. 3/leaflet.css', __FILE__ ), array(), self::VERSION );199 wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7.5/leaflet.css', __FILE__ ), array(), self::VERSION ); 200 200 wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootswatch/3.2.0/superhero/bootstrap.min.css', false, '3.2.0', 'all'); 201 201 wp_enqueue_style( $this->plugin_slug . '-light-styles', plugins_url( 'assets/css/light.css', __FILE__ ), array(), self::VERSION ); … … 210 210 wp_enqueue_script( $this->plugin_slug . '-google-maps', '//maps.google.com/maps/api/js?v=3&sensor=false&libraries=adsense', array(), self::VERSION ); 211 211 wp_enqueue_script( $this->plugin_slug . '-map-js', plugins_url( 'assets/js/gpstracker-map.js', __FILE__ ), array('jquery'), self::VERSION ); 212 wp_enqueue_script( $this->plugin_slug . '-leaflet-js', plugins_url( 'assets/js/leaflet-0.7. 3/leaflet.js', __FILE__ ), array('jquery'), self::VERSION );212 wp_enqueue_script( $this->plugin_slug . '-leaflet-js', plugins_url( 'assets/js/leaflet-0.7.5/leaflet.js', __FILE__ ), array('jquery'), self::VERSION ); 213 213 wp_enqueue_script( $this->plugin_slug . '-google-js', plugins_url( 'assets/js/leaflet-plugins/google.js', __FILE__ ), array('jquery'), self::VERSION ); 214 214 wp_enqueue_script( $this->plugin_slug . '-bing-js', plugins_url( 'assets/js/leaflet-plugins/bing.js', __FILE__ ), array('jquery'), self::VERSION ); -
gps-tracker/tags/1.0.2/gpstracker.php
r1031078 r1256026 13 13 * Plugin URI: https://www.websmithing.com/gps-tracker 14 14 * Description: Track your Android cell phone in real time and store routes for later viewing. 15 * Version: 1.0. 215 * Version: 1.0.3 16 16 * Author: Nick Fox 17 17 * Author URI: https://www.websmithing.com/hire-me … … 28 28 // Plugin version 29 29 if ( ! defined( 'GPSTRACKER_VERSION' ) ) { 30 define( 'GPSTRACKER_VERSION', '1.0. 2' );30 define( 'GPSTRACKER_VERSION', '1.0.3' ); 31 31 } 32 32 -
gps-tracker/tags/1.0.2/public/class-gpstracker.php
r1031078 r1256026 29 29 * @var string 30 30 */ 31 const VERSION = '1.0. 2';31 const VERSION = '1.0.3'; 32 32 33 33 /** … … 197 197 // wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css', false, '3.2.0', 'all'); 198 198 199 wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7. 3/leaflet.css', __FILE__ ), array(), self::VERSION );199 wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7.5/leaflet.css', __FILE__ ), array(), self::VERSION ); 200 200 wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootswatch/3.3.0/superhero/bootstrap.min.css', false, '3.3.0', 'all'); 201 201 wp_enqueue_style( $this->plugin_slug . '-light-styles', plugins_url( 'assets/css/light.css', __FILE__ ), array(), self::VERSION ); … … 210 210 wp_enqueue_script( $this->plugin_slug . '-google-maps', '//maps.google.com/maps/api/js?v=3&sensor=false&libraries=adsense', array(), self::VERSION ); 211 211 wp_enqueue_script( $this->plugin_slug . '-map-js', plugins_url( 'assets/js/gpstracker-map.js', __FILE__ ), array('jquery'), self::VERSION ); 212 wp_enqueue_script( $this->plugin_slug . '-leaflet-js', plugins_url( 'assets/js/leaflet-0.7. 3/leaflet.js', __FILE__ ), array('jquery'), self::VERSION );212 wp_enqueue_script( $this->plugin_slug . '-leaflet-js', plugins_url( 'assets/js/leaflet-0.7.5/leaflet.js', __FILE__ ), array('jquery'), self::VERSION ); 213 213 wp_enqueue_script( $this->plugin_slug . '-google-js', plugins_url( 'assets/js/leaflet-plugins/google.js', __FILE__ ), array('jquery'), self::VERSION ); 214 214 wp_enqueue_script( $this->plugin_slug . '-bing-js', plugins_url( 'assets/js/leaflet-plugins/bing.js', __FILE__ ), array('jquery'), self::VERSION ); -
gps-tracker/tags/1.0.2/readme.txt
r1031078 r1256026 7 7 Requires at least: 4.0 8 8 Tested up to: 4.0 9 Stable tag: 1.0. 29 Stable tag: 1.0.3 10 10 License: GPLv2 or later 11 11 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 67 67 == Changelog == 68 68 69 = 1.0.3, January 8, 2015 = 70 71 * Fixed Google Maps library so that it would not be instantiated twice 72 69 73 = 1.0.2, November 22, 2014 = 70 74 … … 84 88 == Upgrade Notice == 85 89 90 = 1.0.3, January 8, 2015 = 91 92 * Fixed Google Maps library so that it would not be instantiated twice 93 86 94 = 1.0.2, November 22, 2014 = 87 95 -
gps-tracker/trunk/admin/class-gpstracker-admin.php
r1026546 r1256026 5 5 * @package Gps_Tracker_Admin 6 6 * @author Nick Fox <nickfox@websmithing.com> 7 * @license GPL-2.0+7 * @license MIT/GPLv2 or later 8 8 * @link https://www.websmithing.com/gps-tracker 9 9 * @copyright 2014 Nick Fox -
gps-tracker/trunk/gpstracker.php
r1031076 r1256026 5 5 * @package Gps_Tracker 6 6 * @author Nick Fox <nickfox@websmithing.com> 7 * @license GPL-2.0+7 * @license MIT/GPLv2 or later 8 8 * @link https://www.websmithing.com/gps-tracker 9 9 * @copyright 2014 Nick Fox … … 12 12 * Plugin Name: Gps Tracker 13 13 * Plugin URI: https://www.websmithing.com/gps-tracker 14 * Description: Track your Android cell phonein real time and store routes for later viewing.15 * Version: 1.0. 214 * Description: Track Android cell phones in real time and store routes for later viewing. 15 * Version: 1.0.3 16 16 * Author: Nick Fox 17 17 * Author URI: https://www.websmithing.com/hire-me 18 18 * Text Domain: gpstracker 19 * License: GPL-2.0+20 * License URI: http ://www.gnu.org/licenses/gpl-2.0.txt19 * License: MIT/GPLv2 or later 20 * License URI: https://opensource.org/licenses/MIT, http://www.gnu.org/licenses/gpl-2.0.html 21 21 * Domain Path: /languages 22 22 * GitHub Plugin URI: https://github.com/nickfox/GpsTracker-Wordpress-Plugin … … 28 28 // Plugin version 29 29 if ( ! defined( 'GPSTRACKER_VERSION' ) ) { 30 define( 'GPSTRACKER_VERSION', '1.0. 2' );30 define( 'GPSTRACKER_VERSION', '1.0.3' ); 31 31 } 32 32 -
gps-tracker/trunk/includes/class-gpstracker-gamajo-template-loader.php
r1031077 r1256026 8 8 * @link http://github.com/GaryJones/Gamajo-Template-Loader 9 9 * @copyright 2013 Gary Jones 10 * @license GPL-2.0+10 * @license MIT/GPLv2 or later 11 11 */ 12 12 -
gps-tracker/trunk/includes/class-gpstracker-setup.php
r1026546 r1256026 6 6 * @subpackage Classes/Setup 7 7 * @author Nick Fox <nickfox@websmithing.com> 8 * @license GPL-2.0+8 * @license MIT/GPLv2 or later 9 9 * @link https://www.websmithing.com/gps-tracker 10 10 * @copyright 2014 Nick Fox -
gps-tracker/trunk/includes/class-gpstracker-template-loader.php
r1031076 r1256026 6 6 * @subpackage Classes/GpsTracker Template Loader 7 7 * @author Nick Fox <nickfox@websmithing.com> 8 * @license GPL-2.0+8 * @license MIT/GPLv2 or later 9 9 * @link https://www.websmithing.com/gps-tracker 10 10 * @copyright 2014 Nick Fox -
gps-tracker/trunk/public/assets/js/gpstracker-map.js
r1031076 r1256026 6 6 var zoom = 12; 7 7 var autoRefresh = false; 8 var sessionIDArray ;8 var sessionIDArray = []; 9 9 var viewingAllRoutes = false; 10 10 -
gps-tracker/trunk/public/class-gpstracker.php
r1031076 r1256026 6 6 * @category Core 7 7 * @author Nick Fox <nickfox@websmithing.com> 8 * @license GPL-2.0+8 * @license MIT/GPLv2 or later 9 9 * @link https://www.websmithing.com/gps-tracker 10 10 * @copyright 2014 Nick Fox … … 29 29 * @var string 30 30 */ 31 const VERSION = '1.0. 2';31 const VERSION = '1.0.3'; 32 32 33 33 /** … … 189 189 * @since 1.0.0 190 190 */ 191 public function enqueue_styles() { 192 /* 193 wp_enqueue_style( $this->plugin_slug . '-plugin-styles', plugins_url( 'assets/css/public.css', __FILE__ ), array(), self::VERSION ); 194 */ 195 // wp_enqueue_style( $this->plugin_slug . '-bootstrap-styles', plugins_url( '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css', __FILE__ ), array(), self::VERSION ); 196 197 // wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css', false, '3.2.0', 'all'); 198 199 wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7.3/leaflet.css', __FILE__ ), array(), self::VERSION ); 200 wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootswatch/3.3.0/superhero/bootstrap.min.css', false, '3.3.0', 'all'); 191 public function enqueue_styles() { 192 wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7.5/leaflet.css', __FILE__ ), array(), self::VERSION ); 193 wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootswatch/3.3.5/superhero/bootstrap.min.css', false, '3.3.0', 'all'); 201 194 wp_enqueue_style( $this->plugin_slug . '-light-styles', plugins_url( 'assets/css/light.css', __FILE__ ), array(), self::VERSION ); 202 195 } … … 208 201 */ 209 202 public function enqueue_scripts() { 210 wp_enqueue_script( $this->plugin_slug . '-g oogle-maps', '//maps.google.com/maps/api/js?v=3&sensor=false&libraries=adsense', array(), self::VERSION );211 wp_enqueue_script( $this->plugin_slug . '- map-js', plugins_url( 'assets/js/gpstracker-map.js', __FILE__ ), array('jquery'), self::VERSION );212 wp_enqueue_script( $this->plugin_slug . '- leaflet-js', plugins_url( 'assets/js/leaflet-0.7.3/leaflet.js', __FILE__ ), array('jquery'), self::VERSION );213 wp_enqueue_script( $this->plugin_slug . '-g oogle-js', plugins_url( 'assets/js/leaflet-plugins/google.js', __FILE__ ), array('jquery'), self::VERSION );214 wp_enqueue_script( $this->plugin_slug . '- bing-js', plugins_url( 'assets/js/leaflet-plugins/bing.js', __FILE__ ), array('jquery'), self::VERSION );203 wp_enqueue_script( $this->plugin_slug . '-gpstracker-google-maps', '//maps.google.com/maps/api/js?v=3&sensor=false&libraries=adsense', array(), self::VERSION ); 204 wp_enqueue_script( $this->plugin_slug . '-gpstracker-map-js', plugins_url( 'assets/js/gpstracker-map.js', __FILE__ ), array('jquery'), self::VERSION ); 205 wp_enqueue_script( $this->plugin_slug . '-gpstracker-leaflet-js', plugins_url( 'assets/js/leaflet-0.7.5/leaflet.js', __FILE__ ), array('jquery'), self::VERSION ); 206 wp_enqueue_script( $this->plugin_slug . '-gpstracker-google-js', plugins_url( 'assets/js/leaflet-plugins/google.js', __FILE__ ), array('jquery'), self::VERSION ); 207 wp_enqueue_script( $this->plugin_slug . '-gpstracker-bing-js', plugins_url( 'assets/js/leaflet-plugins/bing.js', __FILE__ ), array('jquery'), self::VERSION ); 215 208 216 wp_localize_script( $this->plugin_slug . '- map-js', 'map_js_vars', array(209 wp_localize_script( $this->plugin_slug . '-gpstracker-map-js', 'map_js_vars', array( 217 210 'plugin_url' => GPSTRACKER_PLUGIN_URL, 218 211 'ajax_url' => admin_url('admin-ajax.php'), -
gps-tracker/trunk/public/includes/class-gpstracker-ajax.php
r1026546 r1256026 6 6 * @subpackage Classes/Ajax 7 7 * @author Nick Fox <nickfox@websmithing.com> 8 * @license GPL-2.0+8 * @license MIT/GPLv2 or later 9 9 * @link https://www.websmithing.com/gps-tracker 10 10 * @copyright 2014 Nick Fox -
gps-tracker/trunk/public/includes/class-gpstracker-endpoint.php
r1026546 r1256026 9 9 * @subpackage Classes/Endpoint 10 10 * @author Nick Fox <nickfox@websmithing.com> 11 * @license GPL-2.0+11 * @license MIT/GPLv2 or later 12 12 * @link https://www.websmithing.com/gps-tracker 13 13 * @copyright 2014 Nick Fox … … 63 63 switch ( $wp_query->query_vars['gpstracker'] ) { 64 64 case 'nonce': 65 $phone_number = isset($wp_query->query_vars['phonenumber']) ? $wp_query->query_vars['phonenumber'] : '0';66 65 $session_id = isset($wp_query->query_vars['sessionid']) ? $wp_query->query_vars['sessionid'] : '0'; 67 66 $session_id_pattern = '/^[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$/'; 68 67 69 if ( preg_match($session_id_pattern, $session_id) && preg_match($session_id_pattern, $phone_number) ) { 70 $app_id = get_option('gpstracker_app_id'); 68 if ( preg_match($session_id_pattern, $session_id) ) { 69 echo wp_create_nonce($session_id); 70 } else { 71 echo '0'; 72 } 71 73 72 $gps_action = '';73 $gps_nonce = '';74 75 if ( ! $app_id ) {76 // this will only happen once77 $gps_action = 'a';78 add_option( 'gpstracker_app_id', $phone_number, '', 'yes' );79 $gps_nonce = wp_create_nonce($session_id);80 echo $gps_nonce;81 } else {82 if ( $phone_number == $app_id ) {83 $gps_action = 'b';84 $gps_nonce = wp_create_nonce($session_id);85 echo $gps_nonce;86 } else {87 $gps_action = 'c';88 echo '-1';89 }90 }91 92 global $wpdb;93 $table_name = $wpdb->prefix . 'gps_logger';94 $wpdb->insert(95 $table_name,96 array(97 'gps_action' => $gps_action,98 'phone_number' => $phone_number,99 'session_id' => $session_id,100 'app_id' => $app_id,101 'nonce' => $gps_nonce102 ),103 array(104 '%s', '%s', '%s', '%s', '%s'105 )106 );107 108 } else {109 echo '-2';110 }111 112 74 break; 113 75 case 'location': … … 116 78 117 79 if ( ! wp_verify_nonce($wpnonce, $session_id) ) { 118 echo ' -3';80 echo '0'; 119 81 exit; 120 82 } 121 83 122 84 $latitude = isset($wp_query->query_vars['latitude']) ? $wp_query->query_vars['latitude'] : '0.0'; 85 $latitude = (float)str_replace(",", ".", $latitude); // to handle European locale decimals 123 86 $longitude = isset($wp_query->query_vars['longitude']) ? $wp_query->query_vars['longitude'] : '0.0'; 87 $longitude = (float)str_replace(",", ".", $longitude); 124 88 $user_name = isset($wp_query->query_vars['username']) ? $wp_query->query_vars['username'] : 'wordpressUser'; 125 89 $phone_number = isset($wp_query->query_vars['phonenumber']) ? $wp_query->query_vars['phonenumber'] : '867-5309'; … … 127 91 $direction = isset($wp_query->query_vars['direction']) ? $wp_query->query_vars['direction'] : '0'; 128 92 $distance = isset($wp_query->query_vars['distance']) ? $wp_query->query_vars['distance'] : '0'; 93 $distance = (float)str_replace(",", ".", $distance); 129 94 $gps_time = isset($wp_query->query_vars['gpstime']) ? urldecode($wp_query->query_vars['gpstime']) : '0000-00-00 00:00:00'; 130 95 $location_method = isset($wp_query->query_vars['locationmethod']) ? $wp_query->query_vars['locationmethod'] : '0'; -
gps-tracker/trunk/readme.txt
r1031076 r1256026 6 6 Tags: android, gps, cell, phone, tracker, google, map, openstreetview, track, websmithing 7 7 Requires at least: 4.0 8 Tested up to: 4. 09 Stable tag: 1.0. 210 License: GPLv2 or later11 License URI: http ://www.gnu.org/licenses/gpl-2.0.html8 Tested up to: 4.3.1 9 Stable tag: 1.0.3 10 License: MIT/GPLv2 or later 11 License URI: https://opensource.org/licenses/MIT, http://www.gnu.org/licenses/gpl-2.0.html 12 12 13 Track your Android cell phonein real time and store routes for later viewing.13 Track Android cell phones in real time and store routes for later viewing. 14 14 15 15 == Description == 16 16 17 This is the first and only WordPress plugin that allows you to track your Android cell phone in real time. You can watch the cell phonebeing tracked using google maps or OpenStreetView maps and you can store and reload routes easily for later viewing. The plugin is fully responsive and this means that it will display properly on any device such as a cell phone, tablet or desktop computer.17 This is the first and only WordPress plugin that allows you to track Android cell phones in real time. You can watch the cell phones being tracked using google maps or OpenStreetView maps and you can store and reload routes easily for later viewing. The plugin is fully responsive and this means that it will display properly on any device such as a cell phone, tablet or desktop computer. 18 18 19 19 View a working sample of the plugin here: … … 55 55 That shows all of your routes. For instance, suppose you track your phone on Monday for 3 hours and then Tuesday for 2 hours. You will then see two routes in the drop down box. 56 56 57 = I want to track more than one cell phone, what can I do? =57 = I want to modify this plugin for my own company or personal use, what can I do? = 58 58 59 This plugin allows you to track one Android cell phone for personal use. If you wish to track more than one cell phone, then you will need to purchase a 5-pack for $29 or a 10-pack for $49. The single license plugin is free and the multi-pack plugins will be available in late November, 2014. If you wish to track more than 10 cell phones,please contact me at nickfox@websmithing.com.59 I'm available for hire, read more about me here, https://www.websmithing.com/hire-me/ and please contact me at nickfox@websmithing.com. 60 60 61 61 == Screenshots == … … 66 66 67 67 == Changelog == 68 69 = 1.0.3, September 29, 2015 = 70 71 * Can now be used with unlimited number of android phones 72 * Fixed Google Maps library so that it would not be instantiated twice 68 73 69 74 = 1.0.2, November 22, 2014 = … … 84 89 == Upgrade Notice == 85 90 91 = 1.0.3, January 8, 2015 = 92 93 * Fixed Google Maps library so that it would not be instantiated twice 94 86 95 = 1.0.2, November 22, 2014 = 87 96 -
gps-tracker/trunk/uninstall.php
r1026546 r1256026 5 5 * @package Gps_Tracker 6 6 * @author Nick Fox <nickfox@websmithing.com> 7 * @license GPL-2.0+7 * @license MIT/GPLv2 or later 8 8 * @link https://www.websmithing.com/gps-tracker 9 9 * @copyright 2014 Nick Fox
Note: See TracChangeset
for help on using the changeset viewer.