GeoDirectory / geodirectory

geodirectory-functions/map-functions/map_on_add_listing_page.php

Braces +7 added lines, -5 removed lines

@@ -46,9 +46,10 @@ 
 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

     $mapzoom = 4;

-    if (isset($_REQUEST['add_hood']))

-        $mapzoom = 10;

-}

+    if (isset($_REQUEST['add_hood'])) {
+            $mapzoom = 10;
+    }
+    }

 

 /**

  * Filter the auto change address fields values

@@ -737,8 +738,9 @@ 
 </script>

 <?php

 $set_button_class = 'geodir_button';

-if (is_admin())

-    $set_button_class = 'button-primary';

+if (is_admin()) {
+    $set_button_class = 'button-primary';
+}
 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

 <div id="<?php echo $prefix; ?>d_mouseClick"></div>

Indentation +70 added lines, -70 removed lines

@@ -35,19 +35,19 @@ 
 $defaultcity = isset($default_location->city) ? $default_location->city : '';

 $lat_lng_blank = false;

 if ($lat == '' && $lng == '') {

-    $lat_lng_blank = true;

-    $city = $defaultcity;

-    $region = isset($default_location->region) ? $default_location->region : '';

-    $country = isset($default_location->country) ? $default_location->country : '';

-    $lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-    $lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+	$lat_lng_blank = true;

+	$city = $defaultcity;

+	$region = isset($default_location->region) ? $default_location->region : '';

+	$country = isset($default_location->country) ? $default_location->country : '';

+	$lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+	$lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 }

 $default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

-    $mapzoom = 4;

-    if (isset($_REQUEST['add_hood']))

-        $mapzoom = 10;

+	$mapzoom = 4;

+	if (isset($_REQUEST['add_hood']))

+		$mapzoom = 10;

 }

 

 /**

@@ -68,7 +68,7 @@ 
 	 * Fires at the start of the add javascript on the add lsitings map.

 	 *

 	 * @since 1.0.0

-     * @param string $prefix The prefix for all elements.

+	 * @param string $prefix The prefix for all elements.

 	 */

 	do_action('geodir_add_listing_js_start', $prefix);

 	?>

@@ -260,12 +260,12 @@ 
             // fix for regions in GB

 

             $country_arr = <?php

-            /**

-             * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1.

-             *

-             * @since 1.6.16

-             */

-            echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

+			/**

+			 * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1.

+			 *

+			 * @since 1.6.16

+			 */

+			echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

             if (jQuery.inArray(rr, $country_arr) !== -1) {

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

@@ -346,13 +346,13 @@ 
                 getZip = postal_code.long_name;

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

             if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

                 alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

@@ -433,15 +433,15 @@ 
             }

         }

         <?php

-        /**

-         * Fires when marker address updated on map.

-         *

-         * @since 1.0.0

-         * @param string $prefix Identifier used as a prefix for field name

-         */

-        do_action('geodir_update_marker_address', $prefix);

-        echo $updateMarkerAddress = ob_get_clean();

-        ?>

+		/**

+		 * Fires when marker address updated on map.

+		 *

+		 * @since 1.0.0

+		 * @param string $prefix Identifier used as a prefix for field name

+		 */

+		do_action('geodir_update_marker_address', $prefix);

+		echo $updateMarkerAddress = ob_get_clean();

+		?>

     }

     function geodir_codeAddress(set_on_map) {

         var address = jQuery('#<?php echo $prefix.'address';?>').val();

@@ -456,17 +456,17 @@ 
         }

         if(!ISO2){

             <?php

-            if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

-                global $wpdb;

-                $location_result = geodir_get_default_location();

-                if(!empty($location_result)){

-                    $ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s",$location_result->country));

-                    echo "ISO2 = '$ISO2';";

-                }

-            }

+			if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

+				global $wpdb;

+				$location_result = geodir_get_default_location();

+				if(!empty($location_result)){

+					$ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s",$location_result->country));

+					echo "ISO2 = '$ISO2';";

+				}

+			}

 

 

-            ?>

+			?>

         }

         if (ISO2 == '--') {

             ISO2 = '';

@@ -486,9 +486,9 @@ 
         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

-        $defaultregion = isset($default_location->region) ? $default_location->region : '';

-        $defaultcountry = isset($default_location->country) ? $default_location->country : '';

-        ?>

+		$defaultregion = isset($default_location->region) ? $default_location->region : '';

+		$defaultcountry = isset($default_location->country) ? $default_location->country : '';

+		?>

         if (set_on_map && is_restrict) {

             if (zip != '' && address != '') {

                 address = address + ',' + zip;

@@ -500,12 +500,12 @@ 
             if( address == city || address == region || address == country || address == zip )

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+			if(is_admin() && isset($_REQUEST['tab'])){?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

             <?php

-               }?>

+			   }?>

 

             if (ISO2 == 'GB') {

                 address = address + ',' + city + ',' + country; // UK is funny with regions

@@ -521,15 +521,15 @@ 
             address =  address.replace(",null,", ",");

         }

         <?php $codeAddress = ob_get_clean();

-        /**

-         * Filter the address variable

-         *

-         * @since 1.0.0

-         *

-         * @param string $codeAddress Row of address to use in google map.

-         */

-        echo apply_filters('geodir_codeaddress', $codeAddress);

-        ?>

+		/**

+		 * Filter the address variable

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param string $codeAddress Row of address to use in google map.

+		 */

+		echo apply_filters('geodir_codeaddress', $codeAddress);

+		?>

         if (!window.gdMaps) { // No Google Map Loaded

             return;

         }

@@ -554,13 +554,13 @@ 
                         updateMarkerPosition(baseMarker.getPosition());

                         //if(set_on_map && is_restrict) {

                         <?php 

-                        /**

-                         * Fires before set geocode position.

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_add_listing_codeaddress_before_geocode');

-                        ?>

+						/**

+						 * Fires before set geocode position.

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_add_listing_codeaddress_before_geocode');

+						?>

                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

@@ -606,13 +606,13 @@ 
                 updateMarkerPositionOSM(baseMarker.getLatLng());

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

             if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

                 alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

@@ -761,7 +761,7 @@ 
 <?php

 $set_button_class = 'geodir_button';

 if (is_admin())

-    $set_button_class = 'button-primary';

+	$set_button_class = 'button-primary';

 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

 <div id="<?php echo $prefix; ?>d_mouseClick"></div>

Spacing +82 added lines, -82 removed lines

@@ -82,16 +82,16 @@ 
     window.gdMaps = window.gdMaps || gdMaps;

     

     user_address = false;

-    jQuery('#<?php echo $prefix.'address';?>').keypress(function () {

+    jQuery('#<?php echo $prefix.'address'; ?>').keypress(function () {

         user_address = true;

     });

 

     baseMarker = '';

     geocoder = '';

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat :  '39.952484'; ?>;

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng :  '-75.163786'; ?>;

-    <?php if($lat_lng_blank){$lat='';$lng='';}?>

-    var <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12;?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat : '39.952484'; ?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng : '-75.163786'; ?>;

+    <?php if ($lat_lng_blank) {$lat = ''; $lng = ''; }?>

+    var <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12; ?>;

     var minZoomLevel = <?php echo ($is_map_restrict) ? 5 : 0; ?>;

     var oldstr_address;

     var oldstr_zip;

@@ -295,7 +295,7 @@ 
              *

              * @since 1.6.16

              */

-            echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

+            echo apply_filters("geodir_geocode_region_level", '["GB","ES"]'); ?>;

             if (jQuery.inArray(rr, $country_arr) !== -1) {

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

@@ -404,9 +404,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 jQuery.goMap.map.setCenter(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setPosition(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPosition(baseMarker.getPosition());

@@ -415,11 +415,11 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     function centerMap(latlng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         if (window.gdMaps == 'google') {

             jQuery.goMap.map.panTo(baseMarker.getPosition());

         } else if (window.gdMaps == 'osm') {

@@ -428,7 +428,7 @@ 
         }

     }

     function centerMarker() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         var center = jQuery.goMap.map.getCenter();

         if (window.gdMaps == 'google') {

             baseMarker.setPosition(center);

@@ -437,48 +437,48 @@ 
         }

     }

     function updateMapZoom(zoom) {

-        jQuery('#<?php echo $prefix.'mapzoom';?>').val(zoom);

+        jQuery('#<?php echo $prefix.'mapzoom'; ?>').val(zoom);

     }

     function updateMarkerPosition(markerlatLng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat());

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng());

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat());

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng());

     }

     function updateMarkerPositionOSM(markerlatLng) {

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat);

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng);

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat);

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng);

     }

     function updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry) {

-        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields);?>';

-        <?php ob_start();?>

-        var old_country = jQuery("#<?php echo $prefix.'country';?>").val();

-        var old_region = jQuery("#<?php echo $prefix.'region';?>").val();

+        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields); ?>';

+        <?php ob_start(); ?>

+        var old_country = jQuery("#<?php echo $prefix.'country'; ?>").val();

+        var old_region = jQuery("#<?php echo $prefix.'region'; ?>").val();

         

