Added nonce on clear cache command

renamed functions

wp-gpx-maps.php

@@ -49,8 +49,9 @@ function WP_GPX_Maps_action_links($links, $file) {
 
 function enqueue_WP_GPX_Maps_scripts_admin($hook)
 {	
-	if ( strpos($hook, 'WP-GPX-Maps') !== false )
+	if ( strpos($hook, 'WP-GPX-Maps') !== false ) {		
-	{
+		wp_register_script('mColorPicker', plugins_url( '/js/mColorPicker_min.js', __FILE__ ), array(), "1.0 r39" );
+		wp_enqueue_script('mColorPicker');			
 		wp_register_script('bootstrap-table', plugins_url( '/js/bootstrap-table.min.js', __FILE__ ), array(), "1.11.1" );
 		wp_enqueue_script('bootstrap-table');
 		wp_register_style('bootstrap-table', plugins_url( '/css/bootstrap-table.min.css', __FILE__ ), array(), "1.11.1" );
@@ -155,7 +156,7 @@ function handle_WP_GPX_Maps_folder_Shortcodes($attr, $content='') {
 		if (substr($file, - 4) == ".gpx" ) {
 		
 			$gpx = $folder . DIRECTORY_SEPARATOR . $file;
-			$points = getPoints($gpx, $pointsoffset, $donotreducegpx, $distanceType);
+			$points = wpgpxmaps_getPoints($gpx, $pointsoffset, $donotreducegpx, $distanceType);
 				
 			$points_maps = '';
 			$points_graph_dist = '';
@@ -371,7 +372,7 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
 			return "No gpx found";
 		}
 		
-		$points = getPoints( $gpx, $pointsoffset, $donotreducegpx, $distanceType);
+		$points = wpgpxmaps_getPoints( $gpx, $pointsoffset, $donotreducegpx, $distanceType);
 		
 		$points_maps = '';
 		$points_graph_dist = '';
@@ -536,7 +537,7 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
 		$waypoints = '[]';
 		
 		if ($showW == true) {
-			$wpoints = getWayPoints($gpx);
+			$wpoints = wpgpxmaps_getWayPoints($gpx);
 			/*
 			foreach ($wpoints as $p) {
 				$waypoints .= '['.number_format ( (float)$p[0] , 7 , '.' , '' ).','.number_format ( (float)$p[1] , 7 , '.' , '' ).',\''.unescape($p[4]).'\',\''.unescape($p[5]).'\',\''.unescape($p[7]).'\'],';

wp-gpx-maps_admin_settings.php

@@ -3,13 +3,6 @@
 	if ( !current_user_can('manage_options') )
 		return;
 
-?>
-
-<script type="text/javascript" src="//meta100.github.com/mColorPicker/javascripts/mColorPicker_min.js" charset="UTF-8"></script>
-
-
-<?php
-	
 	$po = get_option('wpgpxmaps_pointsoffset');
 	$showW = get_option("wpgpxmaps_show_waypoint");	
 	$donotreducegpx = get_option("wpgpxmaps_donotreducegpx");

wp-gpx-maps_admin_tracks.php

@@ -11,9 +11,17 @@
 	$gpxRegEx = '/.gpx$/';
 
 	if ( isset($_POST['clearcache']) )
+	{
+		
+		if ( isset($_GET['_wpnonce']) 
+			&& 
+			wp_verify_nonce( $_GET['_wpnonce'], 'wpgpx_clearcache_nonce' . $entry ) 
+			) 
 		{				
 			echo "Cache is now empty!";
-		recursive_remove_directory($cacheGpxPath,true);
+			wpgpxmaps_recursive_remove_directory($cacheGpxPath, true);			
+		}
+		
 	}
 
 	if ( is_writable ( $realGpxPath ) ){
@@ -47,7 +55,7 @@
 				?>
 			</form>
 			
-			<form method="POST" style="float:left; margin:5px 20px 0 0">
+			<form method="POST" style="float:left; margin:5px 20px 0 0" action="/wp-admin/options-general.php?page=WP-GPX-Maps&_wpnonce=<?php echo wp_create_nonce( 'wpgpx_clearcache_nonce' ) ?>" >
 				<input type="submit" name="clearcache" value="Clear Cache" />				
 			</form>		
 			
@@ -115,7 +123,10 @@
 			}
 		closedir($handle);
 	} 
-	?>
+	
+	$wpgpxmaps_gpxRelativePath = get_site_url(null, '/wp-content/uploads/gpx/');
+	
+?>
 	
 	<table id="table" class="wp-list-table widefat plugins"></table>
 	
@@ -140,7 +151,7 @@
 					'<b>' + row.name + '</b><br />',
 					'<a class="delete_gpx_row" href="/wp-admin/options-general.php?page=WP-GPX-Maps&_wpnonce=' + row.nonce + '" >Delete</a>',
 					' | ',
-					'<a href="../wp-content/uploads/gpx/' + row.name + '">Download</a>',
+					'<a href="<?php echo $wpgpxmaps_gpxRelativePath ?>' + row.name + '">Download</a>',
 					' | ',
 					'Shortcode: [sgpx gpx="<?php echo $relativeGpxPath ?>' + row.name + '"]',
 				].join('')

wp-gpx-maps_utils.php

@@ -101,7 +101,7 @@
 		return str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $ret);
 	}
 
-	function recursive_remove_directory($directory, $empty=FALSE)
+	function wpgpxmaps_recursive_remove_directory($directory, $empty=FALSE)
 	{
 		if(substr($directory,-1) == '/')
 		{
@@ -120,7 +120,7 @@
 					$path = $directory.'/'.$item;
 					if(is_dir($path)) 
 					{
-						recursive_remove_directory($path);
+						wpgpxmaps_recursive_remove_directory($path);
 					}else{
 						unlink($path);
 					}
@@ -138,7 +138,7 @@
 		return TRUE;
 	}
 
-	function getPoints($gpxPath, $gpxOffset = 10, $donotreducegpx, $distancetype)
+	function wpgpxmaps_getPoints($gpxPath, $gpxOffset = 10, $donotreducegpx, $distancetype)
 	{
 
 		$points = array();
@@ -151,7 +151,7 @@
 				
 		if (file_exists($gpxPath))
 		{
-			$points = @parseXml($gpxPath, $gpxOffset, $distancetype);			
+			$points = @wpgpxmaps_parseXml($gpxPath, $gpxOffset, $distancetype);			
 		}
 		else
 		{
@@ -185,7 +185,7 @@
 		return $points;
 	}
 
-	function parseXml($filePath, $gpxOffset, $distancetype)
+	function wpgpxmaps_parseXml($filePath, $gpxOffset, $distancetype)
 	{
 
 		$points = null;
@@ -567,7 +567,7 @@
 		return $points;
 	}	
 	
-	function getWayPoints($gpxPath)
+	function wpgpxmaps_getWayPoints($gpxPath)
 	{
 		$points = array();
 		if (file_exists($gpxPath))