-        if (user_address == false || jQuery('#<?php echo $prefix.'address';?>').val() == '') {

-            jQuery("#<?php echo $prefix.'address';?>").val(getAddress).trigger("blur");

+        if (user_address == false || jQuery('#<?php echo $prefix.'address'; ?>').val() == '') {

+            jQuery("#<?php echo $prefix.'address'; ?>").val(getAddress).trigger("blur");

         }

         if (getAddress) {

             oldstr_address = getAddress;

         }

 

-        jQuery("#<?php echo $prefix.'zip';?>").val(getZip);

+        jQuery("#<?php echo $prefix.'zip'; ?>").val(getZip);

         if (getZip) {

             oldstr_zip = getZip;

         }

         if (set_map_val_in_fields) {

             if (getCountry) {

-                jQuery('#<?php echo $prefix .'country'; ?> option[value=""]').attr("selected",false);

-                jQuery('#<?php echo $prefix.'country';?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

-                jQuery("#<?php echo $prefix.'country';?>").trigger("chosen:updated");

+                jQuery('#<?php echo $prefix.'country'; ?> option[value=""]').attr("selected",false);

+                jQuery('#<?php echo $prefix.'country'; ?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

+                jQuery("#<?php echo $prefix.'country'; ?>").trigger("chosen:updated");

             }

             if (getState) {

-                if (jQuery('input[id="<?php echo $prefix.'region';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'region';?>").val(getState);

+                if (jQuery('input[id="<?php echo $prefix.'region'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'region'; ?>").val(getState);

                 }

             }

             if (getCity) {

-                if (jQuery('input[id="<?php echo $prefix.'city';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'city';?>").val(getCity);

+                if (jQuery('input[id="<?php echo $prefix.'city'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'city'; ?>").val(getCity);

                 }

             }

         }

@@ -494,23 +494,23 @@ 
         ?>

     }

     function geodir_codeAddress(set_on_map) {

-        var address = jQuery('#<?php echo $prefix.'address';?>').val();

-        var zip = jQuery('#<?php echo $prefix.'zip';?>').val();

-        var city = jQuery('#<?php echo $prefix.'city';?>').val();

-        var region = jQuery('#<?php echo $prefix.'region';?>').val();

-        var country = jQuery('#<?php echo $prefix.'country';?>').val();

-        var country_selected = jQuery('#<?php echo $prefix.'country';?>').find('option:selected');

+        var address = jQuery('#<?php echo $prefix.'address'; ?>').val();

+        var zip = jQuery('#<?php echo $prefix.'zip'; ?>').val();

+        var city = jQuery('#<?php echo $prefix.'city'; ?>').val();

+        var region = jQuery('#<?php echo $prefix.'region'; ?>').val();

+        var country = jQuery('#<?php echo $prefix.'country'; ?>').val();

+        var country_selected = jQuery('#<?php echo $prefix.'country'; ?>').find('option:selected');

         var ISO2 = country_selected.data('country_code');

-        if (!ISO2 && jQuery('#<?php echo $prefix.'country';?>').data('country_code')) {

-            ISO2 = jQuery('#<?php echo $prefix.'country';?>').data('country_code');

+        if (!ISO2 && jQuery('#<?php echo $prefix.'country'; ?>').data('country_code')) {

+            ISO2 = jQuery('#<?php echo $prefix.'country'; ?>').data('country_code');

         }

         if(!ISO2){

             <?php

-            if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

+            if (!defined('GEODIRLOCATION_TEXTDOMAIN')) {

                 global $wpdb;

                 $location_result = geodir_get_default_location();

-                if(!empty($location_result)){

-                    $ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s",$location_result->country));

+                if (!empty($location_result)) {

+                    $ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country=%s", $location_result->country));

                     echo "ISO2 = '$ISO2';";

                 }

             }

@@ -526,13 +526,13 @@ 
             zip = '';

         }

         if (typeof city == "undefined") {

-            city = '<?php echo addslashes_gpc($city);?>';

+            city = '<?php echo addslashes_gpc($city); ?>';

         }

         if (typeof region == "undefined") {

-            region = '<?php echo addslashes_gpc($region);?>';

+            region = '<?php echo addslashes_gpc($region); ?>';

         }

         if (typeof country == "undefined") {

-            country = '<?php echo addslashes_gpc($country);?>';

+            country = '<?php echo addslashes_gpc($country); ?>';

         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

@@ -550,7 +550,7 @@ 
             if( address == city || address == region || address == country || address == zip )

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+            if (is_admin() && isset($_REQUEST['tab'])) {?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

@@ -597,7 +597,7 @@ 
             geocoder.geocode({'address': address, 'country': ISO2},

                 function (results, status) {

                     console.log(status);

-                    jQuery("#<?php echo $prefix.'map';?>").goMap();

+                    jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         baseMarker.setPosition(results[0].geometry.location);

                         jQuery.goMap.map.setCenter(results[0].geometry.location);

@@ -614,21 +614,21 @@ 
                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

-                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:','geodirectory'));?> ' + status);

+                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:', 'geodirectory')); ?> ' + status);

                     }

                 });

         }

     }

     function gdMaxMap() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

 

-        jQuery('#<?php echo $prefix.'map';?>').toggleClass('map-fullscreen');

+        jQuery('#<?php echo $prefix.'map'; ?>').toggleClass('map-fullscreen');

         jQuery('.map_category').toggleClass('map_category_fullscreen');

-        jQuery('#<?php echo $prefix;?>trigger').toggleClass('map_category_fullscreen');

+        jQuery('#<?php echo $prefix; ?>trigger').toggleClass('map_category_fullscreen');

         jQuery('body').toggleClass('body_fullscreen');

-        jQuery('#<?php echo $prefix;?>loading_div').toggleClass('loading_div_fullscreen');

-        jQuery('#<?php echo $prefix;?>advmap_nofound').toggleClass('nofound_fullscreen');

-        jQuery('#<?php echo $prefix;?>triggermap').toggleClass('triggermap_fullscreen');

+        jQuery('#<?php echo $prefix; ?>loading_div').toggleClass('loading_div_fullscreen');

+        jQuery('#<?php echo $prefix; ?>advmap_nofound').toggleClass('nofound_fullscreen');

+        jQuery('#<?php echo $prefix; ?>triggermap').toggleClass('triggermap_fullscreen');

         jQuery('.TopLeft').toggleClass('TopLeft_fullscreen');

         window.setTimeout(function () {

             if (window.gdMaps == 'google') {

@@ -664,9 +664,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 centerMap(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setLatLng(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPositionOSM(baseMarker.getLatLng());

@@ -675,39 +675,39 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     

     jQuery(function ($) {

-        $("#<?php echo $prefix.'map';?>").goMap({

-            latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-            longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

-            zoom: <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT,

+        $("#<?php echo $prefix.'map'; ?>").goMap({

+            latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+            longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

+            zoom: <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT,

             maptype: 'ROADMAP', // Map type - HYBRID, ROADMAP, SATELLITE, TERRAIN

             streetViewControl: true,

-            <?php if(get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,';}?>

+            <?php if (get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,'; }?>

         });

 

         if (window.gdMaps) {

             geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : [];

 

             baseMarker = $.goMap.createMarker({

-                latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-                longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

+                latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+                longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

                 id: 'baseMarker',

-                icon: '<?php echo $marker_icon;?>',

+                icon: '<?php echo $marker_icon; ?>',

                 draggable: true,

                 addToMap: true, // For OSM

-                w: parseFloat('<?php echo $icon_size['w'];?>'),

-                h: parseFloat('<?php echo $icon_size['h'];?>'),

+                w: parseFloat('<?php echo $icon_size['w']; ?>'),

+                h: parseFloat('<?php echo $icon_size['h']; ?>'),

             });

         } else {

-            jQuery('#<?php echo $prefix.'advmap_nofound';?>').hide();

-            jQuery('#<?php echo $prefix.'advmap_notloaded';?>').show();

+            jQuery('#<?php echo $prefix.'advmap_nofound'; ?>').hide();

+            jQuery('#<?php echo $prefix.'advmap_notloaded'; ?>').show();

         }

         

-        $("#<?php echo $prefix;?>set_address_button").click(function () {

+        $("#<?php echo $prefix; ?>set_address_button").click(function () {

             var set_on_map = true;

             geodir_codeAddress(set_on_map);

         });

@@ -742,14 +742,14 @@ 
                 updateMapZoom($.goMap.map.zoom);

             });

 

-            var maxMap = document.getElementById('<?php echo $prefix;?>triggermap');

+            var maxMap = document.getElementById('<?php echo $prefix; ?>triggermap');

             google.maps.event.addDomListener(maxMap, 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country); ?>';

             geocoder.geocode({'address': CITY_ADDRESS},

                 function (results, status) {

-                    $("#<?php echo $prefix.'map';?>").goMap();

+                    $("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         // Bounds for North America

                         var bound_lat_lng = String(results[0].geometry.bounds);

@@ -760,13 +760,13 @@ 
                             new google.maps.LatLng(bound_lat_lng[2], bound_lat_lng[3])

                         );

                     } else {

-                        alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                        alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                     }

                 });

             <?php } ?>

             // Limit the zoom level

             google.maps.event.addListener($.goMap.map, 'zoom_changed', function () {

-                $("#<?php echo $prefix.'map';?>").goMap();

+                $("#<?php echo $prefix.'map'; ?>").goMap();

                 if ($.goMap.map.getZoom() < minZoomLevel) $.goMap.map.setZoom(minZoomLevel);

             });

         } else if (window.gdMaps == 'osm') {

@@ -792,10 +792,10 @@ 
                 updateMapZoom($.goMap.map.getZoom());

             });

 

-            L.DomEvent.addListener($('<?php echo $prefix;?>triggermap'), 'click', gdMaxMap);

+            L.DomEvent.addListener($('<?php echo $prefix; ?>triggermap'), 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country); ?>';

             geocodePositionOSM('', CITY_ADDRESS);

             <?php } ?>

             // Limit the zoom level

@@ -818,14 +818,14 @@ 
 <div class="top_banner_section_inn geodir_map_container clearfix" style="margin-top:10px;">

     <div class="TopLeft"><span id="<?php echo $prefix; ?>triggermap" style="margin-top:-11px;margin-left:-12px;"></span></div>

     <div class="TopRight"></div>

-    <div id="<?php echo $prefix . 'map'; ?>" class="geodir_map" style="height:300px">

+    <div id="<?php echo $prefix.'map'; ?>" class="geodir_map" style="height:300px">

         <!-- new map start -->

         <div class="iprelative">

-            <div id="<?php echo $prefix . 'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

+            <div id="<?php echo $prefix.'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

             <div id="<?php echo $prefix; ?>loading_div" style="height:300px"></div>

             <div id="<?php echo $prefix; ?>advmap_counter"></div>

             <div id="<?php echo $prefix; ?>advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-            <div id="<?php echo $prefix;?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

+            <div id="<?php echo $prefix; ?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

         </div>

         <!-- new map end -->

     </div>

geodirectory_shortcodes.php

Braces +1 added lines, -1 removed lines

@@ -427,7 +427,7 @@
         }
 
         return $output;
-    }else{
+    } else{
         ob_start();
         add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
         add_action('the_post', 'create_list_jsondata'); // Add marker in json array

Indentation +909 added lines, -909 removed lines

@@ -7,7 +7,7 @@ 
  */
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 require_once('geodirectory-functions/shortcode_functions.php');
 
@@ -32,43 +32,43 @@ 
  */
 function geodir_sc_add_listing($atts)
 {
-    ob_start();
-    $defaults = array(
-        'pid' => '',
-        'listing_type' => 'gd_place',
-        'login_msg' => __('You must login to post.', 'geodirectory'),
-        'show_login' => false,
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    foreach ($params as $key => $value) {
-        $_REQUEST[$key] = $value;
-    }
-
-    $user_id = get_current_user_id();
-    if (!$user_id) {
-        echo $params['login_msg'];
-        if ($params['show_login']) {
-            echo "<br />";
-            $defaults = array(
-                'before_widget' => '',
-                'after_widget' => '',
-                'before_title' => '',
-                'after_title' => '',
-            );
-
-            geodir_loginwidget_output($defaults, $defaults);
-        }
-
-
-    } else {
-       // Add listing page will be used if shortcode is detected in page content, no need to call it here
-    }
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	$defaults = array(
+		'pid' => '',
+		'listing_type' => 'gd_place',
+		'login_msg' => __('You must login to post.', 'geodirectory'),
+		'show_login' => false,
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	foreach ($params as $key => $value) {
+		$_REQUEST[$key] = $value;
+	}
+
+	$user_id = get_current_user_id();
+	if (!$user_id) {
+		echo $params['login_msg'];
+		if ($params['show_login']) {
+			echo "<br />";
+			$defaults = array(
+				'before_widget' => '',
+				'after_widget' => '',
+				'before_title' => '',
+				'after_title' => '',
+			);
+
+			geodir_loginwidget_output($defaults, $defaults);
+		}
+
+
+	} else {
+	   // Add listing page will be used if shortcode is detected in page content, no need to call it here
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -96,136 +96,136 @@ 
  */
 function geodir_sc_home_map($atts)
 {
-    ob_start();
-    $defaults = array(
-        'width' => '960',
-        'height' => '425',
-        'maptype' => 'ROADMAP',
-        'zoom' => '13',
-        'autozoom' => '',
-        'child_collapse' => '0',
-        'scrollwheel' => '0',
+	ob_start();
+	$defaults = array(
+		'width' => '960',
+		'height' => '425',
+		'maptype' => 'ROADMAP',
+		'zoom' => '13',
+		'autozoom' => '',
+		'child_collapse' => '0',
+		'scrollwheel' => '0',
 		'marker_cluster' => false,
-        'latitude' => '',
-        'longitude' => ''
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    $params = gdsc_validate_map_args($params);
-
-    $map_args = array(
-        'map_canvas_name' => 'gd_home_map',
-        'latitude' => $params['latitude'],
-        'longitude' => $params['longitude'],
-
-        /**
-         * Filter the widget width of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['width'] The map width.
-         */
-        'width' => apply_filters('widget_width', $params['width']),
-        /**
-         * Filter the widget height of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['height'] The map height.
-         */
-        'height' => apply_filters('widget_heigh', $params['height']),
-        /**
-         * Filter the widget maptype of the map on home/listings page.
-         *
-         * @since 1.0.0
+		'latitude' => '',
+		'longitude' => ''
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+	$params = gdsc_validate_map_args($params);
+
+	$map_args = array(
+		'map_canvas_name' => 'gd_home_map',
+		'latitude' => $params['latitude'],
+		'longitude' => $params['longitude'],
+
+		/**
+		 * Filter the widget width of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['width'] The map width.
+		 */
+		'width' => apply_filters('widget_width', $params['width']),
+		/**
+		 * Filter the widget height of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['height'] The map height.
+		 */
+		'height' => apply_filters('widget_heigh', $params['height']),
+		/**
+		 * Filter the widget maptype of the map on home/listings page.
+		 *
+		 * @since 1.0.0
 		 * @since 1.5.2 Added TERRAIN map type.
-         * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
-         */
-        'maptype' => apply_filters('widget_maptype', $params['maptype']),
-        /**
-         * Filter the widget scrollwheel value of the map on home/listings page.
-         *
-         * Should the scrollwheel zoom the map or not.
-         *
-         * @since 1.0.0
-         * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
-         */
-        'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
-        /**
-         * Filter the widget zoom level of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param int $params['zoom'] The zoom level of the map. Between 1-19.
-         */
-        'zoom' => apply_filters('widget_zoom', $params['zoom']),
-        /**
-         * Filter the widget auto zoom value of the map on home/listings page.
-         *
-         * If the map should autozoom to fit the markers shown.
-         *
-         * @since 1.0.0
-         * @param bool $params['autozoom'] True if the map should autozoom, false if not.
-         */
-        'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
-        /**
-         * Filter the widget child_collapse value of the map on home/listings page.
-         *
-         * If the map should auto collapse the child categories if the category bar is present.
-         *
-         * @since 1.0.0
-         * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
-         */
-        'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
-        'enable_cat_filters' => true,
-        'enable_text_search' => true,
-        'enable_post_type_filters' => true,
-        /**
-         * Filter the widget enable_location_filters value of the map on home/listings page.
-         *
-         * This is used when the location addon is used.
-         *
-         * @since 1.0.0
-         * @param bool $val True if location filters should be used, false if not.
-         */
-        'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
-        'enable_jason_on_load' => false,
-        'enable_marker_cluster' => false,
-        'enable_map_resize_button' => true,
-        'map_class_name' => 'geodir-map-home-page',
-        'is_geodir_home_map_widget' => true,
-    );
+		 * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
+		 */
+		'maptype' => apply_filters('widget_maptype', $params['maptype']),
+		/**
+		 * Filter the widget scrollwheel value of the map on home/listings page.
+		 *
+		 * Should the scrollwheel zoom the map or not.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
+		 */
+		'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
+		/**
+		 * Filter the widget zoom level of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param int $params['zoom'] The zoom level of the map. Between 1-19.
+		 */
+		'zoom' => apply_filters('widget_zoom', $params['zoom']),
+		/**
+		 * Filter the widget auto zoom value of the map on home/listings page.
+		 *
+		 * If the map should autozoom to fit the markers shown.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['autozoom'] True if the map should autozoom, false if not.
+		 */
+		'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
+		/**
+		 * Filter the widget child_collapse value of the map on home/listings page.
+		 *
+		 * If the map should auto collapse the child categories if the category bar is present.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
+		 */
+		'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
+		'enable_cat_filters' => true,
+		'enable_text_search' => true,
+		'enable_post_type_filters' => true,
+		/**
+		 * Filter the widget enable_location_filters value of the map on home/listings page.
+		 *
+		 * This is used when the location addon is used.
+		 *
+		 * @since 1.0.0
+		 * @param bool $val True if location filters should be used, false if not.
+		 */
+		'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
+		'enable_jason_on_load' => false,
+		'enable_marker_cluster' => false,
+		'enable_map_resize_button' => true,
+		'map_class_name' => 'geodir-map-home-page',
+		'is_geodir_home_map_widget' => true,
+	);
 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-        $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
-            if ($map_args['autozoom']) {
-                $map_args['enable_marker_cluster_no_reposition'] = false;
-            } else {
-                $map_args['enable_marker_cluster_no_reposition'] = true;
-            }
+		$map_args['enable_marker_cluster'] = true;
+		if(get_option('geodir_marker_cluster_type')) {
+			if ($map_args['autozoom']) {
+				$map_args['enable_marker_cluster_no_reposition'] = false;
+			} else {
+				$map_args['enable_marker_cluster_no_reposition'] = true;
+			}
 
-            $map_args['enable_marker_cluster_server'] = true ;
+			$map_args['enable_marker_cluster_server'] = true ;
 
-        }
+		}
 	} else {
 		$map_args['enable_marker_cluster'] = false;
 	}
 
-    // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
-        $map_args['enable_marker_cluster_no_reposition'] = true;
-    }
+	// if lat and long set in shortcode, hack it so the map is not repositioned
+	if(!empty($params['latitude']) && !empty($params['longitude']) ){
+		$map_args['enable_marker_cluster_no_reposition'] = true;
+	}
 
 
-    geodir_draw_map($map_args);
+	geodir_draw_map($map_args);
 
-    add_action('wp_footer', 'geodir_home_map_add_script', 100);
+	add_action('wp_footer', 'geodir_home_map_add_script', 100);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_homepage_map', 'geodir_sc_home_map');
 
@@ -264,243 +264,243 @@ 
  */
 function geodir_sc_listing_map($atts) {
 
-    // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
-
-        global $add_post_in_marker_array, $gd_sc_map_params;
-        $backup_globals                             = array();
-        $backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
-        $backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
-
-        $defaults = array(
-            'width'          => '294',
-            'height'         => '370',
-            'zoom'           => '13',
-            'autozoom'       => '',
-            'sticky'         => '',
-            'showall'        => '0',
-            'scrollwheel'    => '0',
-            'maptype'        => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false,
-            'post_type'      => 'gd_place',
-            'category'       => '0',
-            'event_type'     => 'all'
-        );
-
-        $params = shortcode_atts( $defaults, $atts );
-
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
-            $params['post_type'] = 'gd_place';
-        }
-
-        // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
-            'orderby' => 'count',
-            'order'   => 'DESC',
-            'fields'  => 'ids'
-        ) );
-
-        // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
-        }
-
-        // Array_intersect returns only the items in $params['category'] that are also in our category list
-        // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
-
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
-        }
-
-        $params = gdsc_validate_map_args( $params );
-
-        $gd_sc_map_params = $params;
-
-        $query_args = array(
-            'posts_per_page' => 1000000, //@todo kiran why was this added? 
-            'is_geodir_loop' => true,
-            'gd_location'    => false,
-            'post_type'      => $params['post_type'],
-        );
-
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-
-            ######### WPML #########
-            if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
-            }
-            ######### WPML #########
-
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field'    => 'id',
-                'terms'    => $params['category']
-            );
-
-            $query_args['tax_query'] = array( $tax_query );
-        }
-
-        $add_post_in_marker_array = true;
-
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
-            global $geodir_event_widget_listview;
-            $geodir_event_widget_listview = true;
-
-            $query_args['geodir_event_type'] = $params['event_type'];
-
-            $listings = geodir_event_get_widget_events( $query_args );
-
-            $geodir_event_widget_listview = false;
-        } else {
-            $listings = geodir_get_widget_listings( $query_args );
-        }
-
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
-            }
-        }
-
-        ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
-
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
-
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
-
-        $default_location = geodir_get_default_location();
-
-        $map_args = array(
-            'map_canvas_name'          => 'gd_listing_map',
-            'width'                    => $params['width'],
-            'height'                   => $params['height'],
-            'zoom'                     => $params['zoom'],
-            'autozoom'                 => $params['autozoom'],
-            'sticky'                   => $params['sticky'],
-            'showall'                  => $params['showall'],
-            'scrollwheel'              => $params['scrollwheel'],
-            'maptype'                  => $params['maptype'],
-            'child_collapse'           => 0,
-            'enable_cat_filters'       => false,
-            'enable_text_search'       => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters'  => false,
-            'enable_jason_on_load'     => true,
-            'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
-            'streetViewControl'        => true,
-            'showPreview'              => '0',
-            'maxZoom'                  => 21,
-            'bubble_size'              => 'small',
-        );
-
-        if ( is_single() ) {
-            global $post;
-            if ( isset( $post->post_latitude ) ) {
-                $map_args['latitude']  = $post->post_latitude;
-                $map_args['longitude'] = $post->post_longitude;
-            }
-
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-
-        // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-
-        geodir_draw_map( $map_args );
-
-        $output = ob_get_contents();
-
-        ob_end_clean();
-
-        foreach ( $backup_globals as $global => $value ) {
-            ${$global} = $value;
-        }
-
-        return $output;
-    }else{
-        ob_start();
-        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
-        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
-        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
-        $defaults = array(
-            'width' => '294',
-            'height' => '370',
-            'zoom' => '13',
-            'autozoom' => '',
-            'sticky' => '',
-            'showall' => '0',
-            'scrollwheel' => '0',
-            'maptype' => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false
-        );
-        $params = shortcode_atts($defaults, $atts);
-        $params = gdsc_validate_map_args($params);
-        $map_args = array(
-            'map_canvas_name' => 'gd_listing_map',
-            'width' => $params['width'],
-            'height' => $params['height'],
-            'zoom' => $params['zoom'],
-            'autozoom' => $params['autozoom'],
-            'sticky' => $params['sticky'],
-            'showall' => $params['showall'],
-            'scrollwheel' => $params['scrollwheel'],
-            'child_collapse' => 0,
-            'enable_cat_filters' => false,
-            'enable_text_search' => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters' => false,
-            'enable_jason_on_load' => true,
-        );
-        if (is_single()) {
-            global $post;
-            $map_default_lat = $address_latitude = $post->post_latitude;
-            $map_default_lng = $address_longitude = $post->post_longitude;
-            $mapview = $post->post_mapview;
-            $map_args['zoom'] = $post->post_mapzoom;
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $default_location = geodir_get_default_location();
-            $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-        if (empty($mapview)) {
-            $mapview = 'ROADMAP';
-        }
-        // Set default map options
-        $map_args['ajax_url'] = geodir_get_ajax_url();
-        $map_args['latitude'] = $map_default_lat;
-        $map_args['longitude'] = $map_default_lng;
-        $map_args['streetViewControl'] = true;
-        $map_args['maptype'] = $mapview;
-        $map_args['showPreview'] = '0';
-        $map_args['maxZoom'] = 21;
-        $map_args['bubble_size'] = 'small';
-
-        // Add marker cluster
-        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-        geodir_draw_map($map_args);
-        $output = ob_get_contents();
-        ob_end_clean();
-        return $output;
-    }
+	// if some params are set then we need a new query, if not then we can use the main query
+	if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+
+		global $add_post_in_marker_array, $gd_sc_map_params;
+		$backup_globals                             = array();
+		$backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
+		$backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
+
+		$defaults = array(
+			'width'          => '294',
+			'height'         => '370',
+			'zoom'           => '13',
+			'autozoom'       => '',
+			'sticky'         => '',
+			'showall'        => '0',
+			'scrollwheel'    => '0',
+			'maptype'        => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false,
+			'post_type'      => 'gd_place',
+			'category'       => '0',
+			'event_type'     => 'all'
+		);
+
+		$params = shortcode_atts( $defaults, $atts );
+
+		if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+			$params['post_type'] = 'gd_place';
+		}
+
+		// Validate the selected category/ies - Grab the current list based on post_type
+		$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+		$categories        = get_terms( $category_taxonomy, array(
+			'orderby' => 'count',
+			'order'   => 'DESC',
+			'fields'  => 'ids'
+		) );
+
+		// Make sure we have an array
+		if ( ! ( is_array( $params['category'] ) ) ) {
+			$params['category'] = explode( ',', $params['category'] );
+		}
+
+		// Array_intersect returns only the items in $params['category'] that are also in our category list
+		// Otherwise it becomes empty and later on that will mean "All"
+		$params['category'] = array_intersect( $params['category'], $categories );
+
+		if ( $params['post_type'] == 'gd_event' ) {
+			$params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+		}
+
+		$params = gdsc_validate_map_args( $params );
+
+		$gd_sc_map_params = $params;
+
+		$query_args = array(
+			'posts_per_page' => 1000000, //@todo kiran why was this added? 
+			'is_geodir_loop' => true,
+			'gd_location'    => false,
+			'post_type'      => $params['post_type'],
+		);
+
+		if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
+			$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+
+			######### WPML #########
+			if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
+				$category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+			}
+			######### WPML #########
+
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field'    => 'id',
+				'terms'    => $params['category']
+			);
+
+			$query_args['tax_query'] = array( $tax_query );
+		}
+
+		$add_post_in_marker_array = true;
+
+		if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+			global $geodir_event_widget_listview;
+			$geodir_event_widget_listview = true;
+
+			$query_args['geodir_event_type'] = $params['event_type'];
+
+			$listings = geodir_event_get_widget_events( $query_args );
+
+			$geodir_event_widget_listview = false;
+		} else {
+			$listings = geodir_get_widget_listings( $query_args );
+		}
+
+		if ( ! empty( $listings ) ) {
+			foreach ( $listings as $listing ) {
+				create_marker_jason_of_posts( $listing );
+			}
+		}
+
+		ob_start();
+		add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+
+		add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+
+		add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+
+		$default_location = geodir_get_default_location();
+
+		$map_args = array(
+			'map_canvas_name'          => 'gd_listing_map',
+			'width'                    => $params['width'],
+			'height'                   => $params['height'],
+			'zoom'                     => $params['zoom'],
+			'autozoom'                 => $params['autozoom'],
+			'sticky'                   => $params['sticky'],
+			'showall'                  => $params['showall'],
+			'scrollwheel'              => $params['scrollwheel'],
+			'maptype'                  => $params['maptype'],
+			'child_collapse'           => 0,
+			'enable_cat_filters'       => false,
+			'enable_text_search'       => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters'  => false,
+			'enable_jason_on_load'     => true,
+			'ajax_url'                 => geodir_get_ajax_url(),
+			'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
+			'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+			'streetViewControl'        => true,
+			'showPreview'              => '0',
+			'maxZoom'                  => 21,
+			'bubble_size'              => 'small',
+		);
+
+		if ( is_single() ) {
+			global $post;
+			if ( isset( $post->post_latitude ) ) {
+				$map_args['latitude']  = $post->post_latitude;
+				$map_args['longitude'] = $post->post_longitude;
+			}
+
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+
+		// Add marker cluster
+		if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+
+		geodir_draw_map( $map_args );
+
+		$output = ob_get_contents();
+
+		ob_end_clean();
+
+		foreach ( $backup_globals as $global => $value ) {
+			${$global} = $value;
+		}
+
+		return $output;
+	}else{
+		ob_start();
+		add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
+		add_action('the_post', 'create_list_jsondata'); // Add marker in json array
+		add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
+		$defaults = array(
+			'width' => '294',
+			'height' => '370',
+			'zoom' => '13',
+			'autozoom' => '',
+			'sticky' => '',
+			'showall' => '0',
+			'scrollwheel' => '0',
+			'maptype' => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false
+		);
+		$params = shortcode_atts($defaults, $atts);
+		$params = gdsc_validate_map_args($params);
+		$map_args = array(
+			'map_canvas_name' => 'gd_listing_map',
+			'width' => $params['width'],
+			'height' => $params['height'],
+			'zoom' => $params['zoom'],
+			'autozoom' => $params['autozoom'],
+			'sticky' => $params['sticky'],
+			'showall' => $params['showall'],
+			'scrollwheel' => $params['scrollwheel'],
+			'child_collapse' => 0,
+			'enable_cat_filters' => false,
+			'enable_text_search' => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters' => false,
+			'enable_jason_on_load' => true,
+		);
+		if (is_single()) {
+			global $post;
+			$map_default_lat = $address_latitude = $post->post_latitude;
+			$map_default_lng = $address_longitude = $post->post_longitude;
+			$mapview = $post->post_mapview;
+			$map_args['zoom'] = $post->post_mapzoom;
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$default_location = geodir_get_default_location();
+			$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+		if (empty($mapview)) {
+			$mapview = 'ROADMAP';
+		}
+		// Set default map options
+		$map_args['ajax_url'] = geodir_get_ajax_url();
+		$map_args['latitude'] = $map_default_lat;
+		$map_args['longitude'] = $map_default_lng;
+		$map_args['streetViewControl'] = true;
+		$map_args['maptype'] = $mapview;
+		$map_args['showPreview'] = '0';
+		$map_args['maxZoom'] = 21;
+		$map_args['bubble_size'] = 'small';
+
+		// Add marker cluster
+		if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+		geodir_draw_map($map_args);
+		$output = ob_get_contents();
+		ob_end_clean();
+		return $output;
+	}
 }
 
 add_shortcode('gd_listing_slider', 'geodir_sc_listing_slider');
@@ -533,120 +533,120 @@ 
  */
 function geodir_sc_listing_slider($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'slideshow' => '0',
-        'animation_loop' => 0,
-        'direction_nav' => 0,
-        'slideshow_speed' => 5000,
-        'animation_speed' => 600,
-        'animation' => 'slide',
-        'order_by' => 'latest',
-        'show_title' => '',
-        'show_featured_only' => '',
-        'title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-
-    /*
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'slideshow' => '0',
+		'animation_loop' => 0,
+		'direction_nav' => 0,
+		'slideshow_speed' => 5000,
+		'animation_speed' => 600,
+		'animation' => 'slide',
+		'order_by' => 'latest',
+		'show_title' => '',
+		'show_featured_only' => '',
+		'title' => '',
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+
+	/*
      *
      * Now we begin the validation of the attributes.
      */
-    // Check we have a valid post_type
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Check we have a valid sort_order
-    $params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
-
-    // Match the chosen animation to our options
-    $animation_list = array('slide', 'fade');
-    if (!(in_array($params['animation'], $animation_list))) {
-        $params['animation'] = 'slide';
-    }
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Manage the entered categories
-    if (0 != $params['category'] || '' != $params['category']) {
-        $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
-    }
-    // Convert show_title to a bool
-    $params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
-
-    // Convert show_featured_only to a bool
-    $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
-
-    /*
+	// Check we have a valid post_type
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Check we have a valid sort_order
+	$params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
+
+	// Match the chosen animation to our options
+	$animation_list = array('slide', 'fade');
+	if (!(in_array($params['animation'], $animation_list))) {
+		$params['animation'] = 'slide';
+	}
+
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Manage the entered categories
+	if (0 != $params['category'] || '' != $params['category']) {
+		$params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
+	}
+	// Convert show_title to a bool
+	$params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
+
+	// Convert show_featured_only to a bool
+	$params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
+
+	/*
      * Hopefully all attributes are now valid, and safe to pass forward
      */
 
-    // redeclare vars after validation
-
-    if (isset($params['direction_nav'])) {
-        $params['directionNav'] = $params['direction_nav'];
-    }
-    if (isset($params['animation_loop'])) {
-        $params['animationLoop'] = $params['animation_loop'];
-    }
-    if (isset($params['slideshow_speed'])) {
-        $params['slideshowSpeed'] = $params['slideshow_speed'];
-    }
-    if (isset($params['animation_speed'])) {
-        $params['animationSpeed'] = $params['animation_speed'];
-    }
-    if (isset($params['order_by'])) {
-        $params['list_sort'] = $params['order_by'];
-    }
-
-    $query_args = array(
-        'post_number' => $params['post_number'],
-        'is_geodir_loop' => true,
-        'post_type' => $params['post_type'],
-        'order_by' => $params['order_by']
-    );
-
-    if (1 == $params['show_featured_only']) {
-        $query_args['show_featured_only'] = 1;
-    }
-
-    if (0 != $params['category'] && '' != $params['category']) {
-        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $params['category'],
-        );
-
-        $query_args['tax_query'] = array($tax_query);
-    }
-
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
-
-    $query_args = array_merge($query_args, $params);
-
-    geodir_listing_slider_widget_output($defaults, $query_args);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	// redeclare vars after validation
+
+	if (isset($params['direction_nav'])) {
+		$params['directionNav'] = $params['direction_nav'];
+	}
+	if (isset($params['animation_loop'])) {
+		$params['animationLoop'] = $params['animation_loop'];
+	}
+	if (isset($params['slideshow_speed'])) {
+		$params['slideshowSpeed'] = $params['slideshow_speed'];
+	}
+	if (isset($params['animation_speed'])) {
+		$params['animationSpeed'] = $params['animation_speed'];
+	}
+	if (isset($params['order_by'])) {
+		$params['list_sort'] = $params['order_by'];
+	}
+
+	$query_args = array(
+		'post_number' => $params['post_number'],
+		'is_geodir_loop' => true,
+		'post_type' => $params['post_type'],
+		'order_by' => $params['order_by']
+	);
+
+	if (1 == $params['show_featured_only']) {
+		$query_args['show_featured_only'] = 1;
+	}
+
+	if (0 != $params['category'] && '' != $params['category']) {
+		$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $params['category'],
+		);
+
+		$query_args['tax_query'] = array($tax_query);
+	}
+
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
+
+	$query_args = array_merge($query_args, $params);
+
+	geodir_listing_slider_widget_output($defaults, $query_args);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_login_box', 'geodir_sc_login_box');
@@ -670,22 +670,22 @@ 
  */
 function geodir_sc_login_box($atts)
 {
-    ob_start();
+	ob_start();
 
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
 
-    geodir_loginwidget_output($defaults, $defaults);
+	geodir_loginwidget_output($defaults, $defaults);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_popular_post_category', 'geodir_sc_popular_post_category');
@@ -716,31 +716,31 @@ 
  */
 function geodir_sc_popular_post_category($atts)
 {
-    ob_start();
-    global $geodir_post_category_str;
-    $defaults = array(
-        'category_limit' => 15,
-        'category_restrict' => false,
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-        'title' => '',
-        'default_post_type' => '',
-        'parent_only' => false,
-    );
-
-    $params = shortcode_atts($defaults, $atts, 'popular_post_category');
-    $params['category_limit'] = absint($params['category_limit']);
-    $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
-    $params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
-    geodir_popular_post_category_output($params, $params);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	global $geodir_post_category_str;
+	$defaults = array(
+		'category_limit' => 15,
+		'category_restrict' => false,
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+		'title' => '',
+		'default_post_type' => '',
+		'parent_only' => false,
+	);
+
+	$params = shortcode_atts($defaults, $atts, 'popular_post_category');
+	$params['category_limit'] = absint($params['category_limit']);
+	$params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
+	$params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
+	geodir_popular_post_category_output($params, $params);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view');
@@ -783,98 +783,98 @@ 
  */
 function geodir_sc_popular_post_view($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => '0',
-        'list_sort' => 'latest',
-        'use_viewing_post_type' => '1',
-        'character_count' => '20',
-        'listing_width' => '',
-        'show_featured_only' => '0',
-        'show_special_only' => '0',
-        'with_pics_only' => '0',
-        'with_videos_only' => '0',
-        'hide_if_empty' => '0',
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'title' => '',
-        'category_title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => '0',
+		'list_sort' => 'latest',
+		'use_viewing_post_type' => '1',
+		'character_count' => '20',
+		'listing_width' => '',
+		'show_featured_only' => '0',
+		'show_special_only' => '0',
+		'with_pics_only' => '0',
+		'with_videos_only' => '0',
+		'hide_if_empty' => '0',
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'title' => '',
+		'category_title' => '',
+	);
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-    $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category'] = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
-
-    // Validate character_count
-    if ($params['character_count'] !== '') {
-        $params['character_count'] = absint($params['character_count']);
-    }
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
-    $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
-    $params['hide_if_empty'] = gdsc_to_bool_val($params['hide_if_empty']);
-
-    /**
-     * End of validation
-     */
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Validate our incoming params
+	 */
+
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+	$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
 
-    geodir_popular_postview_output($params, $params);
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category'] = array_intersect($params['category'], $categories);
 
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
+
+	// Validate character_count
+	if ($params['character_count'] !== '') {
+		$params['character_count'] = absint($params['character_count']);
+	}
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    $output = ob_get_contents();
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
+	$params['hide_if_empty'] = gdsc_to_bool_val($params['hide_if_empty']);
 
-    ob_end_clean();
+	/**
+	 * End of validation
+	 */
 
-    return $output;
+	geodir_popular_postview_output($params, $params);
+
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews');
@@ -896,37 +896,37 @@ 
  * @return string Recent reviews HTML.
  */
 function geodir_sc_recent_reviews($atts) {
-    ob_start();
-    $defaults = array(
+	ob_start();
+	$defaults = array(
 		'title' => '',
 		'count' => 5,
-    );
+	);
 
-    $params = shortcode_atts($defaults, $atts);
+	$params = shortcode_atts($defaults, $atts);
 
-    $count = absint($params['count']);
-    if (0 == $count) {
-        $count = 1;
-    }
+	$count = absint($params['count']);
+	if (0 == $count) {
+		$count = 1;
+	}
 	
 	$title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
 
-    $comments_li = geodir_get_recent_reviews(30, $count, 100, false);
+	$comments_li = geodir_get_recent_reviews(30, $count, 100, false);
 
-    if ($comments_li) {
-        if ($title != '') { ?>
+	if ($comments_li) {
+		if ($title != '') { ?>
 		<h3 class="geodir-sc-recent-reviews-title widget-title"><?php echo $title; ?></h3>
 		<?php } ?>
         <div class="geodir_sc_recent_reviews_section">
             <ul class="geodir_sc_recent_reviews"><?php echo $comments_li; ?></ul>
         </div>
     <?php
-    }
-    $output = ob_get_contents();
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_related_listings', 'geodir_sc_related_listings');
@@ -956,63 +956,63 @@ 
  */
 function geodir_sc_related_listings($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_number' => 5,
-        'relate_to' => 'category',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => 0,
-        'listing_width' => '',
-        'list_sort' => 'latest',
-        'character_count' => 20,
-        'is_widget' => 1,
-        'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
-    );
-    // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Begin validating parameters
-     */
+	ob_start();
+	$defaults = array(
+		'post_number' => 5,
+		'relate_to' => 'category',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => 0,
+		'listing_width' => '',
+		'list_sort' => 'latest',
+		'character_count' => 20,
+		'is_widget' => 1,
+		'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
+	);
+	// The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
 
-    // Validate that post_number is a number and is 1 or higher
-    $params['post_number'] = absint($params['post_number']);
-    if (0 === $params['post_number']) {
-        $params['post_number'] = 1;
-    }
+	$params = shortcode_atts($defaults, $atts);
 
-    // Validate relate_to - only category or tags
-    $params['relate_to'] = geodir_strtolower($params['relate_to']);
-    if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
-        $params['relate_to'] = 'category';
-    }
+	/**
+	 * Begin validating parameters
+	 */
 
-    // Validate layout selection
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
+	// Validate that post_number is a number and is 1 or higher
+	$params['post_number'] = absint($params['post_number']);
+	if (0 === $params['post_number']) {
+		$params['post_number'] = 1;
+	}
 
-    // Validate sorting option
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+	// Validate relate_to - only category or tags
+	$params['relate_to'] = geodir_strtolower($params['relate_to']);
+	if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
+		$params['relate_to'] = 'category';
+	}
+
+	// Validate layout selection
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
-    // Validate add_location_filter
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	// Validate sorting option
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    // Validate listing_width
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+	// Validate add_location_filter
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
 
-    // Validate character_count
-    if ($params['character_count'] !== '') {
-        $params['character_count'] = absint($params['character_count']);
-    }
+	// Validate listing_width
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    if ($related_display = geodir_related_posts_display($params)) {
-        echo $related_display;
-    }
-    $output = ob_get_contents();
+	// Validate character_count
+	if ($params['character_count'] !== '') {
+		$params['character_count'] = absint($params['character_count']);
+	}
+
+	if ($related_display = geodir_related_posts_display($params)) {
+		echo $related_display;
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 /**
@@ -1036,13 +1036,13 @@ 
  * @return string Advanced search widget HTML.
  */
 function geodir_sc_advanced_search($atts) {
-    $defaults = array(
+	$defaults = array(
 		'title' => '',
 		'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advance_search_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'show_adv_search' => 'default',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'show_adv_search' => 'default',
 		'post_type' => ''
 	);
 	
@@ -1066,9 +1066,9 @@ 
 	the_widget('geodir_advance_search_widget', $params, $params );
 	
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_advanced_search', 'geodir_sc_advanced_search');
 
@@ -1114,48 +1114,48 @@ 
 		'add_location_filter' => '1',
 		'tab_layout' => 'bestof-tabs-on-top',
 		'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-    /**
-     * Validate our incoming params
-     */
+	/**
+	 * Validate our incoming params
+	 */
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 	
 	// Post limit needs to be a positive integer
-    $params['post_limit'] = absint($params['post_limit']);
-    if (0 == $params['post_limit']) {
-        $params['post_limit'] = 5;
-    }
+	$params['post_limit'] = absint($params['post_limit']);
+	if (0 == $params['post_limit']) {
+		$params['post_limit'] = 5;
+	}
 	
 	// Category limit needs to be a positive integer
-    $params['categ_limit'] = absint($params['categ_limit']);
-    if (0 == $params['categ_limit']) {
-        $params['categ_limit'] = 3;
-    }
+	$params['categ_limit'] = absint($params['categ_limit']);
+	if (0 == $params['categ_limit']) {
+		$params['categ_limit'] = 3;
+	}
 	
 	// Tab layout validation
-    $params['tab_layout'] = $params['tab_layout'];
-    if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
-        $params['tab_layout'] = 'bestof-tabs-on-top';
-    }
+	$params['tab_layout'] = $params['tab_layout'];
+	if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
+		$params['tab_layout'] = 'bestof-tabs-on-top';
+	}
 	
 	// Validate character_count
-    $params['character_count'] = $params['character_count'];
+	$params['character_count'] = $params['character_count'];
 
 	ob_start();
 	the_widget('geodir_bestof_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_bestof_widget', 'geodir_sc_bestof_widget');
 
@@ -1208,162 +1208,162 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-    global $post;
-    $defaults = array(
-        'title'                 => '',
-        'post_type'             => 'gd_place',
-        'category'              => 0,
-        'list_sort'             => 'latest',
-        'event_type'            => '',
-        'post_number'           => 10,
-        'post_author'           => '',
-        'layout'                => 'gridview_onehalf',
-        'listing_width'         => '',
-        'character_count'       => 20,
-        'add_location_filter'   => 1,
-        'show_featured_only'    => '',
-        'show_special_only'     => '',
-        'with_pics_only'        => '',
-        'with_videos_only'      => '',
-        'with_pagination'       => '1',
-        'top_pagination'        => '0',
-        'bottom_pagination'     => '1',
-        'without_no_results'    => 0,
-        'tags'                  => '',
-        'show_favorites_only'   => '',
-        'favorites_by_user'     => '',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    $params['title']        = wp_strip_all_tags($params['title']);
-    $params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy      = geodir_get_taxonomies($params['post_type']);
-    $categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids', 'hide_empty' => 0));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category']     = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number']  = absint($params['post_number']);
-    $params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
+	global $post;
+	$defaults = array(
+		'title'                 => '',
+		'post_type'             => 'gd_place',
+		'category'              => 0,
+		'list_sort'             => 'latest',
+		'event_type'            => '',
+		'post_number'           => 10,
+		'post_author'           => '',
+		'layout'                => 'gridview_onehalf',
+		'listing_width'         => '',
+		'character_count'       => 20,
+		'add_location_filter'   => 1,
+		'show_featured_only'    => '',
+		'show_special_only'     => '',
+		'with_pics_only'        => '',
+		'with_videos_only'      => '',
+		'with_pagination'       => '1',
+		'top_pagination'        => '0',
+		'bottom_pagination'     => '1',
+		'without_no_results'    => 0,
+		'tags'                  => '',
+		'show_favorites_only'   => '',
+		'favorites_by_user'     => '',
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	$params['title']        = wp_strip_all_tags($params['title']);
+	$params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy      = geodir_get_taxonomies($params['post_type']);
+	$categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids', 'hide_empty' => 0));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category']     = array_intersect($params['category'], $categories);
+
+	// Post_number needs to be a positive integer
+	$params['post_number']  = absint($params['post_number']);
+	$params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
     
-    // Post_number needs to be a positive integer
-    if (!empty($params['post_author'])) {
-        // 'current' left for backwards compatibility
-        if ( $params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
-            if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
-                $params['post_author'] = $post->post_author;
-            } else {
-                $params['post_author'] = -1; // Don't show any listings.
-            }
-        } else if ($params['post_author'] == 'current_user' ) {
-            if ($current_user_id = get_current_user_id()) {
-                $params['post_author'] = $current_user_id;
-            } else {
-                $params['post_author'] = -1; // If not logged in then don't show any listings.
-            }
-        } else if (absint($params['post_author']) > 0) {
-            $params['post_author'] = absint($params['post_author']);
-        } else {
-            $params['post_author'] = -1; // Don't show any listings.
-        }
-    } else {
-        unset($params['post_author']);
-    }
-
-    // Validate character_count
-    //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout']           = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort']        = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
-    $params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
-    $params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
-    $params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
+	// Post_number needs to be a positive integer
+	if (!empty($params['post_author'])) {
+		// 'current' left for backwards compatibility
+		if ( $params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
+			if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
+				$params['post_author'] = $post->post_author;
+			} else {
+				$params['post_author'] = -1; // Don't show any listings.
+			}
+		} else if ($params['post_author'] == 'current_user' ) {
+			if ($current_user_id = get_current_user_id()) {
+				$params['post_author'] = $current_user_id;
+			} else {
+				$params['post_author'] = -1; // If not logged in then don't show any listings.
+			}
+		} else if (absint($params['post_author']) > 0) {
+			$params['post_author'] = absint($params['post_author']);
+		} else {
+			$params['post_author'] = -1; // Don't show any listings.
+		}
+	} else {
+		unset($params['post_author']);
+	}
+
+	// Validate character_count
+	//todo: is this necessary?
+	$params['character_count']  = $params['character_count'];
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout']           = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort']        = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
+	$params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
+	$params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
+	$params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
     
-    // User favorites
-    $params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
-    if (!empty($params['show_favorites_only'])) {
-        if ( $params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
-            if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
-                $params['favorites_by_user'] = $post->post_author;
-            } else {
-                $params['favorites_by_user'] = 0;
-            }
-        } else if ($params['favorites_by_user'] == 'current_user' || empty($params['favorites_by_user'])) {
-            if ($current_user_id = get_current_user_id()) {
-                $params['favorites_by_user'] = $current_user_id;
-            } else {
-                $params['favorites_by_user'] = 0;
-            }
-        } else if (absint($params['favorites_by_user']) > 0) {
-            $params['favorites_by_user'] = absint($params['favorites_by_user']);
-        } else {
-            $params['favorites_by_user'] = 0;
-        }
-    }
-
-    // Clean tags
-    if (!empty($params['tags'])) {
-        if (!is_array($params['tags'])) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $params['tags'] = str_replace($comma, ',', $params['tags']);
-            }
-            $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
-            $params['tags'] = array_map('trim', $params['tags']);
-        }
-    } else {
-        $params['tags'] = array();
-    }
-
-    /**
-     * End of validation
-     */
-    if (isset($atts['geodir_ajax'])) {
-        $params['geodir_ajax'] = $atts['geodir_ajax'];
-        unset($atts['geodir_ajax']);
-    }
-    if (isset($atts['pageno'])) {
-        $params['pageno'] = $atts['pageno'];
-        unset($atts['pageno']);
-    }
-
-    if ( !empty($atts['shortcode_content']) ) {
-        $content = $atts['shortcode_content'];
-    }
-    $params['shortcode_content'] = trim($content);
-    $atts['shortcode_content'] = trim($content);
+	// User favorites
+	$params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
+	if (!empty($params['show_favorites_only'])) {
+		if ( $params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
+			if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
+				$params['favorites_by_user'] = $post->post_author;
+			} else {
+				$params['favorites_by_user'] = 0;
+			}
+		} else if ($params['favorites_by_user'] == 'current_user' || empty($params['favorites_by_user'])) {
+			if ($current_user_id = get_current_user_id()) {
+				$params['favorites_by_user'] = $current_user_id;
+			} else {
+				$params['favorites_by_user'] = 0;
+			}
+		} else if (absint($params['favorites_by_user']) > 0) {
+			$params['favorites_by_user'] = absint($params['favorites_by_user']);
+		} else {
+			$params['favorites_by_user'] = 0;
+		}
+	}
+
+	// Clean tags
+	if (!empty($params['tags'])) {
+		if (!is_array($params['tags'])) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$params['tags'] = str_replace($comma, ',', $params['tags']);
+			}
+			$params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
+			$params['tags'] = array_map('trim', $params['tags']);
+		}
+	} else {
+		$params['tags'] = array();
+	}
+
+	/**
+	 * End of validation
+	 */
+	if (isset($atts['geodir_ajax'])) {
+		$params['geodir_ajax'] = $atts['geodir_ajax'];
+		unset($atts['geodir_ajax']);
+	}
+	if (isset($atts['pageno'])) {
+		$params['pageno'] = $atts['pageno'];
+		unset($atts['pageno']);
+	}
+
+	if ( !empty($atts['shortcode_content']) ) {
+		$content = $atts['shortcode_content'];
+	}
+	$params['shortcode_content'] = trim($content);
+	$atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+	$params['shortcode_atts']       = $atts;
 
-    $output = geodir_sc_gd_listings_output($params);
+	$output = geodir_sc_gd_listings_output($params);
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_listings', 'geodir_sc_gd_listings');
 
@@ -1403,56 +1403,56 @@ 
  * @return string HTML content to display CPT categories.
  */
 function geodir_sc_cpt_categories_widget($atts, $content = '') {
-    $defaults = array(
-        'title' => '',
-        'post_type' => '', // NULL for all
-        'hide_empty' => '',
-        'show_count' => '',
-        'hide_icon' => '',
-        'cpt_left' => '',
-        'sort_by' => 'count',
-        'max_count' => 'all',
-        'max_level' => '1',
-        'no_cpt_filter' => '',
-        'no_cat_filter' => '',
-        'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
-    // Make sure we have an array
-    $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
-     
-    // Validate the checkboxes used on the widget
-    $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
-    $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+	$defaults = array(
+		'title' => '',
+		'post_type' => '', // NULL for all
+		'hide_empty' => '',
+		'show_count' => '',
+		'hide_icon' => '',
+		'cpt_left' => '',
+		'sort_by' => 'count',
+		'max_count' => 'all',
+		'max_level' => '1',
+		'no_cpt_filter' => '',
+		'no_cat_filter' => '',
+		'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+	);
+	$params = shortcode_atts($defaults, $atts);
 
-    if ($params['max_count'] != 'all') {
-        $params['max_count'] = absint($params['max_count']);
-    }
+	/**
+	 * Validate our incoming params
+	 */
+	// Make sure we have an array
+	$params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
+     
+	// Validate the checkboxes used on the widget
+	$params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
+	$params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
+	$params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
+	$params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+
+	if ($params['max_count'] != 'all') {
+		$params['max_count'] = absint($params['max_count']);
+	}
 
-    if ($params['max_level'] != 'all') {
-        $params['max_level'] = absint($params['max_level']);
-    }
+	if ($params['max_level'] != 'all') {
+		$params['max_level'] = absint($params['max_level']);
+	}
 
-    $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
-    $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
+	$params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
+	$params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
 
-    $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
+	$params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
 
-    ob_start();
-    the_widget('geodir_cpt_categories_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	ob_start();
+	the_widget('geodir_cpt_categories_widget', $params, $params);
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget');
 
@@ -1467,6 +1467,6 @@ 
  * @return string HTML code.
  */
 function geodir_sc_responsive_videos($atts, $content) {
-    return '<div class="geodir-video-wrapper">'.$content.'</div>';
+	return '<div class="geodir-video-wrapper">'.$content.'</div>';
 }
 add_shortcode('gd_video', 'geodir_sc_responsive_videos');
\ No newline at end of file

Spacing +52 added lines, -52 removed lines

@@ -197,14 +197,14 @@ 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
         $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
+        if (get_option('geodir_marker_cluster_type')) {
             if ($map_args['autozoom']) {
                 $map_args['enable_marker_cluster_no_reposition'] = false;
             } else {
                 $map_args['enable_marker_cluster_no_reposition'] = true;
             }
 
-            $map_args['enable_marker_cluster_server'] = true ;
+            $map_args['enable_marker_cluster_server'] = true;
 
         }
 	} else {
@@ -212,7 +212,7 @@ 
 	}
 
     // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
+    if (!empty($params['latitude']) && !empty($params['longitude'])) {
         $map_args['enable_marker_cluster_no_reposition'] = true;
     }
 
@@ -265,7 +265,7 @@ 
 function geodir_sc_listing_map($atts) {
 
     // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+    if (isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type'])) {
 
         global $add_post_in_marker_array, $gd_sc_map_params;
         $backup_globals                             = array();
@@ -288,34 +288,34 @@ 
             'event_type'     => 'all'
         );
 
-        $params = shortcode_atts( $defaults, $atts );
+        $params = shortcode_atts($defaults, $atts);
 
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+        if (!(gdsc_is_post_type_valid($params['post_type']))) {
             $params['post_type'] = 'gd_place';
         }
 
         // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
+        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
+        $categories        = get_terms($category_taxonomy, array(
             'orderby' => 'count',
             'order'   => 'DESC',
             'fields'  => 'ids'
-        ) );
+        ));
 
         // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
+        if (!(is_array($params['category']))) {
+            $params['category'] = explode(',', $params['category']);
         }
 
         // Array_intersect returns only the items in $params['category'] that are also in our category list
         // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
+        $params['category'] = array_intersect($params['category'], $categories);
 
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+        if ($params['post_type'] == 'gd_event') {
+            $params['event_type'] = gdsc_validate_list_filter_choice($params['event_type']);
         }
 
-        $params = gdsc_validate_map_args( $params );
+        $params = gdsc_validate_map_args($params);
 
         $gd_sc_map_params = $params;
 
@@ -326,12 +326,12 @@ 
             'post_type'      => $params['post_type'],
         );
 
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+        if (!empty($params['category']) && isset($params['category'][0]) && (int) $params['category'][0] != 0) {
+            $category_taxonomy = geodir_get_taxonomies($params['post_type']);
 
             ######### WPML #########
-            if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+            if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
+                $category = gd_lang_object_ids($params['category'], $category_taxonomy[0]);
             }
             ######### WPML #########
 
@@ -341,36 +341,36 @@ 
                 'terms'    => $params['category']
             );
 
-            $query_args['tax_query'] = array( $tax_query );
+            $query_args['tax_query'] = array($tax_query);
         }
 
         $add_post_in_marker_array = true;
 
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+        if ($params['post_type'] == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
             global $geodir_event_widget_listview;
             $geodir_event_widget_listview = true;
 
             $query_args['geodir_event_type'] = $params['event_type'];
 
-            $listings = geodir_event_get_widget_events( $query_args );
+            $listings = geodir_event_get_widget_events($query_args);
 
             $geodir_event_widget_listview = false;
         } else {
-            $listings = geodir_get_widget_listings( $query_args );
+            $listings = geodir_get_widget_listings($query_args);
         }
 
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
+        if (!empty($listings)) {
+            foreach ($listings as $listing) {
+                create_marker_jason_of_posts($listing);
             }
         }
 
         ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
 
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
 
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
 
         $default_location = geodir_get_default_location();
 
@@ -391,17 +391,17 @@ 
             'enable_location_filters'  => false,
             'enable_jason_on_load'     => true,
             'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+            'latitude'                 => isset($default_location->city_latitude) ? $default_location->city_latitude : '',
+            'longitude'                => isset($default_location->city_longitude) ? $default_location->city_longitude : '',
             'streetViewControl'        => true,
             'showPreview'              => '0',
             'maxZoom'                  => 21,
             'bubble_size'              => 'small',
         );
 
-        if ( is_single() ) {
+        if (is_single()) {
             global $post;
-            if ( isset( $post->post_latitude ) ) {
+            if (isset($post->post_latitude)) {
                 $map_args['latitude']  = $post->post_latitude;
                 $map_args['longitude'] = $post->post_longitude;
             }
@@ -412,24 +412,24 @@ 
         }
 
         // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
             $map_args['enable_marker_cluster'] = true;
         } else {
             $map_args['enable_marker_cluster'] = false;
         }
 
-        geodir_draw_map( $map_args );
+        geodir_draw_map($map_args);
 
         $output = ob_get_contents();
 
         ob_end_clean();
 
-        foreach ( $backup_globals as $global => $value ) {
+        foreach ($backup_globals as $global => $value) {
             ${$global} = $value;
         }
 
         return $output;
-    }else{
+    } else {
         ob_start();
         add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
         add_action('the_post', 'create_list_jsondata'); // Add marker in json array
@@ -1050,20 +1050,20 @@ 
 	
 	$show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
 	
-	if ($show_adv_search != '' ) {
-		$show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
+	if ($show_adv_search != '') {
+		$show_adv_class = 'geodir-advance-search-'.$show_adv_search.' ';
 		if ($show_adv_search == 'searched' && geodir_is_page('search')) {
 			$show_adv_search = 'search';
 		}
-		$show_adv_attrs = 'data-show-adv="' . $show_adv_search . '"';
+		$show_adv_attrs = 'data-show-adv="'.$show_adv_search.'"';
 		
-		$params['before_widget'] = str_replace('class="', $show_adv_attrs . ' class="' . $show_adv_class, $params['before_widget']);
+		$params['before_widget'] = str_replace('class="', $show_adv_attrs.' class="'.$show_adv_class, $params['before_widget']);
 	}
 	
 	ob_start();
 	
 	//geodir_get_template_part('listing', 'filter-form');
-	the_widget('geodir_advance_search_widget', $params, $params );
+	the_widget('geodir_advance_search_widget', $params, $params);
 	
 	$output = ob_get_contents();
     ob_end_clean();
@@ -1258,13 +1258,13 @@ 
     // Post_number needs to be a positive integer
     if (!empty($params['post_author'])) {
         // 'current' left for backwards compatibility
-        if ( $params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
+        if ($params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
             if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
                 $params['post_author'] = $post->post_author;
             } else {
                 $params['post_author'] = -1; // Don't show any listings.
             }
-        } else if ($params['post_author'] == 'current_user' ) {
+        } else if ($params['post_author'] == 'current_user') {
             if ($current_user_id = get_current_user_id()) {
                 $params['post_author'] = $current_user_id;
             } else {
@@ -1281,7 +1281,7 @@ 
 
     // Validate character_count
     //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
+    $params['character_count'] = $params['character_count'];
 
     // Validate our layout choice
     // Outside of the norm, I added some more simple terms to match the existing
@@ -1293,7 +1293,7 @@ 
 
     // Validate Listing width, used in the template widget-listing-listview.php
     // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
     // Validate the checkboxes used on the widget
     $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
@@ -1308,7 +1308,7 @@ 
     // User favorites
     $params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
     if (!empty($params['show_favorites_only'])) {
-        if ( $params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
+        if ($params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
             if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
                 $params['favorites_by_user'] = $post->post_author;
             } else {
@@ -1331,7 +1331,7 @@ 
     if (!empty($params['tags'])) {
         if (!is_array($params['tags'])) {
             $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
+            if (',' !== $comma) {
                 $params['tags'] = str_replace($comma, ',', $params['tags']);
             }
             $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
@@ -1353,13 +1353,13 @@ 
         unset($atts['pageno']);
     }
 
-    if ( !empty($atts['shortcode_content']) ) {
+    if (!empty($atts['shortcode_content'])) {
         $content = $atts['shortcode_content'];
     }
     $params['shortcode_content'] = trim($content);
     $atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+    $params['shortcode_atts'] = $atts;
 
     $output = geodir_sc_gd_listings_output($params);
 
@@ -1431,8 +1431,8 @@ 
     // Validate the checkboxes used on the widget
     $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
     $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+    $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']);
+    $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']);
 
     if ($params['max_count'] != 'all') {
         $params['max_count'] = absint($params['max_count']);

geodirectory-admin/option-pages/notifications_settings_array.php

Spacing +9 added lines, -9 removed lines

@@ -129,7 +129,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject_admin',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

      array(

         'name' => '',

@@ -137,7 +137,7 @@ 
         'id' => 'geodir_post_submited_success_email_content_admin',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>', 'geodirectory')

     ),

     array(

         'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

@@ -188,7 +188,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -196,7 +196,7 @@ 
         'id' => 'geodir_post_submited_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -214,7 +214,7 @@ 
         'id' => 'geodir_forgot_password_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array(

@@ -231,7 +231,7 @@ 
         'id' => 'geodir_registration_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

     array(

         'name' => __('Listing published email', 'geodirectory'),

@@ -270,7 +270,7 @@ 
         'id' => 'geodir_email_friend_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>", 'geodirectory')

     ),

 

     array(

@@ -287,7 +287,7 @@ 
         'id' => 'geodir_email_enquiry_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array('type' => 'sectionend', 'id' => 'other_emails'),

@@ -303,7 +303,7 @@ 
         'id' => 'geodir_post_added_success_msg_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>', 'geodirectory')

     ),

 

 

Indentation +309 added lines, -309 removed lines

@@ -17,314 +17,314 @@
 $geodir_settings['notifications_settings'] = apply_filters('geodir_notifications_settings', array(

 

 

-    array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

-

-

-    array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

-

-    array(

-        'name' => __('List of usable shortcodes', 'geodirectory'),

-        'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

-        'id' => 'geodir_list_of_usable_shordcodes',

-        'type' => 'html_content',

-        'css' => 'min-width:300px;',

-        'std' => 'All Places' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'notification_options'),

-

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

-

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'site_bcc_options'),

-

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

-

-    array(

-        'name' => __('Notify to admin on post submit', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_notify_post_submit',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Notify to admin on post submit', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_notify_post_submit',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Post submit success to admin email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-     array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Listing edited by Author', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'admin_emails'),

-

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

-

-    array(

-        'name' => __('Post submit success to client email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

-    ),

-

-

-    array(

-        'name' => __('User forgot password email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_forgot_password_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_forgot_password_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Registration success email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-    array(

-        'name' => __('Listing published email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_published_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_published_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'client_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_friend_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_friend_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Email enquiry', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Website Enquiry', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'other_emails'),

-

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

-

-    array(

-        'name' => __('Post submitted success', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_added_success_msg_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'messages'),

+	array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

+

+

+	array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

+

+	array(

+		'name' => __('List of usable shortcodes', 'geodirectory'),

+		'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

+		'id' => 'geodir_list_of_usable_shordcodes',

+		'type' => 'html_content',

+		'css' => 'min-width:300px;',

+		'std' => 'All Places' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'notification_options'),

+

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

+

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'site_bcc_options'),

+

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

+

+	array(

+		'name' => __('Notify to admin on post submit', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_notify_post_submit',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Notify to admin on post submit', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_notify_post_submit',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Post submit success to admin email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	 array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Listing edited by Author', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'admin_emails'),

+

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

+

+	array(

+		'name' => __('Post submit success to client email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+	),

+

+

+	array(

+		'name' => __('User forgot password email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_forgot_password_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_forgot_password_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Registration success email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+	array(

+		'name' => __('Listing published email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_published_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_published_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'client_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_friend_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_friend_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Email enquiry', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Website Enquiry', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'other_emails'),

+

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

+

+	array(

+		'name' => __('Post submitted success', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_added_success_msg_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'messages'),

 

 )); // End Manage NOtifications settings

geodirectory-admin/option-pages/general_settings_array.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     ),

     array('type' => 'sectionend', 'id' => 'general_options'),

 

-));/* General Options End*/

+)); /* General Options End*/

 

 /**

  * Filter GD Google Analytic Settings array.

Indentation +273 added lines, -273 removed lines

@@ -16,92 +16,92 @@ 
  */

 $general_options = apply_filters('geodir_general_options', array(

 

-    array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

-

-    array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

-

-    array(

-        'name' => __('Sender name', 'geodirectory'),

-        'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

-        'id' => 'site_email_name',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => get_bloginfo('name') // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Email address', 'geodirectory'),

-        'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

-        'id' => 'site_email',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_allow_cpass',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_allow_cpass',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Disable review stars for CPT', 'geodirectory'),

-        'desc' => __('Disable review stars for certain CPT without disabling comments on listings.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_disable_rating_cpt',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

-    array(

-        'name' => __('User deleted posts go to trash', 'geodirectory'),

-        'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

-        'id' => 'geodir_disable_perm_delete',

-        'type' => 'checkbox',

-        'std' => '1'

-    ),

-    array(

-        'name' => __('Max upload file size(in mb)', 'geodirectory'),

-        'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2. This setting will overwrite the max upload file size limit in image/file upload & import listings for entire GeoDirectory core + GeoDirectory plugins.)', 'geodirectory'),

-        'id' => 'geodir_upload_max_filesize',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '2'

-    ),

-    array('type' => 'sectionend', 'id' => 'general_options'),

+	array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

+

+	array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

+

+	array(

+		'name' => __('Sender name', 'geodirectory'),

+		'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

+		'id' => 'site_email_name',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => get_bloginfo('name') // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Email address', 'geodirectory'),

+		'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

+		'id' => 'site_email',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_allow_cpass',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_allow_cpass',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Disable review stars for CPT', 'geodirectory'),

+		'desc' => __('Disable review stars for certain CPT without disabling comments on listings.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_disable_rating_cpt',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+	array(

+		'name' => __('User deleted posts go to trash', 'geodirectory'),

+		'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

+		'id' => 'geodir_disable_perm_delete',

+		'type' => 'checkbox',

+		'std' => '1'

+	),

+	array(

+		'name' => __('Max upload file size(in mb)', 'geodirectory'),

+		'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2. This setting will overwrite the max upload file size limit in image/file upload & import listings for entire GeoDirectory core + GeoDirectory plugins.)', 'geodirectory'),

+		'id' => 'geodir_upload_max_filesize',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '2'

+	),

+	array('type' => 'sectionend', 'id' => 'general_options'),

 

 ));/* General Options End*/

 

@@ -113,104 +113,104 @@ 
  */

 $google_analytic_settings = apply_filters('geodir_google_analytic_settings', array(

 

-    array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

-

-    array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

-

-

-

-    array(

-        'name' => __('Show business owner google analytics stats?', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_ga_stats',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_ga_stats',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Google analytics access', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_ga_token',

-        'type' => 'google_analytics',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Google analytics Auth Code', 'geodirectory'),

-        'desc' => __('You must save this setting before accounts will show.', 'geodirectory'),

-        'id' => 'geodir_ga_auth_code',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Analytics Account', 'geodirectory'),

-        'desc' => __('Select the account that you setup for this site.', 'geodirectory'),

-        'id' => 'geodir_ga_account_id',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => geodir_gd_accounts()

-    ),

-

-

-    array(

-        'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

-        'desc' => __('Yes <small>(this will automatically add the correct tracking code to your site)</small>', 'geodirectory'),

-        'id' => 'geodir_ga_add_tracking_code',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

-        'desc' => __('No <small>(if you already have tracking code added you should not add it again)</small>', 'geodirectory'),

-        'id' => 'geodir_ga_add_tracking_code',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Anonymize user IP?', 'geodirectory'),

-        'desc' => __('In most cases this is not required, this is to comply with certain country laws such as Germany.', 'geodirectory'),

-        'id' => 'geodir_ga_anonymize_ip',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-

-    array(

-        'name' => __('Auto refresh active users?', 'geodirectory'),

-        'desc' => __('If ticked it uses the auto refresh time below, if not it never refreshes unless the refresh button is clicked.', 'geodirectory'),

-        'id' => 'geodir_ga_auto_refresh',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Time interval for auto refresh active users', 'geodirectory'),

-        'desc' => __('Time interval in seconds to auto refresh active users. The active users will be auto refreshed after this time interval. Leave blank or use 0(zero) to disable auto refresh. Default: 5', 'geodirectory'),

-        'id' => 'geodir_ga_refresh_time',

-        'type' => 'text',

-        'std' => '5'

-    ),

-

-    array('type' => 'sectionend', 'id' => 'google_analytic_settings'),

+	array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

+

+	array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

+

+

+

+	array(

+		'name' => __('Show business owner google analytics stats?', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_ga_stats',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_ga_stats',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Google analytics access', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_ga_token',

+		'type' => 'google_analytics',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Google analytics Auth Code', 'geodirectory'),

+		'desc' => __('You must save this setting before accounts will show.', 'geodirectory'),

+		'id' => 'geodir_ga_auth_code',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Analytics Account', 'geodirectory'),

+		'desc' => __('Select the account that you setup for this site.', 'geodirectory'),

+		'id' => 'geodir_ga_account_id',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => geodir_gd_accounts()

+	),

+

+

+	array(

+		'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

+		'desc' => __('Yes <small>(this will automatically add the correct tracking code to your site)</small>', 'geodirectory'),

+		'id' => 'geodir_ga_add_tracking_code',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

+		'desc' => __('No <small>(if you already have tracking code added you should not add it again)</small>', 'geodirectory'),

+		'id' => 'geodir_ga_add_tracking_code',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Anonymize user IP?', 'geodirectory'),

+		'desc' => __('In most cases this is not required, this is to comply with certain country laws such as Germany.', 'geodirectory'),

+		'id' => 'geodir_ga_anonymize_ip',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+

+	array(

+		'name' => __('Auto refresh active users?', 'geodirectory'),

+		'desc' => __('If ticked it uses the auto refresh time below, if not it never refreshes unless the refresh button is clicked.', 'geodirectory'),

+		'id' => 'geodir_ga_auto_refresh',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Time interval for auto refresh active users', 'geodirectory'),

+		'desc' => __('Time interval in seconds to auto refresh active users. The active users will be auto refreshed after this time interval. Leave blank or use 0(zero) to disable auto refresh. Default: 5', 'geodirectory'),

+		'id' => 'geodir_ga_refresh_time',

+		'type' => 'text',

+		'std' => '5'

+	),

+

+	array('type' => 'sectionend', 'id' => 'google_analytic_settings'),

 

 )); // google_analytic_settings End

 

@@ -222,84 +222,84 @@ 
  */

 $search_settings = apply_filters('geodir_search_settings', array(

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

-

-    array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

-

-    array(

-        'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

-        'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

-        'id' => 'geodir_search_dist',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '40' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

-        'desc' => __('Miles', 'geodirectory'),

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'miles',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

-        'desc' => __('Kilometers', 'geodirectory'),

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'km',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

-        'desc' => __('Meters', 'geodirectory'),

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'meters',

-        'radiogroup' => 'start'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

-        'desc' => __('Feet', 'geodirectory'),

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'feet',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

-        'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

-        'id' => 'geodir_search_near_addition',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => ''

-    ),

-    array(

-        'name' => __('Individual word search limit', 'geodirectory'),

-        'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

-        'id' => 'geodir_search_word_limit',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            '0' => __('Disabled', 'geodirectory'),

-            '1' => __('1 Character words excluded', 'geodirectory'),

-            '2' => __('2 Character words and less excluded', 'geodirectory'),

-            '3' => __('3 Character words and less excluded', 'geodirectory'),

-        ))

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'search_settings'),

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

+

+	array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

+

+	array(

+		'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

+		'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

+		'id' => 'geodir_search_dist',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '40' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

+		'desc' => __('Miles', 'geodirectory'),

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'miles',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

+		'desc' => __('Kilometers', 'geodirectory'),

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'km',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

+		'desc' => __('Meters', 'geodirectory'),

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'meters',

+		'radiogroup' => 'start'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

+		'desc' => __('Feet', 'geodirectory'),

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'feet',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

+		'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

+		'id' => 'geodir_search_near_addition',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => ''

+	),

+	array(

+		'name' => __('Individual word search limit', 'geodirectory'),

+		'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

+		'id' => 'geodir_search_word_limit',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'0' => __('Disabled', 'geodirectory'),

+			'1' => __('1 Character words excluded', 'geodirectory'),

+			'2' => __('2 Character words and less excluded', 'geodirectory'),

+			'3' => __('3 Character words and less excluded', 'geodirectory'),

+		))

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'search_settings'),

 

 )); //search_settings End

 

@@ -311,17 +311,17 @@ 
  */

 $dummy_data_settings = apply_filters('geodir_dummy_data_settings', array(

 

-    array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

-

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_dummy_data_installer',

-        'type' => 'dummy_installer',

-        'css' => 'min-width:300px;',

-        'std' => '40' // Default value for the page title - changed in settings

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_dummy_data_settings'),

+	array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

+

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_dummy_data_installer',

+		'type' => 'dummy_installer',

+		'css' => 'min-width:300px;',

+		'std' => '40' // Default value for the page title - changed in settings

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_dummy_data_settings'),

 

 )); //dummy_data_settings End

 

geodirectory-admin/google-api-php-client/src/Google/Task/Retryable.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**

geodirectory-admin/google-api-php-client/src/Google/Auth/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**

geodirectory-functions/comments_functions.php

Braces +60 added lines, -48 removed lines

@@ -278,8 +278,9 @@ 
 

     $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

 

-    if (!empty($comment_info))

-        $status = $comment_info->comment_approved;

+    if (!empty($comment_info)) {
+            $status = $comment_info->comment_approved;
+    }
 

     if ($status == 'approve' || $status == 1) {

         $status = 1;

@@ -418,12 +419,14 @@ 
         }

     } else {

         $rating = 0;

-        if (!empty($comment))

-            $rating = geodir_get_commentoverall($comment->comment_ID);

+        if (!empty($comment)) {
+                    $rating = geodir_get_commentoverall($comment->comment_ID);
+        }
         if ($rating != 0 && !is_admin()) {

             return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

-        } else

-            return $content;

+        } else {
+                    return $content;
+        }
     }

 }

 

@@ -512,11 +515,12 @@ 
         $post_ratings = get_post_meta($post_id, 'overall_rating');

     }

 

-    if ($post_ratings)

-        return $post_ratings;

-    else

-        return false;

-}

+    if ($post_ratings) {
+            return $post_ratings;
+    } else {
+            return false;
+    }
+    }

 

 

 /**

@@ -541,11 +545,12 @@ 
         )

     );

 

-    if (!empty($reatings))

-        return $reatings;

-    else

-        return false;

-}

+    if (!empty($reatings)) {
+            return $reatings;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get review total of a Post.

@@ -569,11 +574,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get review count by user ID.

@@ -596,11 +602,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get average overall rating of a Post.

@@ -634,11 +641,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get review count of a Post.

@@ -662,11 +670,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get comments count of a Post.

@@ -692,11 +701,12 @@ 
     );

 

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get overall rating of a comment.

@@ -720,11 +730,12 @@ 
         )

     );

 

-    if ($reatings)

-        return $reatings;

-    else

-        return false;

-}

+    if ($reatings) {
+            return $reatings;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns average overall rating of a Post. Depreciated since ver 1.3.6.

@@ -970,8 +981,9 @@ 
     $active_tabs = get_option('geodir_detail_page_tabs_excluded');

 

     $is_display = true;

-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))

-        $is_display = false;

+    if (!empty($active_tabs) && in_array('reviews', $active_tabs)) {
+            $is_display = false;
+    }
 

     /**

      * Filter to change display value.

Indentation +471 added lines, -471 removed lines

@@ -31,13 +31,13 @@ 
  */

 function geodir_comment_meta_row_action($a)

 {

-    global $comment;

+	global $comment;

 

-    $rating = geodir_get_commentoverall($comment->comment_ID);

-    if ($rating != 0) {

-        echo geodir_get_rating_stars($rating, $comment->comment_ID);

-    }

-    return $a;

+	$rating = geodir_get_commentoverall($comment->comment_ID);

+	if ($rating != 0) {

+		echo geodir_get_rating_stars($rating, $comment->comment_ID);

+	}

+	return $a;

 }

 

 add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

@@ -52,7 +52,7 @@ 
  */

 function geodir_comment_add_meta_box($comment)

 {

-    add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

+	add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

 }

 

 /**

@@ -66,7 +66,7 @@ 
  * @param object $comment The comment object.

  */

 function geodir_comment_rating_meta($comment) {

-    $post_type = get_post_type($comment->comment_post_ID);

+	$post_type = get_post_type($comment->comment_post_ID);

 	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

@@ -106,24 +106,24 @@ 
  * @global object $post The post object.

  */

 function geodir_comment_rating_fields() {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {

-        $star_texts = array();

-        $star_texts[] = __('Terrible', 'geodirectory');

-        $star_texts[] = __('Poor', 'geodirectory');

-        $star_texts[] = __('Average', 'geodirectory');

-        $star_texts[] = __('Very Good', 'geodirectory');

-        $star_texts[] = __('Excellent', 'geodirectory');

+	if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {

+		$star_texts = array();

+		$star_texts[] = __('Terrible', 'geodirectory');

+		$star_texts[] = __('Poor', 'geodirectory');

+		$star_texts[] = __('Average', 'geodirectory');

+		$star_texts[] = __('Very Good', 'geodirectory');

+		$star_texts[] = __('Excellent', 'geodirectory');

         

-        $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

-        echo $gd_rating_html;

-        ?>

+		$gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

+		echo $gd_rating_html;

+		?>

         <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/>

         <?php

-    }

+	}

 }

 

 add_filter('comment_reply_link', 'geodir_comment_replaylink');

@@ -139,12 +139,12 @@ 
 function geodir_comment_replaylink($link)

 {

 

-    if (strpos($link, 'wp-login.php?') !== false) {

-        $link = str_replace(wp_login_url(),geodir_login_url(),$link);

-    }

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+	if (strpos($link, 'wp-login.php?') !== false) {

+		$link = str_replace(wp_login_url(),geodir_login_url(),$link);

+	}

+	$link = '<div class="gd_comment_replaylink">' . $link . '</div>';

 

-    return $link;

+	return $link;

 }

 

 add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');

@@ -159,9 +159,9 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+	$link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

 

-    return $link;

+	return $link;

 }

 

 add_action('comment_post', 'geodir_save_rating');

@@ -177,32 +177,32 @@ 
  */

 function geodir_save_rating($comment = 0)

 {

-    global $wpdb, $user_ID, $plugin_prefix;

+	global $wpdb, $user_ID, $plugin_prefix;

 

-    $comment_info = get_comment($comment);

+	$comment_info = get_comment($comment);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $rating_ip = getenv("REMOTE_ADDR");

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$rating_ip = getenv("REMOTE_ADDR");

 	

-    $post = geodir_get_post_info($post_id);

-    if (empty($post)) {

-        return;

-    }

-

-    if ($post->post_status == 'publish') {

-        $post_status = '1';

-    } else {

-        $post_status = '0';

-    }

+	$post = geodir_get_post_info($post_id);

+	if (empty($post)) {

+		return;

+	}

+

+	if ($post->post_status == 'publish') {

+		$post_status = '1';

+	} else {

+		$post_status = '0';

+	}

 	

-    if (isset($_REQUEST['geodir_overallrating'])) {

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+	if (isset($_REQUEST['geodir_overallrating'])) {

+		$overall_rating = $_REQUEST['geodir_overallrating'];

         

 		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -220,35 +220,35 @@ 
 					post_latitude	= %s,

 					comment_content	= %s 

 					",

-                array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

-            );

-

-            $wpdb->query($sqlqry);

-

-            /**

-             * Called after saving the comment.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $_REQUEST {

-             *    Attributes of the $_REQUEST variable.

-             *

-             *    @type string $geodir_overallrating Overall rating.

-             *    @type string $comment Comment text.

-             *    @type string $submit Submit button text.

-             *    @type string $comment_post_ID Comment post ID.

-             *    @type string $comment_parent Comment Parent ID.

-             *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

-             *

-             * }

-             */

-            do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

-

-            if ($status) {

-                geodir_update_postrating($post_id);

-            }

-        }

-    }

+				array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

+			);

+

+			$wpdb->query($sqlqry);

+

+			/**

+			 * Called after saving the comment.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $_REQUEST {

+			 *    Attributes of the $_REQUEST variable.

+			 *

+			 *    @type string $geodir_overallrating Overall rating.

+			 *    @type string $comment Comment text.

+			 *    @type string $submit Submit button text.

+			 *    @type string $comment_post_ID Comment post ID.

+			 *    @type string $comment_parent Comment Parent ID.

+			 *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

+			 *

+			 * }

+			 */

+			do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

+

+			if ($status) {

+				geodir_update_postrating($post_id);

+			}

+		}

+	}

 }

 

 

@@ -266,51 +266,51 @@ 
  */

 function geodir_update_rating_status_change($comment_id, $status)

 {

-    if ($status == 'delete') {

-        return;

-    }

-    global $wpdb, $plugin_prefix, $user_ID;

+	if ($status == 'delete') {

+		return;

+	}

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

+	$post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

 

-    if (!empty($comment_info))

-        $status = $comment_info->comment_approved;

+	if (!empty($comment_info))

+		$status = $comment_info->comment_approved;

 

-    if ($status == 'approve' || $status == 1) {

-        $status = 1;

-    } else {

-        $status = 0;

-    }

+	if ($status == 'approve' || $status == 1) {

+		$status = 1;

+	} else {

+		$status = 0;

+	}

 

-    $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

-    $old_rating = geodir_get_commentoverall($comment_info_ID);

+	$comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

+	$old_rating = geodir_get_commentoverall($comment_info_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if ($comment_id) {

+	if ($comment_id) {

 

-        $overall_rating = $old_rating;

+		$overall_rating = $old_rating;

 

-        if (isset($old_rating)) {

+		if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-            $wpdb->query($sqlqry);

+			$wpdb->query($sqlqry);

 

-            //update rating

-            geodir_update_postrating($post_id, $post_type);

+			//update rating

+			geodir_update_postrating($post_id, $post_type);

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -329,41 +329,41 @@ 
 function geodir_update_rating($comment_id = 0)

 {

 

-    global $wpdb, $plugin_prefix, $user_ID;

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $old_rating = geodir_get_commentoverall($comment_info->comment_ID);

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$old_rating = geodir_get_commentoverall($comment_info->comment_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if (isset($_REQUEST['geodir_overallrating'])) {

+	if (isset($_REQUEST['geodir_overallrating'])) {

 

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+		$overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            if (isset($old_rating)) {

+			if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+				$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-                $wpdb->query($sqlqry);

+				$wpdb->query($sqlqry);

 

-                //update rating

-                geodir_update_postrating($post_id, $post_type);

+				//update rating

+				geodir_update_postrating($post_id, $post_type);

 

-            }

-        }

-    }

+			}

+		}

+	}

 

 

 }

@@ -379,19 +379,19 @@ 
  */

 function geodir_comment_delete_comment($comment_id)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $review_info = geodir_get_review($comment_id);

-    if ($review_info) {

-        geodir_update_postrating($review_info->post_id);

-    }

+	$review_info = geodir_get_review($comment_id);

+	if ($review_info) {

+		geodir_update_postrating($review_info->post_id);

+	}

 

-    $wpdb->query(

-        $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

-            array($comment_id)

-        )

-    );

+	$wpdb->query(

+		$wpdb->prepare(

+			"DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+			array($comment_id)

+		)

+	);

 

 }

 

@@ -407,21 +407,21 @@ 
  * @return string The comment content.

  */

 function geodir_wrap_comment_text($content, $comment = '') {

-    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

-        if (!is_admin()) {

-            return '<div class="description">' . $content . '</div>';

-        } else {

-            return $content;

-        }

-    } else {

-        $rating = 0;

-        if (!empty($comment))

-            $rating = geodir_get_commentoverall($comment->comment_ID);

-        if ($rating != 0 && !is_admin()) {

-            return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

-        } else

-            return $content;

-    }

+	if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

+		if (!is_admin()) {

+			return '<div class="description">' . $content . '</div>';

+		} else {

+			return $content;

+		}

+	} else {

+		$rating = 0;

+		if (!empty($comment))

+			$rating = geodir_get_commentoverall($comment->comment_ID);

+		if ($rating != 0 && !is_admin()) {

+			return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+		} else

+			return $content;

+	}

 }

 

 

@@ -438,41 +438,41 @@ 
  */

 function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false)

 {

-    global $wpdb, $plugin_prefix, $comment;

-    if (!$post_type) {

-        $post_type = get_post_type($post_id);

-    }

-    $detail_table = $plugin_prefix . $post_type . '_detail';

-    $post_newrating = geodir_get_post_rating($post_id, 1);

-    $post_newrating_count = geodir_get_review_count_total($post_id);

+	global $wpdb, $plugin_prefix, $comment;

+	if (!$post_type) {

+		$post_type = get_post_type($post_id);

+	}

+	$detail_table = $plugin_prefix . $post_type . '_detail';

+	$post_newrating = geodir_get_post_rating($post_id, 1);

+	$post_newrating_count = geodir_get_review_count_total($post_id);

 

 

-    //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

+	//$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $detail_table . " SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

-                array($post_newrating, $post_newrating_count, $post_id)

-            )

-        );

-

-        update_post_meta($post_id, 'overall_rating', $post_newrating);

-        update_post_meta($post_id, 'rating_count', $post_newrating_count);

-    }

-    /**

-     * Called after Updating post overall rating and rating count.

-     *

-     * @since 1.0.0

-     * @since 1.4.3 Added `$post_id` param.

-     * @package GeoDirectory

-     * @param int $post_id The post ID.

-     */

-    do_action('geodir_update_postrating',$post_id);

+				array($post_newrating, $post_newrating_count, $post_id)

+			)

+		);

+

+		update_post_meta($post_id, 'overall_rating', $post_newrating);

+		update_post_meta($post_id, 'rating_count', $post_newrating_count);

+	}

+	/**

+	 * Called after Updating post overall rating and rating count.

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.3 Added `$post_id` param.

+	 * @package GeoDirectory

+	 * @param int $post_id The post ID.

+	 */

+	do_action('geodir_update_postrating',$post_id);

 

 }

 

@@ -490,29 +490,29 @@ 
  */

 function geodir_get_postoverall($post_id = 0)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$post_type = get_post_type($post_id);

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $post_ratings = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

-                array($post_id)

-            )

-        );

+		$post_ratings = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+				array($post_id)

+			)

+		);

 

 

-    } else {

-        $post_ratings = get_post_meta($post_id, 'overall_rating');

-    }

+	} else {

+		$post_ratings = get_post_meta($post_id, 'overall_rating');

+	}

 

-    if ($post_ratings)

-        return $post_ratings;

-    else

-        return false;

+	if ($post_ratings)

+		return $post_ratings;

+	else

+		return false;

 }

 

 

@@ -529,19 +529,19 @@ 
  */

 function geodir_get_review($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if (!empty($reatings))

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if (!empty($reatings))

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -557,19 +557,19 @@ 
  */

 function geodir_get_review_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -585,18 +585,18 @@ 
  */

 function geodir_get_review_count_by_user_id($user_id = 0)

 {

-    global $wpdb;

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

-            array($user_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+			array($user_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -614,27 +614,27 @@ 
  */

 function geodir_get_post_rating($post_id = 0, $force_query = 0)

 {

-    global $wpdb, $post;

-

-    if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

-        if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

-            return $post->overall_rating;

-        } else {

-            return 0;

-        }

-    }

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb, $post;

+

+	if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

+		if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

+			return $post->overall_rating;

+		} else {

+			return 0;

+		}

+	}

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -650,19 +650,19 @@ 
  */

 function geodir_get_review_count_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -679,20 +679,20 @@ 
  */

 function geodir_get_comments_number($post_id = 0)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

 

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -708,19 +708,19 @@ 
  */

 function geodir_get_commentoverall($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if ($reatings)

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if ($reatings)

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -734,7 +734,7 @@ 
  */

 function geodir_get_commentoverall_number($post_id = 0)

 {

-    return geodir_get_post_rating($post_id);

+	return geodir_get_post_rating($post_id);

 }

 

 

@@ -752,102 +752,102 @@ 
  */

 function geodir_comment_template($comment_template)

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

-        return;

-    }

-    if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

-        if (geodir_cpt_has_rating_disabled($post->post_type)) {

-            return $comment_template;

-        }

+	if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

+		return;

+	}

+	if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

+		if (geodir_cpt_has_rating_disabled($post->post_type)) {

+			return $comment_template;

+		}

         

-        $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

-        if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

-        }

-        return $template;

-    }

+		$template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

+		if (!$template) {

+			$template = dirname(__FILE__) . '/reviews.php';

+		}

+		return $template;

+	}

 }

 

 add_filter("comments_template", "geodir_comment_template");

 

 

 if (!function_exists('geodir_comment')) {

-    /**

-     * Comment HTML markup.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post The current post object.

-     * @param object $comment The comment object.

-     * @param string|array $args {

-     *     Optional. Formatting options.

-     *

-     *     @type object $walker            Instance of a Walker class to list comments. Default null.

-     *     @type int    $max_depth         The maximum comments depth. Default empty.

-     *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

-     *     @type string $callback          Callback function to use. Default null.

-     *     @type string $end-callback      Callback function to use at the end. Default null.

-     *     @type string $type              Type of comments to list.

-     *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

-     *     @type int    $page              Page ID to list comments for. Default empty.

-     *     @type int    $per_page          Number of comments to list per page. Default empty.

-     *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

-     *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

-     *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

-     *     @type string $format            How to format the comments list.

-     *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

-     *     @type bool   $short_ping        Whether to output short pings. Default false.

-     *     @type bool   $echo              Whether to echo the output or return it. Default true.

-     * }

-     * @param int $depth Depth of comment.

-     */

-    function geodir_comment($comment, $args, $depth)

-    {

-        $GLOBALS['comment'] = $comment;

-        switch ($comment->comment_type) :

-            case 'pingback' :

-            case 'trackback' :

-                // Display trackbacks differently than normal comments.

-                ?>

+	/**

+	 * Comment HTML markup.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post The current post object.

+	 * @param object $comment The comment object.

+	 * @param string|array $args {

+	 *     Optional. Formatting options.

+	 *

+	 *     @type object $walker            Instance of a Walker class to list comments. Default null.

+	 *     @type int    $max_depth         The maximum comments depth. Default empty.

+	 *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

+	 *     @type string $callback          Callback function to use. Default null.

+	 *     @type string $end-callback      Callback function to use at the end. Default null.

+	 *     @type string $type              Type of comments to list.

+	 *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

+	 *     @type int    $page              Page ID to list comments for. Default empty.

+	 *     @type int    $per_page          Number of comments to list per page. Default empty.

+	 *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

+	 *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

+	 *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

+	 *     @type string $format            How to format the comments list.

+	 *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

+	 *     @type bool   $short_ping        Whether to output short pings. Default false.

+	 *     @type bool   $echo              Whether to echo the output or return it. Default true.

+	 * }

+	 * @param int $depth Depth of comment.

+	 */

+	function geodir_comment($comment, $args, $depth)

+	{

+		$GLOBALS['comment'] = $comment;

+		switch ($comment->comment_type) :

+			case 'pingback' :

+			case 'trackback' :

+				// Display trackbacks differently than normal comments.

+				?>

                 <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">

                 <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>

                 <?php

-                break;

-            default :

-                // Proceed with normal comments.

-                global $post;

-                ?>

+				break;

+			default :

+				// Proceed with normal comments.

+				global $post;

+				?>

             <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">

                 <article id="comment-<?php comment_ID(); ?>" class="comment">

                     <header class="comment-meta comment-author vcard">

                         <?php

-                        /**

-                         * Filter to modify comment avatar size

-                         *

-                         * You can use this filter to change comment avatar size.

-                         *

-                         * @since 1.0.0

-                         * @package GeoDirectory

-                         */

-                        $avatar_size = apply_filters('geodir_comment_avatar_size', 44);

-                        echo get_avatar($comment, $avatar_size);

-                        printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

-                            get_comment_author_link(),

-                            // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

-                        );

-                        echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

-                        printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

-                            esc_url(get_comment_link($comment->comment_ID)),

-                            get_comment_time('c'),

-                            /* translators: 1: date, 2: time */

-                            sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

-                        );

-                        ?>

+						/**

+						 * Filter to modify comment avatar size

+						 *

+						 * You can use this filter to change comment avatar size.

+						 *

+						 * @since 1.0.0

+						 * @package GeoDirectory

+						 */

+						$avatar_size = apply_filters('geodir_comment_avatar_size', 44);

+						echo get_avatar($comment, $avatar_size);

+						printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

+							get_comment_author_link(),

+							// If current post author is also comment author, make it known visually.

+							($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+						);

+						echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

+						printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

+							esc_url(get_comment_link($comment->comment_ID)),

+							get_comment_time('c'),

+							/* translators: 1: date, 2: time */

+							sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

+						);

+						?>

                     </header>

                     <!-- .comment-meta -->

 

@@ -871,47 +871,47 @@ 
                 </article>

                 <!-- #comment-## -->

                 <?php

-                break;

-        endswitch; // end comment_type check

-    }

+				break;

+		endswitch; // end comment_type check

+	}

 }

 

 

 add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);

 if (!function_exists('geodir_fix_comment_count')) {

-    /**

-     * Fix comment count by not listing replies as reviews

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post The current post object.

-     * @param int $count The comment count.

-     * @param int $post_id The post ID.

-     * @todo $post is unreachable since the function return the count before that variable.

-     * @return bool|null|string The comment count.

-     */

-    function geodir_fix_comment_count($count, $post_id)

-    {

-        if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

-            global $post;

-            $post_types = geodir_get_posttypes();

-

-            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

-                $review_count = geodir_get_review_count_total($post_id);

-                return $review_count;

-

-                if ($post && isset($post->rating_count)) {

-                    return $post->rating_count;

-                } else {

-                    return geodir_get_comments_number($post_id);

-                }

-            } else {

-                return $count;

-            }

-        } else {

-            return $count;

-        }

-    }

+	/**

+	 * Fix comment count by not listing replies as reviews

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post The current post object.

+	 * @param int $count The comment count.

+	 * @param int $post_id The post ID.

+	 * @todo $post is unreachable since the function return the count before that variable.

+	 * @return bool|null|string The comment count.

+	 */

+	function geodir_fix_comment_count($count, $post_id)

+	{

+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

+			global $post;

+			$post_types = geodir_get_posttypes();

+

+			if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

+				$review_count = geodir_get_review_count_total($post_id);

+				return $review_count;

+

+				if ($post && isset($post->rating_count)) {

+					return $post->rating_count;

+				} else {

+					return geodir_get_comments_number($post_id);

+				}

+			} else {

+				return $count;

+			}

+		} else {

+			return $count;

+		}

+	}

 }

 

 /**

@@ -929,14 +929,14 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

-        return NULL;

-    }

-    $a_rating = $rating / 5 * 100;

-

-    if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

-    } else {

+	if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

+		return NULL;

+	}

+	$a_rating = $rating / 5 * 100;

+

+	if ($small) {

+		$r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+	} else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

@@ -953,8 +953,8 @@ 
 			}

 			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

 		}

-    }

-    return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

+	}

+	return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

 }

 

 /**

@@ -968,23 +968,23 @@ 
 function geodir_is_reviews_show($pageview = '')

 {

 

-    $active_tabs = get_option('geodir_detail_page_tabs_excluded');

-

-    $is_display = true;

-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))

-        $is_display = false;

-

-    /**

-     * Filter to change display value.

-     *

-     * You can use this filter to change the is_display value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $is_display Display ratings when set to true.

-     * @param string $pageview The view template. Ex: listview, gridview etc.

-     */

-    return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

+	$active_tabs = get_option('geodir_detail_page_tabs_excluded');

+

+	$is_display = true;

+	if (!empty($active_tabs) && in_array('reviews', $active_tabs))

+		$is_display = false;

+

+	/**

+	 * Filter to change display value.

+	 *

+	 * You can use this filter to change the is_display value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $is_display Display ratings when set to true.

+	 * @param string $pageview The view template. Ex: listview, gridview etc.

+	 */

+	return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

 }

 

 

@@ -992,9 +992,9 @@ 
  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

 if(function_exists('dsq_can_replace')) {

-    remove_filter('comments_template', 'dsq_comments_template');

-    add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+	remove_filter('comments_template', 'dsq_comments_template');

+	add_filter('comments_template', 'dsq_comments_template', 100);

+	add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

 }

 

 

@@ -1008,14 +1008,14 @@ 
  * @return string `1` if active `0` if disabled.

  */

 function geodir_option_disqus_active($disqus_active){

-    global $post;

-    $all_postypes = geodir_get_posttypes();

+	global $post;

+	$all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

-        $disqus_active = '0';

-    }

+	if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+		$disqus_active = '0';

+	}

 

-    return $disqus_active;

+	return $disqus_active;

 }

 

 /**

@@ -1029,23 +1029,23 @@ 
  * @return array Modified tabs array.

  */

 function geodir_detail_reviews_tab_title($tabs_arr) {

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {

-        $label_reviews = __('Comments', 'geodirectory');

+	if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {

+		$label_reviews = __('Comments', 'geodirectory');

         

-        if (defined('GEODIR_CP_VERSION')) {

-            $post_types = geodir_get_posttypes('array');

+		if (defined('GEODIR_CP_VERSION')) {

+			$post_types = geodir_get_posttypes('array');

             

-            if (!empty($post_types[$post_type]['labels']['label_reviews'])) {

-                $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory'));

-            }

-        }

+			if (!empty($post_types[$post_type]['labels']['label_reviews'])) {

+				$label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory'));

+			}

+		}

         

-        $tabs_arr['reviews']['heading_text'] = $label_reviews;

-    }

+		$tabs_arr['reviews']['heading_text'] = $label_reviews;

+	}

     

-    return $tabs_arr;

+	return $tabs_arr;

 }

 add_filter('geodir_detail_page_tab_list_extend', 'geodir_detail_reviews_tab_title', 1000, 1);

 

@@ -1056,13 +1056,13 @@ 
  * @since 1.6.21

  */

 function geodir_jetpack_disable_comments(){

-    //only run if jetpack installed

-    if(defined('JETPACK__VERSION')){

-        $post_types = geodir_get_posttypes();

-        foreach($post_types as $post_type){

-            add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false');

-        }

-    }

+	//only run if jetpack installed

+	if(defined('JETPACK__VERSION')){

+		$post_types = geodir_get_posttypes();

+		foreach($post_types as $post_type){

+			add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false');

+		}

+	}

 }

 

 add_action('plugins_loaded','geodir_jetpack_disable_comments');

@@ -1077,13 +1077,13 @@ 
  * @return bool True if allowed otherwise False.

  */

 function geodir_check_reviews_open( $open, $post_id ) {

-    if ( $open && $post_id && geodir_is_page( 'detail' ) ) {

-        if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) {

-            $open = false;

-        }

-    }

+	if ( $open && $post_id && geodir_is_page( 'detail' ) ) {

+		if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) {

+			$open = false;

+		}

+	}

     

-    return $open;

+	return $open;

 }

 add_filter( 'comments_open', 'geodir_check_reviews_open', 10, 2 );

 

@@ -1098,10 +1098,10 @@ 
  * @return string Filtered comment content.

  */

 function geodir_remove_img_tags_from_comment( $comment_text, $comment = array(), $args = array() ) {

-    if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) {

-        $comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text );

-        $comment_text = trim( $comment_text );

-    }

-    return $comment_text;

+	if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) {

+		$comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text );

+		$comment_text = trim( $comment_text );

+	}

+	return $comment_text;

 }

 add_filter( 'comment_text', 'geodir_remove_img_tags_from_comment', 10, 3 );
\ No newline at end of file

Spacing +58 added lines, -58 removed lines

@@ -67,10 +67,10 @@ 
  */

 function geodir_comment_rating_meta($comment) {

     $post_type = get_post_type($comment->comment_post_ID);

-	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

+	if (in_array($post_type, (array) geodir_get_posttypes()) && (int) $comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

-		if ((int)get_option('geodir_reviewrating_enable_font_awesome') == 1) {

+		if ((int) get_option('geodir_reviewrating_enable_font_awesome') == 1) {

 			$star_texts = array();

 			$star_texts[] = __('Terrible', 'geodirectory');

 			$star_texts[] = __('Poor', 'geodirectory');

@@ -81,13 +81,13 @@ 
 			echo geodir_font_awesome_rating_form_html('', $star_texts, $rating);

 		} else {			

 			if ($rating) {

-				echo '<div class="gd_rating" data-average="' . $rating . '" data-id="5">';

+				echo '<div class="gd_rating" data-average="'.$rating.'" data-id="5">';

 

 			} else {

 				echo '<div class="gd_rating" data-average="0" data-id="5"></div>';

 			}

 		}

-		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="' . $rating . '"  />';

+		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="'.$rating.'"  />';

 	}

 }

 

@@ -140,9 +140,9 @@ 
 {

 

     if (strpos($link, 'wp-login.php?') !== false) {

-        $link = str_replace(wp_login_url(),geodir_login_url(),$link);

+        $link = str_replace(wp_login_url(), geodir_login_url(), $link);

     }

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+    $link = '<div class="gd_comment_replaylink">'.$link.'</div>';

 

     return $link;

 }

@@ -159,7 +159,7 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+    $link = '<span class="gd-cancel-replaylink">'.$link.'</span>';

 

     return $link;

 }

@@ -199,10 +199,10 @@ 
     if (isset($_REQUEST['geodir_overallrating'])) {

         $overall_rating = $_REQUEST['geodir_overallrating'];

         

-		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+		if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("INSERT INTO ".GEODIR_REVIEW_TABLE." SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -289,7 +289,7 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

     if ($comment_id) {

 

@@ -297,7 +297,7 @@ 
 

         if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

@@ -339,18 +339,18 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

     if (isset($_REQUEST['geodir_overallrating'])) {

 

         $overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+        if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

             if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+                $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

@@ -388,7 +388,7 @@ 
 

     $wpdb->query(

         $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+            "DELETE FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d",

             array($comment_id)

         )

     );

@@ -407,9 +407,9 @@ 
  * @return string The comment content.

  */

 function geodir_wrap_comment_text($content, $comment = '') {

-    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

+    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int) $comment->comment_post_ID)) {

         if (!is_admin()) {

-            return '<div class="description">' . $content . '</div>';

+            return '<div class="description">'.$content.'</div>';

         } else {

             return $content;

         }

@@ -418,7 +418,7 @@ 
         if (!empty($comment))

             $rating = geodir_get_commentoverall($comment->comment_ID);

         if ($rating != 0 && !is_admin()) {

-            return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+            return '<div><div class="gd-rating-text">'.__('Overall Rating', 'geodirectory').': <div class="rating">'.$rating.'</div></div>'.geodir_get_rating_stars($rating, $comment->comment_ID).'</div><div class="description">'.$content.'</div>';

         } else

             return $content;

     }

@@ -442,18 +442,18 @@ 
     if (!$post_type) {

         $post_type = get_post_type($post_id);

     }

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

     $post_newrating = geodir_get_post_rating($post_id, 1);

     $post_newrating_count = geodir_get_review_count_total($post_id);

 

 

     //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+                "UPDATE ".$detail_table." SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

@@ -472,7 +472,7 @@ 
      * @package GeoDirectory

      * @param int $post_id The post ID.

      */

-    do_action('geodir_update_postrating',$post_id);

+    do_action('geodir_update_postrating', $post_id);

 

 }

 

@@ -493,13 +493,13 @@ 
     global $wpdb, $plugin_prefix;

 

     $post_type = get_post_type($post_id);

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $post_ratings = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+                "SELECT overall_rating FROM ".$detail_table." WHERE post_id = %d",

                 array($post_id)

             )

         );

@@ -533,7 +533,7 @@ 
 

     $reatings = $wpdb->get_row(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -561,7 +561,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT SUM(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -588,7 +588,7 @@ 
     global $wpdb;

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE user_id = %d AND status=1 AND overall_rating>0",

             array($user_id)

         )

     );

@@ -626,7 +626,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COALESCE(avg(overall_rating),0) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -654,7 +654,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -683,7 +683,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -712,7 +712,7 @@ 
 

     $reatings = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT overall_rating FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -766,7 +766,7 @@ 
         

         $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

         if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

+            $template = dirname(__FILE__).'/reviews.php';

         }

         return $template;

     }

@@ -838,7 +838,7 @@ 
                         printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

                             get_comment_author_link(),

                             // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+                            ($comment->user_id === $post->post_author) ? '<span>'.__('Post author', 'geodirectory').'</span>' : ''

                         );

                         echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

                         printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

@@ -896,7 +896,7 @@ 
             global $post;

             $post_types = geodir_get_posttypes();

 

-            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

+            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int) $post_id)) {

                 $review_count = geodir_get_review_count_total($post_id);

                 return $review_count;

 

@@ -929,29 +929,29 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

+    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int) $post_id)) {

         return NULL;

     }

     $a_rating = $rating / 5 * 100;

 

     if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: '.$a_rating.'%;"></div><div class="geodir_Star_small"></div></div></div>';

     } else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

 		} else {

-			$rating_img = '<img alt="rating icon" src="' . get_option('geodir_default_rating_star_icon') . '" />';

+			$rating_img = '<img alt="rating icon" src="'.get_option('geodir_default_rating_star_icon').'" />';

 			

 			/* fix rating star for safari */

 			$star_width = 23 * 5;

 			

 			if ($star_width > 0) {

-				$attach_style = 'max-width:' . $star_width . 'px';

+				$attach_style = 'max-width:'.$star_width.'px';

 			} else {

 				$attach_style = '';

 			}

-			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

+			$r_html = '<div class="geodir-rating" style="'.$attach_style.'"><div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingAverage" style="width: '.$a_rating.'%;"></div><div class="geodir_Star">'.$rating_img.$rating_img.$rating_img.$rating_img.$rating_img.'</div></div></div>';

 		}

     }

     return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

@@ -991,10 +991,10 @@ 
 /*

  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

-if(function_exists('dsq_can_replace')) {

+if (function_exists('dsq_can_replace')) {

     remove_filter('comments_template', 'dsq_comments_template');

     add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active', 10, 1);

 }

 

 

@@ -1007,11 +1007,11 @@ 
  * @param string $disqus_active Hook called before DB call for option so this is empty.

  * @return string `1` if active `0` if disabled.

  */

-function geodir_option_disqus_active($disqus_active){

+function geodir_option_disqus_active($disqus_active) {

     global $post;

     $all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+    if (isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

         $disqus_active = '0';

     }

 

@@ -1055,17 +1055,17 @@ 
  *

  * @since 1.6.21

  */

-function geodir_jetpack_disable_comments(){

+function geodir_jetpack_disable_comments() {

     //only run if jetpack installed

-    if(defined('JETPACK__VERSION')){

+    if (defined('JETPACK__VERSION')) {

         $post_types = geodir_get_posttypes();

-        foreach($post_types as $post_type){

-            add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false');

+        foreach ($post_types as $post_type) {

+            add_filter('jetpack_comment_form_enabled_for_'.$post_type, '__return_false');

         }

     }

 }

 

-add_action('plugins_loaded','geodir_jetpack_disable_comments');

+add_action('plugins_loaded', 'geodir_jetpack_disable_comments');

 

 /**

  * Check whether the current post is open for reviews.

@@ -1076,16 +1076,16 @@ 
  * @param int  $post_id The post ID.

  * @return bool True if allowed otherwise False.

  */

-function geodir_check_reviews_open( $open, $post_id ) {

-    if ( $open && $post_id && geodir_is_page( 'detail' ) ) {

-        if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) {

+function geodir_check_reviews_open($open, $post_id) {

+    if ($open && $post_id && geodir_is_page('detail')) {

+        if (in_array(get_post_status($post_id), array('draft', 'pending', 'auto-draft', 'trash'))) {

             $open = false;

         }

     }

     

     return $open;

 }

-add_filter( 'comments_open', 'geodir_check_reviews_open', 10, 2 );

+add_filter('comments_open', 'geodir_check_reviews_open', 10, 2);

 

 /**

  * Filter the [img] tags from comment.

@@ -1097,11 +1097,11 @@ 
  * @param array           $args         An array of arguments.

  * @return string Filtered comment content.

  */

-function geodir_remove_img_tags_from_comment( $comment_text, $comment = array(), $args = array() ) {

-    if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) {

-        $comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text );

-        $comment_text = trim( $comment_text );

+function geodir_remove_img_tags_from_comment($comment_text, $comment = array(), $args = array()) {

+    if (!empty($comment_text) && !empty($comment) && strpos($comment_text, '[img') !== false && strpos(get_post_type($comment->comment_post_ID), 'gd_') === 0) {

+        $comment_text = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text);

+        $comment_text = trim($comment_text);

     }

     return $comment_text;

 }

-add_filter( 'comment_text', 'geodir_remove_img_tags_from_comment', 10, 3 );
\ No newline at end of file
+add_filter('comment_text', 'geodir_remove_img_tags_from_comment', 10, 3);
\ No newline at end of file

geodirectory_template_tags.php

Braces +34 added lines, -19 removed lines

@@ -252,7 +252,7 @@ 
         </script>

 

         <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+    } elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

         echo stripslashes(get_option('geodir_ga_tracking_code'));

     }

 }

@@ -291,13 +291,14 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

-}

+    if (strpos($url, '#asyncload')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#asyncload', '', $url);
+    } else {
+            return str_replace('#asyncload', '', $url)."' async='async";
+    }
+    }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

 /**

@@ -364,8 +365,10 @@ 
 

     $half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

-        return;

+    if (geodir_is_page('home')) {
+    	// dont apply default  pagination for geodirectory home page.

+        return;
+    }
 

     if (!is_single()) {

         if (function_exists('geodir_location_geo_home_link')) {

@@ -485,11 +488,21 @@ 
     }

     $dist_dif = 1000;

 

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

+    if ($dist <= 5000) {
+    	$dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+    	$dist_dif = 100;
+    }
+    if ($dist <= 500) {
+    	$dist_dif = 50;
+    }
+    if ($dist <= 100) {
+    	$dist_dif = 10;
+    }
+    if ($dist <= 50) {
+    	$dist_dif = 5;
+    }
 

     ?>

     <script type="text/javascript">

@@ -550,12 +563,14 @@ 
  */

 function geodir_add_sharelocation_scripts() {

     $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 

     $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
     

     $search_location = geodir_get_default_location();

     

Spacing +77 added lines, -77 removed lines

@@ -39,21 +39,21 @@ 
     $is_detail_page = false;

     $geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

     wp_enqueue_script('jquery');

 

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-script');

 

     $geodir_vars_data = array(

         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

     );

 

@@ -74,24 +74,24 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

         wp_enqueue_script('geodirectory-jquery-simplemodal');

     }

 

     if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

+        $map_lang = "&language=".geodir_get_map_default_language();

+        $map_key = "&key=".geodir_get_map_api_key();

         /**

          * Filter the variables that are added to the end of the google maps script call.

          *

@@ -101,55 +101,55 @@ 
          * @param string $var The string to filter, default is empty string.

          */

         $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

         

         // Overlapping Marker Spiderfier

-        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-g-overlappingmarker-script');

     }

     

     if ($geodir_map_name == 'osm') {

         // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-geo-script');

         

         if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-routing-script');

         }

         

         // Overlapping Marker Spiderfier Leaflet

-        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-o-overlappingmarker-script');

     }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+    wp_enqueue_script('jquery-ui-autocomplete');

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-goMap-script');

 

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('chosen');

 

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-choose-ajax');

 

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

 

     if (is_page() && geodir_is_page('add-listing')) {

         // SCRIPT FOR UPLOAD

         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-plupload-script');

         // SCRIPT FOR UPLOAD END

 

@@ -196,27 +196,27 @@ 
 

         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');

     } // End if for add place page

 

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

     // font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

 	} else { // default rating script

-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('google-geometa');

 }

 

@@ -231,7 +231,7 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';

     echo stripslashes(get_option('geodir_header_scripts'));

 }

 

@@ -245,7 +245,7 @@ 
  */

 function geodir_google_analytics_tracking_code()

 {

-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

+    if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>

 

         <script>

             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -253,14 +253,14 @@ 
                 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

             })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

 

-            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');

-            <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?>

+            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');

+            <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?>

             ga('send', 'pageview');

 

         </script>

 

         <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+    }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {

         echo stripslashes(get_option('geodir_ga_tracking_code'));

     }

 }

@@ -283,7 +283,7 @@ 
      *

      * Flexbox wont wrap on ios for search form items

      */

-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+    if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {

         echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

     }

 }

@@ -299,7 +299,7 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

@@ -317,12 +317,12 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+    if (is_rtl()) {

+    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodirectory-frontend-rtl-style');

     }

 

@@ -396,18 +396,18 @@ 
                 $term_id = get_queried_object_id();

                 $taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {

+                    $term = get_term($term_id, $post_type.'category');

                 }

             }

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {

+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];

                 

                 if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+                    $term = get_term((int) $taxonomy_search, $post_type.'category');

+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');

                 }

             }

             

@@ -419,7 +419,7 @@ 
         if ($max_page > 1 || $always_show) {            

             // Extra pagination info

             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $start_no = ($paged - 1) * $posts_per_page + 1;

             $end_no = min($paged * $posts_per_page, $numposts);

 

             if ($geodir_pagination_more_info != '') {

@@ -429,7 +429,7 @@ 
                 } else {

                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

                 }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';

                 /**

                  * Adds an extra pagination info above/under pagination.

                  *

@@ -445,15 +445,15 @@ 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

                 if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

+                    $before = $before.$pagination_info;

                 } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

+                    $after = $pagination_info.$after;

                 }

             }

             

             echo "$before <div class='Navi gd-navi'>";

             if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';

             }

             previous_posts_link($prelabel);

             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -461,13 +461,13 @@ 
                     if ($i == $paged) {

                         echo "<strong class='on'>$i</strong>";

                     } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';

                     }

                 }

             }

             next_posts_link($nxtlabel, $max_page);

             if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';

             }

             echo "</div> $after";

         }

@@ -505,7 +505,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -572,7 +572,7 @@ 
     $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';

     ?>

     <script type="text/javascript">

-        var default_location = '<?php echo $city ;?>';

+        var default_location = '<?php echo $city; ?>';

         var latlng;

         var address;

         var dist = 0;

@@ -588,7 +588,7 @@ 
 				var $form = jQuery(this).closest('form');

 

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -602,7 +602,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 					geodir_setsearch($form);

 				} else {

 					jQuery(".snear", $form).val('');

@@ -620,7 +620,7 @@ 
         });

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -639,15 +639,15 @@ 
             // Call the geocode function

             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

             } else {

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

                     <?php

@@ -660,12 +660,12 @@ 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');

                     ?>

                     if (window.gdMaps === 'google') {

-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},

                             function (results, status) {

                                 if (status == google.maps.GeocoderStatus.OK) {

                                     updateSearchPosition(results[0].geometry.location, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);

+                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);

                                 }

                             });

                     } else if (window.gdMaps === 'osm') {

@@ -674,7 +674,7 @@ 
                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {

                                     updateSearchPosition(geo, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");

+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");

                                 }

                             });

                     } else {

@@ -720,19 +720,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

@@ -782,7 +782,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

@@ -792,7 +792,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }

@@ -806,8 +806,8 @@ 
  * @since 1.6.22

  */

 function geodir_fix_script_conflict() {

-    if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {

-        wp_dequeue_script( 'flexslider' );

+    if (wp_script_is('flexslider', 'enqueued') && wp_script_is('geodirectory-jquery-flexslider-js', 'enqueued')) {

+        wp_dequeue_script('flexslider');

     }

 }

-add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 );
\ No newline at end of file
+add_action('wp_enqueue_scripts', 'geodir_fix_script_conflict', 100);
\ No newline at end of file

Indentation +344 added lines, -344 removed lines

@@ -36,175 +36,175 @@ 
  */

 function geodir_templates_scripts()

 {

-    $is_detail_page = false;

-    $geodir_map_name = geodir_map_name();

+	$is_detail_page = false;

+	$geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

-        $is_detail_page = true;

-    }

-

-    wp_enqueue_script('jquery');

-

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('geodirectory-script');

-

-    $geodir_vars_data = array(

-        'siteurl' => get_option('siteurl'),

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

-        'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

-        'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

-    );

-

-    /**

-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

-     *

-     * This is used by addons to add JS translatable variables.

-     *

-     * @since 1.4.4

-     * @param array $geodir_vars_data {

-     *    geodir var data used by addons to add JS translatable variables.

-     *

-     *    @type string $siteurl Site url.

-     *    @type string $geodir_plugin_url Geodirectory core plugin url.

-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

-     *    @type int $is_rtl Checks if current locale is RTL.

-     *

-     * }

-     */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

-

-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

-

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

-

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

-    wp_enqueue_script('geodirectory-lightbox-jquery');

+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+		$is_detail_page = true;

+	}

 

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

-    if ($is_detail_page) {

-        wp_enqueue_script('geodirectory-jquery-simplemodal');

-    }

+	wp_enqueue_script('jquery');

+

+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('geodirectory-script');

+

+	$geodir_vars_data = array(

+		'siteurl' => get_option('siteurl'),

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+		'geodir_ajax_url' => geodir_get_ajax_url(),

+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+		'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

+	);

+

+	/**

+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

+	 *

+	 * This is used by addons to add JS translatable variables.

+	 *

+	 * @since 1.4.4

+	 * @param array $geodir_vars_data {

+	 *    geodir var data used by addons to add JS translatable variables.

+	 *

+	 *    @type string $siteurl Site url.

+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.

+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

+	 *    @type int $is_rtl Checks if current locale is RTL.

+	 *

+	 * }

+	 */

+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+

+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

+

+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+

+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+	wp_enqueue_script('geodirectory-lightbox-jquery');

+

+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+	if ($is_detail_page) {

+		wp_enqueue_script('geodirectory-jquery-simplemodal');

+	}

 

-    if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

-        /**

-         * Filter the variables that are added to the end of the google maps script call.

-         *

-         * This i used to change things like google maps language etc.

-         *

-         * @since 1.0.0

-         * @param string $var The string to filter, default is empty string.

-         */

-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+	if (in_array($geodir_map_name, array('auto', 'google'))) {

+		$map_lang = "&language=" . geodir_get_map_default_language();

+		$map_key = "&key=" . geodir_get_map_api_key();

+		/**

+		 * Filter the variables that are added to the end of the google maps script call.

+		 *

+		 * This i used to change things like google maps language etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to filter, default is empty string.

+		 */

+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');

+		wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

         

-        // Overlapping Marker Spiderfier

-        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-g-overlappingmarker-script');

-    }

+		// Overlapping Marker Spiderfier

+		wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-g-overlappingmarker-script');

+	}

     

-    if ($geodir_map_name == 'osm') {

-        // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-leaflet-style');

+	if ($geodir_map_name == 'osm') {

+		// Leaflet OpenStreetMap

+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-leaflet-script');

+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-leaflet-geo-script');

+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-leaflet-geo-script');

         

-        if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_style('geodirectory-leaflet-routing-style');

+		if ($is_detail_page) {

+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-routing-script');

-        }

+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-routing-script');

+		}

         

-        // Overlapping Marker Spiderfier Leaflet

-        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-o-overlappingmarker-script');

-    }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+		// Overlapping Marker Spiderfier Leaflet

+		wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-o-overlappingmarker-script');

+	}

+	wp_enqueue_script( 'jquery-ui-autocomplete' );

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('geodirectory-goMap-script');

-

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('chosen');

-

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('geodirectory-choose-ajax');

-

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

-

-    if (is_page() && geodir_is_page('add-listing')) {

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

-        wp_enqueue_script('jquery-ui-sortable');

-

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

-        wp_enqueue_script('geodirectory-plupload-script');

-        // SCRIPT FOR UPLOAD END

-

-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-        } else {

-            $ajax_url = admin_url('admin-ajax.php');

-        }

+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('geodirectory-goMap-script');

+

+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('chosen');

+

+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('geodirectory-choose-ajax');

+

+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+

+	if (is_page() && geodir_is_page('add-listing')) {

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

+		wp_enqueue_script('jquery-ui-sortable');

+

+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+		wp_enqueue_script('geodirectory-plupload-script');

+		// SCRIPT FOR UPLOAD END

+

+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+		} else {

+			$ajax_url = admin_url('admin-ajax.php');

+		}

 

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,browserplus,gears,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => $ajax_url,

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'upload_img_size' => geodir_max_upload_size());

-

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

-

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

-    } // End if for add place page

-

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    if ($is_detail_page) {

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,browserplus,gears,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => $ajax_url,

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'upload_img_size' => geodir_max_upload_size());

+

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+

+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+	} // End if for add place page

+

+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

-    // font awesome rating script

+	// font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

@@ -213,11 +213,11 @@ 
 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('geodir-on-document-load');

+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('google-geometa');

+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('google-geometa');

 }

 

 /**

@@ -231,8 +231,8 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

-    echo stripslashes(get_option('geodir_header_scripts'));

+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+	echo stripslashes(get_option('geodir_header_scripts'));

 }

 

 /**

@@ -245,7 +245,7 @@ 
  */

 function geodir_google_analytics_tracking_code()

 {

-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

 

         <script>

             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -260,9 +260,9 @@ 
         </script>

 

         <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

-        echo stripslashes(get_option('geodir_ga_tracking_code'));

-    }

+	}elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+		echo stripslashes(get_option('geodir_ga_tracking_code'));

+	}

 }

 

 /**

@@ -276,16 +276,16 @@ 
 function geodir_footer_scripts()

 {

 

-    echo stripslashes(get_option('geodir_footer_scripts'));

+	echo stripslashes(get_option('geodir_footer_scripts'));

 

-    /*

+	/*

      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041

      *

      * Flexbox wont wrap on ios for search form items

      */

-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

-    }

+	if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

+	}

 }

 

 

@@ -299,12 +299,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

+	if (strpos($url, '#asyncload')===false)

+		return $url;

+	else if (is_admin())

+		return str_replace('#asyncload', '', $url);

+	else

+		return str_replace('#asyncload', '', $url)."' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -317,17 +317,17 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodir-core-scss');

+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodirectory-frontend-rtl-style');

-    }

+	if(is_rtl()){

+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodirectory-frontend-rtl-style');

+	}

 

-    wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('font-awesome');

+	wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('font-awesome');

 

 

 }

@@ -341,7 +341,7 @@ 
  */

 function geodir_get_sidebar()

 {

-    get_sidebar('geodirectory');

+	get_sidebar('geodirectory');

 }

 

 /**

@@ -360,122 +360,122 @@ 
  * @param bool $always_show Do you want to show the pagination always? Default: false.

  */

 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {

-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

 

-    if (empty($prelabel)) {

-        $prelabel = '<strong>&lt;</strong>';

-    }

+	if (empty($prelabel)) {

+		$prelabel = '<strong>&lt;</strong>';

+	}

 

-    if (empty($nxtlabel)) {

-        $nxtlabel = '<strong>&gt;</strong>';

-    }

+	if (empty($nxtlabel)) {

+		$nxtlabel = '<strong>&gt;</strong>';

+	}

 

-    $half_pages_to_show = round($pages_to_show / 2);

+	$half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

-        return;

+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

+		return;

 

-    if (!is_single()) {

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

-        $numposts = $wp_query->found_posts;

+	if (!is_single()) {

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

+		$numposts = $wp_query->found_posts;

 

-        $max_page = ceil($numposts / $posts_per_page);

+		$max_page = ceil($numposts / $posts_per_page);

 

-        if (empty($paged)) {

-            $paged = 1;

-        }

+		if (empty($paged)) {

+			$paged = 1;

+		}

         

-        $post_type = geodir_get_current_posttype();

-        $listing_type_name = get_post_type_plural_label($post_type);

-        if (geodir_is_page('listing') || geodir_is_page('search')) {            

-            $term = array();

+		$post_type = geodir_get_current_posttype();

+		$listing_type_name = get_post_type_plural_label($post_type);

+		if (geodir_is_page('listing') || geodir_is_page('search')) {            

+			$term = array();

             

-            if (is_tax()) {

-                $term_id = get_queried_object_id();

-                $taxonomy = get_query_var('taxonomy');

+			if (is_tax()) {

+				$term_id = get_queried_object_id();

+				$taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

-                }

-            }

+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

+					$term = get_term($term_id, $post_type . 'category');

+				}

+			}

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

                 

-                if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

-                }

-            }

+				if (!is_array($taxonomy_search)) {

+					$term = get_term((int)$taxonomy_search, $post_type . 'category');

+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+				}

+			}

             

-            if (!empty($term) && !is_wp_error($term)) {

-                $listing_type_name = $term->name;

-            }

-        }

+			if (!empty($term) && !is_wp_error($term)) {

+				$listing_type_name = $term->name;

+			}

+		}

 

-        if ($max_page > 1 || $always_show) {            

-            // Extra pagination info

-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

-            $end_no = min($paged * $posts_per_page, $numposts);

+		if ($max_page > 1 || $always_show) {            

+			// Extra pagination info

+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;

+			$end_no = min($paged * $posts_per_page, $numposts);

 

-            if ($geodir_pagination_more_info != '') {

-                if ($listing_type_name) {

-                    $listing_type_name = __($listing_type_name, 'geodirectory');

-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

-                } else {

-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

-                }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

-                /**

-                 * Adds an extra pagination info above/under pagination.

-                 *

-                 * @since 1.5.9

-                 *

-                 * @param string $pagination_info Extra pagination info content.

-                 * @param string $listing_type_name Listing results type.

-                 * @param string $start_no First result number.

-                 * @param string $end_no Last result number.

-                 * @param string $numposts Total number of listings.

-                 * @param string $post_type The post type.

-                 */

-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

+			if ($geodir_pagination_more_info != '') {

+				if ($listing_type_name) {

+					$listing_type_name = __($listing_type_name, 'geodirectory');

+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

+				} else {

+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

+				}

+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+				/**

+				 * Adds an extra pagination info above/under pagination.

+				 *

+				 * @since 1.5.9

+				 *

+				 * @param string $pagination_info Extra pagination info content.

+				 * @param string $listing_type_name Listing results type.

+				 * @param string $start_no First result number.

+				 * @param string $end_no Last result number.

+				 * @param string $numposts Total number of listings.

+				 * @param string $post_type The post type.

+				 */

+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

-                if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

-                } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

-                }

-            }

+				if ($geodir_pagination_more_info == 'before') {

+					$before = $before . $pagination_info;

+				} else if ($geodir_pagination_more_info == 'after') {

+					$after = $pagination_info . $after;

+				}

+			}

             

-            echo "$before <div class='Navi gd-navi'>";

-            if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

-            }

-            previous_posts_link($prelabel);

-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

-                if ($i >= 1 && $i <= $max_page) {

-                    if ($i == $paged) {

-                        echo "<strong class='on'>$i</strong>";

-                    } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

-                    }

-                }

-            }

-            next_posts_link($nxtlabel, $max_page);

-            if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

-            }

-            echo "</div> $after";

-        }

+			echo "$before <div class='Navi gd-navi'>";

+			if ($paged >= ($pages_to_show - 1)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+			}

+			previous_posts_link($prelabel);

+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

+				if ($i >= 1 && $i <= $max_page) {

+					if ($i == $paged) {

+						echo "<strong class='on'>$i</strong>";

+					} else {

+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+					}

+				}

+			}

+			next_posts_link($nxtlabel, $max_page);

+			if (($paged + $half_pages_to_show) < ($max_page)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+			}

+			echo "</div> $after";

+		}

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-    }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

+	}

 }

 

 /**

@@ -486,20 +486,20 @@ 
  */

 function geodir_listingsearch_scripts()

 {

-    if (get_option('gd_search_dist') != '') {

-        $dist = get_option('gd_search_dist');

-    } else {

-        $dist = 500;

-    }

-    $dist_dif = 1000;

-

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

-

-    ?>

+	if (get_option('gd_search_dist') != '') {

+		$dist = get_option('gd_search_dist');

+	} else {

+		$dist = 500;

+	}

+	$dist_dif = 1000;

+

+	if ($dist <= 5000) $dist_dif = 500;

+	if ($dist <= 1000) $dist_dif = 100;

+	if ($dist <= 500) $dist_dif = 50;

+	if ($dist <= 100) $dist_dif = 10;

+	if ($dist <= 50) $dist_dif = 5;

+

+	?>

     <script type="text/javascript">

 

         jQuery(function ($) {

@@ -557,20 +557,20 @@ 
  * @package GeoDirectory

  */

 function geodir_add_sharelocation_scripts() {

-    $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+	$default_search_for_text = SEARCH_FOR_TEXT;

+	if (get_option('geodir_search_field_default_text'))

+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 

-    $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+	$default_near_text = NEAR_TEXT;

+	if (get_option('geodir_near_field_default_text'))

+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

     

-    $search_location = geodir_get_default_location();

+	$search_location = geodir_get_default_location();

     

-    $default_search_for_text = addslashes(stripslashes($default_search_for_text));

-    $default_near_text = addslashes(stripslashes($default_near_text));

-    $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';

-    ?>

+	$default_search_for_text = addslashes(stripslashes($default_search_for_text));

+	$default_near_text = addslashes(stripslashes($default_near_text));

+	$city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';

+	?>

     <script type="text/javascript">

         var default_location = '<?php echo $city ;?>';

         var latlng;

@@ -651,14 +651,14 @@ 
                     initialise2();

                 } else {

                     <?php

-                    $near_add = get_option('geodir_search_near_addition');

-                    /**

-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.

-                     *

-                     * @since 1.0.0

-                     */

-                    $near_add2 = apply_filters('geodir_search_near_addition', '');

-                    ?>

+					$near_add = get_option('geodir_search_near_addition');

+					/**

+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.

+					 *

+					 * @since 1.0.0

+					 */

+					$near_add2 = apply_filters('geodir_search_near_addition', '');

+					?>

                     if (window.gdMaps === 'google') {

                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

                             function (results, status) {

@@ -772,32 +772,32 @@ 
  */

 function geodir_show_badges_on_image($which, $post, $link)

 {

-    $return = '';

-    switch ($which) {

-        case 'featured':

-            /**

-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

-            break;

-        case 'new' :

-            /**

-             * Filter the new image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

-            break;

-

-    }

+	$return = '';

+	switch ($which) {

+		case 'featured':

+			/**

+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+			break;

+		case 'new' :

+			/**

+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+			break;

+

+	}

     

-    return $return;

+	return $return;

 }

 

 /**

@@ -806,8 +806,8 @@ 
  * @since 1.6.22

  */

 function geodir_fix_script_conflict() {

-    if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {

-        wp_dequeue_script( 'flexslider' );

-    }

+	if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {

+		wp_dequeue_script( 'flexslider' );

+	}

 }

 add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 );
\ No newline at end of file

geodirectory-functions/location_functions.php

Doc Comments +5 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return object

+ * @return string

  */

 function geodir_get_default_location()

 {

@@ -276,7 +276,7 @@ 
  * @package GeoDirectory

  * @param int $min The minimum number. Default: 0.

  * @param int $max The maximum number. Default: 1.

- * @return float

+ * @return integer

  */

 function geodir_random_float($min = 0, $max = 1)

 {

@@ -594,6 +594,9 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

+/**
+ * @param string $sep
+ */
 function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

 

     global $wp;

Braces +31 added lines, -22 removed lines

@@ -61,11 +61,12 @@ 
 function geodir_is_default_location_set()

 {

     $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

-}

+    if (!empty($default_location)) {
+            return true;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns location slug using location string.

@@ -259,8 +260,9 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+        if ($geodir_location->is_default) {
+                    update_option('geodir_default_location', $geodir_location);
+        }
 

         return $geodir_location->location_id;

 

@@ -308,9 +310,10 @@ 
     $status = $data->status;

     if ($status == "OK") {

         return $data->results[0]->address_components;

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns current location terms.

@@ -334,16 +337,19 @@ 
         }

 

         $country = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '' && $country) {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

         $region = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '' && $region) {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

         $city = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '' && $city) {
+                    $location_array['gd_city'] = urldecode($city);
+        }
     } else {

         if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

             return $location_array;

@@ -355,14 +361,17 @@ 
 

         $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '') {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '') {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '') {
+                    $location_array['gd_city'] = urldecode($city);
+        }
 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

Indentation +408 added lines, -408 removed lines

@@ -9,10 +9,10 @@ 
  */

 function geodir_get_current_city_lat()

 {

-    $location = geodir_get_default_location();

-    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

+	$location = geodir_get_default_location();

+	$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

 

-    return $lat;

+	return $lat;

 }

 

 /**

@@ -25,9 +25,9 @@ 
  */

 function geodir_get_current_city_lng()

 {

-    $location = geodir_get_default_location();

-    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

-    return $lng;

+	$location = geodir_get_default_location();

+	$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

+	return $lng;

 }

 

 

@@ -40,15 +40,15 @@ 
  */

 function geodir_get_default_location()

 {

-    /**

-     * Filter the default location.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_result The default location object.

-     */

-    return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

+	/**

+	 * Filter the default location.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_result The default location object.

+	 */

+	return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

 }

 

 /**

@@ -60,11 +60,11 @@ 
  */

 function geodir_is_default_location_set()

 {

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location))

+		return true;

+	else

+		return false;

 }

 

 /**

@@ -78,15 +78,15 @@ 
 function create_location_slug($location_string)

 {

 

-    /**

-     * Filter the location slug.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_string Sanitized location string.

-     */

-    return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

+	/**

+	 * Filter the location slug.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_string Sanitized location string.

+	 */

+	return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

 

 }

 

@@ -100,15 +100,15 @@ 
  */

 function geodir_get_location($id = '')

 {

-    /**

-     * Filter the location information.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $id The location ID.

-     */

-    return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

+	/**

+	 * Filter the location information.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $id The location ID.

+	 */

+	return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

 }

 

 /**

@@ -122,28 +122,28 @@ 
  */

 function geodir_get_country_dl($post_country = '', $prefix = '')

 {

-    global $wpdb;

+	global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+	$rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

     

-    $ISO2 = array();

-    $countries = array();

+	$ISO2 = array();

+	$countries = array();

     

-    foreach ($rows as $row) {

-        $ISO2[$row->Country] = $row->ISO2;

-        $countries[$row->Country] = __($row->Country, 'geodirectory');

-    }

+	foreach ($rows as $row) {

+		$ISO2[$row->Country] = $row->ISO2;

+		$countries[$row->Country] = __($row->Country, 'geodirectory');

+	}

     

-    asort($countries);

+	asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

-    foreach ($countries as $country => $name) {

-        $ccode = $ISO2[$country];

+	$out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+	foreach ($countries as $country => $name) {

+		$ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

-    }

+		$out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+	}

 

-    echo $out_put;

+	echo $out_put;

 }

 

 

@@ -158,40 +158,40 @@ 
 function geodir_location_form_submit()

 {

 

-    global $wpdb, $plugin_prefix;

-    if (isset($_REQUEST['add_location'])) {

+	global $wpdb, $plugin_prefix;

+	if (isset($_REQUEST['add_location'])) {

 

-        $location_info = array(

-            'city' => $_REQUEST['city'],

-            'region' => $_REQUEST['region'],

-            'country' => $_REQUEST['country'],

-            'geo_lat' => $_REQUEST['latitude'],

-            'geo_lng' => $_REQUEST['longitude'],

-            'is_default' => $_REQUEST['is_default'],

-            'update_city' => $_REQUEST['update_city']

-        );

+		$location_info = array(

+			'city' => $_REQUEST['city'],

+			'region' => $_REQUEST['region'],

+			'country' => $_REQUEST['country'],

+			'geo_lat' => $_REQUEST['latitude'],

+			'geo_lng' => $_REQUEST['longitude'],

+			'is_default' => $_REQUEST['is_default'],

+			'update_city' => $_REQUEST['update_city']

+		);

 

-        $old_location = geodir_get_default_location();

+		$old_location = geodir_get_default_location();

 

-        $locationid = geodir_add_new_location($location_info);

+		$locationid = geodir_add_new_location($location_info);

 

-        $default_location = geodir_get_location($locationid);

+		$default_location = geodir_get_location($locationid);

 

-        //UPDATE AND DELETE LISTING

-        $posttype = geodir_get_posttypes();

-        if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

+		//UPDATE AND DELETE LISTING

+		$posttype = geodir_get_posttypes();

+		if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

-            foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+			foreach ($posttype as $posttypeobj) {

+				$post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

 

-                $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

-                    array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

-                );

-                $wpdb->query($sql);

-            }

-        }

-    }

+				$sql = $wpdb->prepare(

+					"UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+					array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

+				);

+				$wpdb->query($sql);

+			}

+		}

+	}

 }

 

 /**

@@ -215,37 +215,37 @@ 
  */

 function geodir_add_new_location($location_info = array())

 {

-    global $wpdb;

-

-    if (!empty($location_info)) {

-        $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

-        $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

-        $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

-        $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

-        $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

-        $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

-        $country_slug = create_location_slug(__($location_country, 'geodirectory'));

-        $region_slug = create_location_slug($location_region);

-        $city_slug = create_location_slug($location_city);

+	global $wpdb;

+

+	if (!empty($location_info)) {

+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

+		$location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

+		$location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

+		$location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

+		$is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

+		$country_slug = create_location_slug(__($location_country, 'geodirectory'));

+		$region_slug = create_location_slug($location_region);

+		$city_slug = create_location_slug($location_city);

         

-        /**

-         * Filter add new location data.

-         *

-         * @since 1.0.0

-         */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

-            'country' => $location_country,

-            'region' => $location_region,

-            'city' => $location_city,

-            'country_slug' => $country_slug,

-            'region_slug' => $region_slug,

-            'city_slug' => $city_slug,

-            'city_latitude' => $location_lat,

-            'city_longitude' => $location_lng,

-            'is_default' => $is_default

-        ));

-

-        /* // Not allowed to create country in DB : 2016-12-09

+		/**

+		 * Filter add new location data.

+		 *

+		 * @since 1.0.0

+		 */

+		$geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+			'country' => $location_country,

+			'region' => $location_region,

+			'city' => $location_city,

+			'country_slug' => $country_slug,

+			'region_slug' => $region_slug,

+			'city_slug' => $city_slug,

+			'city_latitude' => $location_lat,

+			'city_longitude' => $location_lng,

+			'is_default' => $is_default

+		));

+

+		/* // Not allowed to create country in DB : 2016-12-09

         if ($geodir_location->country) {

 

             $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

@@ -259,14 +259,14 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+		if ($geodir_location->is_default)

+			update_option('geodir_default_location', $geodir_location);

 

-        return $geodir_location->location_id;

+		return $geodir_location->location_id;

 

-    } else {

-        return false;

-    }

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -280,7 +280,7 @@ 
  */

 function geodir_random_float($min = 0, $max = 1)

 {

-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);

+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);

 }

 

 /**

@@ -294,23 +294,23 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) . "&key=" . geodir_get_map_api_key();

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

+	$url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) . "&key=" . geodir_get_map_api_key();

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

     

-    $data = json_decode($response);

-    $status = $data->status;

-    if ($status == "OK") {

-        return $data->results[0]->address_components;

-    } else

-        return false;

+	$data = json_decode($response);

+	$status = $data->status;

+	if ($status == "OK") {

+		return $data->results[0]->address_components;

+	} else

+		return false;

 }

 

 /**

@@ -327,71 +327,71 @@ 
  */

 function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '')

 {

-    global $wp, $gd_session;

-    $location_array = array();

-    if ($location_array_from == 'session') {

-        if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

-            return $location_array;

-        }

+	global $wp, $gd_session;

+	$location_array = array();

+	if ($location_array_from == 'session') {

+		if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

+			return $location_array;

+		}

 

-        $country = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+		$country = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : $gd_session->get('gd_country');

+		if ($country != '' && $country)

+			$location_array['gd_country'] = urldecode($country);

 

-        $region = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+		$region = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : $gd_session->get('gd_region');

+		if ($region != '' && $region)

+			$location_array['gd_region'] = urldecode($region);

 

-        $city = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

-    } else {

-        if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

-            return $location_array;

-        }

+		$city = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : $gd_session->get('gd_city');

+		if ($city != '' && $city)

+			$location_array['gd_city'] = urldecode($city);

+	} else {

+		if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

+			return $location_array;

+		}

 

-        $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

 

-        $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

 

-        $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+		$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+		if ($country != '')

+			$location_array['gd_country'] = urldecode($country);

 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+		if ($region != '')

+			$location_array['gd_region'] = urldecode($region);

 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+		if ($city != '')

+			$location_array['gd_city'] = urldecode($city);

 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

 			$location_array = geodir_get_current_location_terms('session');

 		}

-    }

+	}

 

 

 	/**

 	 * Filter the location terms.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_array {

+	 *    Attributes of the location_array.

+	 *

+	 *    @type string $gd_country The country slug.

+	 *    @type string $gd_region The region slug.

+	 *    @type string $gd_city The city slug.

 	 *

-     * @param array $location_array {

-     *    Attributes of the location_array.

-     *

-     *    @type string $gd_country The country slug.

-     *    @type string $gd_region The region slug.

-     *    @type string $gd_city The city slug.

-     *

-     * }

+	 * }

 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

 	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

 

-    return $location_array;

+	return $location_array;

 

 }

 

@@ -404,24 +404,24 @@ 
  * @return bool|string

  */

 function geodir_get_location_link($which_location = 'current') {

-    $location_link = get_permalink(geodir_location_page_id());

-

-    if ($which_location == 'base') {

-        return $location_link;

-    } else {

-        $location_terms = geodir_get_current_location_terms();

-

-        if (!empty($location_terms)) {

-            if (get_option('permalink_structure') != '') {

-                $location_terms = implode("/", $location_terms);

-                $location_terms = rtrim($location_terms, '/');

-                $location_link .= $location_terms;

-            } else {

-                $location_link = geodir_getlink($location_link, $location_terms);

-            }

-        }

-    }

-    return $location_link;

+	$location_link = get_permalink(geodir_location_page_id());

+

+	if ($which_location == 'base') {

+		return $location_link;

+	} else {

+		$location_terms = geodir_get_current_location_terms();

+

+		if (!empty($location_terms)) {

+			if (get_option('permalink_structure') != '') {

+				$location_terms = implode("/", $location_terms);

+				$location_terms = rtrim($location_terms, '/');

+				$location_link .= $location_terms;

+			} else {

+				$location_link = geodir_getlink($location_link, $location_terms);

+			}

+		}

+	}

+	return $location_link;

 }

 

 /**

@@ -434,34 +434,34 @@ 
  * @return array|bool Returns address on success.

  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

-    $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

+	$url = is_ssl() ? 'https:' : 'http:';

+	$url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

     

-    if (!empty($data) && !empty($data->address)) {

-        $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+	if (!empty($data) && !empty($data->address)) {

+		$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

+		$formatted_address = (array)$data->address;

         

-        foreach ( $data->address as $key => $value ) {

-            if (!in_array($key, $address_fields)) {

-                unset($formatted_address[$key]);

-            }

-        }

-        $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

+		foreach ( $data->address as $key => $value ) {

+			if (!in_array($key, $address_fields)) {

+				unset($formatted_address[$key]);

+			}

+		}

+		$data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

         

-        return $data;

-    } else {

-        return false;

-    }

+		return $data;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -475,51 +475,51 @@ 
  * @return string Returns the country.

  */

 function geodir_get_normal_country($country, $default = '1') {

-    global $wpdb;

-    if ($result = geodir_get_country_by_name($country)) {

-        return $result;

-    }

+	global $wpdb;

+	if ($result = geodir_get_country_by_name($country)) {

+		return $result;

+	}

     

-    if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

+	if (defined('POST_LOCATION_TABLE')) {

+		$rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

-    }

+		$rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

+	}

     

-    if ( $default === '0' ) {

-        return NULL;

-    }

+	if ( $default === '0' ) {

+		return NULL;

+	}

     

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

-        return $result;

-    }

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

-        return $result;

-    }

+	if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

-        return $result;

-    }

+	if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -531,16 +531,16 @@ 
  * @return string Country ISO2 code.

  */

 function geodir_get_country_iso2($country) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -553,16 +553,16 @@ 
  * @return string|null Country ISO2 code.

  */

 function geodir_get_country_by_name($country, $iso2 = false) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+		return $result;

+	}

     

-    return NULL;

+	return NULL;

 }

 

 

@@ -582,158 +582,158 @@ 
  */

 function geodir_replace_location_variables($content, $location_array = array(), $sep = NULL, $gd_page = '') {

 

-    if (empty($content)) {

-        return $content;

-    }

+	if (empty($content)) {

+		return $content;

+	}

 

 

-    $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page);

+	$location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page);

 

-    if (!empty($location_replace_vars)) {

-        foreach ($location_replace_vars as $search => $replace) {

-            if (!empty($search) && strpos($content, $search) !== false) {

-                $content = str_replace($search, $replace, $content);

-            }

-        }

-    }

+	if (!empty($location_replace_vars)) {

+		foreach ($location_replace_vars as $search => $replace) {

+			if (!empty($search) && strpos($content, $search) !== false) {

+				$content = str_replace($search, $replace, $content);

+			}

+		}

+	}

 

-    return $content;

+	return $content;

 }

 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

 function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

 

-    global $wp;

+	global $wp;

     

-    $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

-

-    if (empty($location_array)) {

-        $location_array = geodir_get_current_location_terms('query_vars');

-    }

-

-    $location_terms = array();

-    $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

-    $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

-    $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

-    $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

-

-    $location_names = array();

-    foreach ($location_terms as $type => $location) {

-        $location_name = $location;

-

-        if (!empty($location_name)) {

-            if ($location_manager) {

-                $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                $location_name = get_actual_location_name($location_type, $location, true);

-            } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                $location_name = __(geodir_ucwords($location_name), 'geodirectory');

-            }

-        }

-

-        $location_names[$type] = $location_name;

-    }

-

-    $location_single = '';

-    foreach ($location_terms as $type => $location) {

-        if (!empty($location)) {

-            if (!empty($location_names[$type])) {

-                $location_single = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                    $location_single = get_actual_location_name($location_type, $location, true);

-                } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                    $location_single = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

-            break;

-        }

-    }

-

-    $full_location = array();

-    if (!empty($location_array)) {

-        $location_array = array_reverse($location_array);

-

-        foreach ($location_array as $type => $location) {

-            if (!empty($location_names[$type])) {

-                $location_name = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                    $location_name = get_actual_location_name($location_type, $location, true);

-                } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                    $location_name = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

+	$location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

+

+	if (empty($location_array)) {

+		$location_array = geodir_get_current_location_terms('query_vars');

+	}

+

+	$location_terms = array();

+	$location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

+	$location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

+	$location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

+	$location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

+

+	$location_names = array();

+	foreach ($location_terms as $type => $location) {

+		$location_name = $location;

+

+		if (!empty($location_name)) {

+			if ($location_manager) {

+				$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+				$location_name = get_actual_location_name($location_type, $location, true);

+			} else {

+				$location_name = preg_replace( '/-(\d+)$/', '', $location_name);

+				$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+				$location_name = __(geodir_ucwords($location_name), 'geodirectory');

+			}

+		}

 

-            $full_location[] = $location_name;

-        }

+		$location_names[$type] = $location_name;

+	}

+

+	$location_single = '';

+	foreach ($location_terms as $type => $location) {

+		if (!empty($location)) {

+			if (!empty($location_names[$type])) {

+				$location_single = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+					$location_single = get_actual_location_name($location_type, $location, true);

+				} else {

+					$location_name = preg_replace( '/-(\d+)$/', '', $location);

+					$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+					$location_single = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+			break;

+		}

+	}

+

+	$full_location = array();

+	if (!empty($location_array)) {

+		$location_array = array_reverse($location_array);

+

+		foreach ($location_array as $type => $location) {

+			if (!empty($location_names[$type])) {

+				$location_name = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+					$location_name = get_actual_location_name($location_type, $location, true);

+				} else {

+					$location_name = preg_replace( '/-(\d+)$/', '', $location);

+					$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+					$location_name = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+

+			$full_location[] = $location_name;

+		}

 

-        if (!empty($full_location)) {

-            $full_location = array_unique($full_location);

-        }

-    }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

+		if (!empty($full_location)) {

+			$full_location = array_unique($full_location);

+		}

+	}

+	$full_location = !empty($full_location) ? implode(', ', $full_location): '';

     

-    if ( empty( $full_location ) ) {

-        /**

-         * Filter the text in meta description in full location is empty.

-         *

-         * @since 1.6.22

-         * 

-         * @param string $full_location Default: Empty.

-         * @param array  $location_array The array of location variables.

-         * @param string $gd_page       The page being filtered.

-         * @param string $sep           The separator.

-         */

-         $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep );

-    }

+	if ( empty( $full_location ) ) {

+		/**

+		 * Filter the text in meta description in full location is empty.

+		 *

+		 * @since 1.6.22

+		 * 

+		 * @param string $full_location Default: Empty.

+		 * @param array  $location_array The array of location variables.

+		 * @param string $gd_page       The page being filtered.

+		 * @param string $sep           The separator.

+		 */

+		 $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep );

+	}

     

-    if ( empty( $location_single ) ) {

-        /**

-         * Filter the text in meta description in single location is empty.

-         *

-         * @since 1.6.22

-         * 

-         * @param string $location_single Default: Empty.

-         * @param array $location_array The array of location variables.

-         * @param string $gd_page       The page being filtered.

-         * @param string $sep           The separator.

-         */

-         $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep );

-    }

-

-    $location_replace_vars = array();

-    $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

-    $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : '';

-    $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : '';

-

-    foreach ($location_names as $type => $name) {

-        $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : '';

-    }

-

-    /**

-     * Filter the location terms variables to search & replace.

-     *

-     * @since   1.6.16

-     * @package GeoDirectory

-     *

-     * @param array $location_replace_vars The array of search & replace variables.

-     * @param array $location_array The array of location variables.

-     * @param string $gd_page       The page being filtered.

-     * @param string $sep           The separator.

-     */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+	if ( empty( $location_single ) ) {

+		/**

+		 * Filter the text in meta description in single location is empty.

+		 *

+		 * @since 1.6.22

+		 * 

+		 * @param string $location_single Default: Empty.

+		 * @param array $location_array The array of location variables.

+		 * @param string $gd_page       The page being filtered.

+		 * @param string $sep           The separator.

+		 */

+		 $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep );

+	}

+

+	$location_replace_vars = array();

+	$location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

+	$location_replace_vars['%%location%%'] = $full_location;

+	$location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : '';

+	$location_replace_vars['%%location_single%%'] = $location_single;

+	$location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : '';

+

+	foreach ($location_names as $type => $name) {

+		$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+

+		$location_replace_vars['%%location_' . $location_type . '%%'] = $name;

+		$location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : '';

+	}

+

+	/**

+	 * Filter the location terms variables to search & replace.

+	 *

+	 * @since   1.6.16

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_replace_vars The array of search & replace variables.

+	 * @param array $location_array The array of location variables.

+	 * @param string $gd_page       The page being filtered.

+	 * @param string $sep           The separator.

+	 */

+	return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

 }
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -124,7 +124,7 @@ 
 {

     global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");

     

     $ISO2 = array();

     $countries = array();

@@ -136,11 +136,11 @@ 
     

     asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+    $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';

     foreach ($countries as $country => $name) {

         $ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+        $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';

     }

 

     echo $out_put;

@@ -182,10 +182,10 @@ 
         if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

             foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+                $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location

 

                 $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+                    "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

                     array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

                 );

                 $wpdb->query($sql);

@@ -233,7 +233,7 @@ 
          *

          * @since 1.0.0

          */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+        $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,

             'country' => $location_country,

             'region' => $location_region,

             'city' => $location_city,

@@ -294,7 +294,7 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) . "&key=" . geodir_get_map_api_key();

+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng)."&key=".geodir_get_map_api_key();

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -389,7 +389,7 @@ 
 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

-	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

+	$location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);

 

     return $location_array;

 

@@ -435,7 +435,7 @@ 
  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

     $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -449,9 +449,9 @@ 
     

     if (!empty($data) && !empty($data->address)) {

         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+        $formatted_address = (array) $data->address;

         

-        foreach ( $data->address as $key => $value ) {

+        foreach ($data->address as $key => $value) {

             if (!in_array($key, $address_fields)) {

                 unset($formatted_address[$key]);

             }

@@ -481,7 +481,7 @@ 
     }

     

     if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -491,7 +491,7 @@ 
             }

         }

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -502,7 +502,7 @@ 
         }

     }

     

-    if ( $default === '0' ) {

+    if ($default === '0') {

         return NULL;

     }

     

@@ -533,10 +533,10 @@ 
 function geodir_get_country_iso2($country) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

         return $result;

     }

     

@@ -555,10 +555,10 @@ 
 function geodir_get_country_by_name($country, $iso2 = false) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {

         return $result;

     }

     

@@ -602,7 +602,7 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

-function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

+function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = '') {

 

     global $wp;

     

@@ -627,8 +627,8 @@ 
                 $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                 $location_name = get_actual_location_name($location_type, $location, true);

             } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                $location_name = preg_replace('/-(\d+)$/', '', $location_name);

+                $location_name = preg_replace('/[_-]/', ' ', $location_name);

                 $location_name = __(geodir_ucwords($location_name), 'geodirectory');

             }

         }

@@ -646,8 +646,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_single = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_single = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -667,8 +667,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_name = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_name = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -680,9 +680,9 @@ 
             $full_location = array_unique($full_location);

         }

     }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

+    $full_location = !empty($full_location) ? implode(', ', $full_location) : '';

     

-    if ( empty( $full_location ) ) {

+    if (empty($full_location)) {

         /**

          * Filter the text in meta description in full location is empty.

          *

@@ -693,10 +693,10 @@ 
          * @param string $gd_page       The page being filtered.

          * @param string $sep           The separator.

          */

-         $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep );

+         $full_location = apply_filters('geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep);

     }

     

-    if ( empty( $location_single ) ) {

+    if (empty($location_single)) {

         /**

          * Filter the text in meta description in single location is empty.

          *

@@ -707,21 +707,21 @@ 
          * @param string $gd_page       The page being filtered.

          * @param string $sep           The separator.

          */

-         $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep );

+         $location_single = apply_filters('geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep);

     }

 

     $location_replace_vars = array();

     $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

     $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : '';

+    $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf(_x('in %s', 'in location', 'geodirectory'), $full_location) : '';

     $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : '';

+    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf(_x('in %s', 'in location', 'geodirectory'), $location_single) : '';

 

     foreach ($location_names as $type => $name) {

         $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

 

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : '';

+        $location_replace_vars['%%location_'.$location_type.'%%'] = $name;

+        $location_replace_vars['%%in_location_'.$location_type.'%%'] = !empty($name) ? sprintf(_x('in %s', 'in location', 'geodirectory'), $name) : '';

     }

 

     /**

@@ -735,5 +735,5 @@ 
      * @param string $gd_page       The page being filtered.

      * @param string $sep           The separator.

      */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+    return apply_filters('geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep);

 }
\ No newline at end of file