Inspection of "Display cpt/category name in the advanced paginati..." - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Retried Inspection

Pull Request — master (#217)

by Kiran

created 2016-03-14 11:39 UTC

Status

Indentation +331 added lines, -331 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
  */
 function geodir_core_dequeue_script()
 {
-    wp_dequeue_script('flexslider');
+	wp_dequeue_script('flexslider');
 }
 
 add_action('wp_print_scripts', 'geodir_core_dequeue_script', 100);
@@ -35,143 +35,143 @@  discard block
 block discarded – undo
  */
 function geodir_templates_scripts()
 {
-    $is_detail_page = false;
-
-    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#asyncload', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('geodirectory-script');
-
-
-    $geodir_vars_data = array(
-        'siteurl' => get_option('siteurl'),
-        'geodir_plugin_url' => geodir_plugin_url(),
-        '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');
-    }
-
-    $map_lang = "&language=" . geodir_get_map_default_language();
-    /**
-     * 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('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_extra, '', NULL);
+	$is_detail_page = false;
+
+	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#asyncload', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('geodirectory-script');
+
+
+	$geodir_vars_data = array(
+		'siteurl' => get_option('siteurl'),
+		'geodir_plugin_url' => geodir_plugin_url(),
+		'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');
+	}
+
+	$map_lang = "&language=" . geodir_get_map_default_language();
+	/**
+	 * 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('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_extra, '', NULL);
     
-    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#asyncload', 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#asyncload', 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,flash,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,flash,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');
@@ -180,11 +180,11 @@  discard block
 block discarded – undo
 		wp_enqueue_script('geodir-jRating-js');
 	}
 
-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.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.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');
 }
 
 /**
@@ -198,8 +198,8 @@  discard block
 block discarded – undo
  */
 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'));
 }
 
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
 function geodir_footer_scripts()
 {	
 	echo stripslashes(get_option('geodir_ga_tracking_code'));
-    echo stripslashes(get_option('geodir_footer_scripts'));
+	echo stripslashes(get_option('geodir_footer_scripts'));
 }
 
 
@@ -229,12 +229,12 @@  discard block
 block discarded – undo
  */
 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);
 
@@ -248,55 +248,55 @@  discard block
 block discarded – undo
 {
 
 
-    if(get_option('geodir_scss_core')) {
+	if(get_option('geodir_scss_core')) {
 
 
-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-frontend-style');
+		wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-frontend-style');
 
-        wp_register_style('geodirectory-media-style', geodir_plugin_url() . '/geodirectory-assets/css/media.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-media-style');
+		wp_register_style('geodirectory-media-style', geodir_plugin_url() . '/geodirectory-assets/css/media.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-media-style');
 
 
-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-jquery-ui-css');
+		wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-jquery-ui-css');
 
-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
 
-        wp_register_style('geodirectory-flexslider-css', geodir_plugin_url() . '/geodirectory-assets/css/flexslider.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-flexslider-css');
+		wp_register_style('geodirectory-flexslider-css', geodir_plugin_url() . '/geodirectory-assets/css/flexslider.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-flexslider-css');
 
-        wp_register_style('geodirectory-thic-box-css', geodir_plugin_url() . '/geodirectory-assets/css/thic-box.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-thic-box-css');
+		wp_register_style('geodirectory-thic-box-css', geodir_plugin_url() . '/geodirectory-assets/css/thic-box.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-thic-box-css');
 
-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-pluplodar-css');
+		wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-pluplodar-css');
 
-        wp_register_style('geodirectory-lightbox-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.lightbox-0.5.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-lightbox-css');
+		wp_register_style('geodirectory-lightbox-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.lightbox-0.5.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-lightbox-css');
 
-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodir-rating-style');
+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodir-rating-style');
 
-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodir-chosen-style');
+		wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodir-chosen-style');
 
-    }else{
-        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');
+	}else{
+		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);
-    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('geodirectory-font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_style('geodirectory-font-awesome');
+	wp_register_style('geodirectory-font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_style('geodirectory-font-awesome');
 
 
 }
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
  */
 function geodir_get_sidebar()
 {
-    get_sidebar('geodirectory');
+	get_sidebar('geodirectory');
 }
 
 /**
@@ -329,122 +329,122 @@  discard block
 block discarded – undo
  * @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>&laquo;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&laquo;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&raquo;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&raquo;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
-    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) // dont apply default  pagination for geodirectory home page.
-        return;
+	if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_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'>";
-            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'>";
+			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);
+		}
+	}
 }
 
 /**
@@ -455,20 +455,20 @@  discard block
 block discarded – undo
  */
 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 ($) {
@@ -527,15 +527,15 @@  discard block
 block discarded – undo
 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');
 
-    ?>
+	?>
 
 
     <script type="text/javascript">
@@ -613,14 +613,14 @@  discard block
 block discarded – undo
                 } else {
 
                     Sgeocoder.geocode({'address': address<?php
-                    if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}
-                    if($near_add2 =
-                    /**
-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.
-                     *
-                     * @since 1.0.0
-                     */
-                    apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},
+					if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}
+					if($near_add2 =
+					/**
+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.
+					 *
+					 * @since 1.0.0
+					 */
+					apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},
                         function (results, status) {
                             if (status == google.maps.GeocoderStatus.OK) {
                                 updateSearchPosition(results[0].geometry.location, $form);
@@ -699,30 +699,30 @@  discard block
 block discarded – undo
  */
 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;
 }

Please login to merge, or discard this patch.

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 {
     $is_detail_page = false;
 
-    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;
     }
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
         'siteurl' => get_option('siteurl'),
         'geodir_plugin_url' => geodir_plugin_url(),
         '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
     );
 
@@ -72,17 +72,17 @@  discard block
 block discarded – undo
      *
      * }
      */
-    $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');
     }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
     $map_extra = apply_filters('geodir_googlemap_script_extra', '');
     wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_extra, '', NULL);
     
-    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');
 
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
         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
 
@@ -229,12 +229,12 @@  discard block
 block discarded – undo
  */
 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);
     else
-        return str_replace('#asyncload', '', $url)."' async='async";
+        return str_replace('#asyncload', '', $url) . "' async='async";
 }
 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
 {
 
 
-    if(get_option('geodir_scss_core')) {
+    if (get_option('geodir_scss_core')) {
 
 
         wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
         wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
         wp_enqueue_style('geodir-chosen-style');
 
-    }else{
+    } else {
         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');
 
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
 
     }
 
-    if(is_rtl()){
+    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');
     }
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
                 $term_id = get_queried_object_id();
                 $taxonomy = get_query_var('taxonomy');
 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category') {
                     $term = get_term($term_id, $post_type . 'category');
                 }
             }
@@ -374,9 +374,9 @@  discard block
 block discarded – undo
                 $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');
                 }
             }
             
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
         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 != '') {
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
         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; ?>,
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
 
 
     <script type="text/javascript">
-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';
+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';
         var latlng;
         var Sgeocoder;
         var address;
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
 				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') {
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
 					}
 				}
 				
-				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('');
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
 		});
         
 		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);
 		}
 
@@ -599,8 +599,8 @@  discard block
 block discarded – undo
         function geocodeAddress($form) {
             Sgeocoder = new google.maps.Geocoder(); // Call the geocode function
 
-            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();
@@ -608,24 +608,24 @@  discard block
 block discarded – undo
 
                 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 {
 
                     Sgeocoder.geocode({'address': address<?php
-                    if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}
-                    if($near_add2 =
+                    if ($near_add = get_option('geodir_search_near_addition')) {echo '+", ' . $near_add . '"'; }
+                    if ($near_add2 =
                     /**
                      * Adds any extra info to the near search box query when trying to geolocate it via google api.
                      *
                      * @since 1.0.0
                      */
-                    apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},
+                    apply_filters('geodir_search_near_addition', '')) {echo $near_add2; }//gt_advanced_near_search();?>},
                         function (results, status) {
                             if (status == google.maps.GeocoderStatus.OK) {
                                 updateSearchPosition(results[0].geometry.location, $form);
                             } else {
-                                alert("<?php _e('Search was not successful for the following reason:','geodirectory');?>" + status);
+                                alert("<?php _e('Search was not successful for the following reason:', 'geodirectory'); ?>" + status);
                             }
                         });
                 }
@@ -656,19 +656,19 @@  discard block
 block discarded – undo
             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);
         }
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
              * @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' :
             /**
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
              * @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;
 
     }

Please login to merge, or discard this patch.

geodirectory-functions/location_functions.php 2 patches

Indentation +202 added lines, -202 removed lines patch added patch discarded remove patch

@@ -1,18 +1,18 @@  discard block
 block discarded – undo
 <?php
 /**
- * Returns current city latitude.
- *
- * @since 1.0.0
- * @package GeoDirectory
- * @todo fix location variable
- * @return string
- */
+	 * Returns current city latitude.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @todo fix location variable
+	 * @return string
+	 */
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
 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);
+			}
+		}
+	}
 }
 
 /**
@@ -214,58 +214,58 @@  discard block
 block discarded – undo
  */
 function geodir_add_new_location($location_info = array())
 {
-    global $wpdb;
+	global $wpdb;
 
-    if (!empty($location_info)) {
+	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'] != '') ? $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);
+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';
+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';
+		$location_country = ($location_info['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
-        ));
+		/**
+		 * 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
+		));
 
 
-        if ($geodir_location->country) {
+		if ($geodir_location->country) {
 
-            $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));
+			$get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));
 
-            if (empty($get_country)) {
+			if (empty($get_country)) {
 
-                $wpdb->query($wpdb->prepare("INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (Country, Title) VALUES (%s,%s)", array($geodir_location->country, $geodir_location->country)));
+				$wpdb->query($wpdb->prepare("INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (Country, Title) VALUES (%s,%s)", array($geodir_location->country, $geodir_location->country)));
 
-            }
+			}
 
-        }
+		}
 
-        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;
+	}
 }
 
 /**
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
  */
 function geodir_random_float($min = 0, $max = 1)
 {
-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);
+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);
 }
 
 /**
@@ -293,22 +293,22 @@  discard block
 block discarded – undo
  */
 function geodir_get_address_by_lat_lan($lat, $lng)
 {
-    $url = 'http://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;
-
-    $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;
+	$url = 'http://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;
+
+	$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;
 }
 
 /**
@@ -325,70 +325,70 @@  discard block
 block discarded – undo
  */
 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 = $gd_session->get('gd_country');
-        if ($country != '' && $country)
-            $location_array['gd_country'] = urldecode($country);
+		$country = $gd_session->get('gd_country');
+		if ($country != '' && $country)
+			$location_array['gd_country'] = urldecode($country);
 
-        $region = $gd_session->get('gd_region');
-        if ($region != '' && $region)
-            $location_array['gd_region'] = urldecode($region);
+		$region = $gd_session->get('gd_region');
+		if ($region != '' && $region)
+			$location_array['gd_region'] = urldecode($region);
 
-        $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 = $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;
 
 }
 
@@ -403,31 +403,31 @@  discard block
 block discarded – undo
 function geodir_get_location_link($which_location = 'current')
 {
 
-    $location_link = get_permalink(geodir_location_page_id());
+	$location_link = get_permalink(geodir_location_page_id());
 
-    if (get_option('permalink_structure') != '') {
+	if (get_option('permalink_structure') != '') {
 
-        //$location_prefix = get_option('geodir_location_prefix');
-        //$location_link = substr_replace($location_link, $location_prefix, strpos($location_link, 'location'), strlen('location'));
+		//$location_prefix = get_option('geodir_location_prefix');
+		//$location_link = substr_replace($location_link, $location_prefix, strpos($location_link, 'location'), strlen('location'));
 
-    }
+	}
 
-    if ($which_location == 'base') {
-        return $location_link;
-    } else {
-        $location_terms = geodir_get_current_location_terms();
+	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;
+		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;
 }
 
 

Please login to merge, or discard this patch.

Braces +31 added lines, -22 removed lines patch added patch discarded remove patch

@@ -61,11 +61,12 @@  discard block
 block discarded – undo
 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.
@@ -258,8 +259,9 @@  discard block
 block discarded – undo
 
         }
 
-        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;
 
@@ -307,9 +309,10 @@  discard block
 block discarded – undo
     $status = $data->status;
     if ($status == "OK") {
         return $data->results[0]->address_components;
-    } else
-        return false;
-}
+    } else {
+            return false;
+    }
+    }
 
 /**
  * Returns current location terms.
@@ -333,16 +336,19 @@  discard block
 block discarded – undo
         }
 
         $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 = $gd_session->get('gd_region');
-        if ($region != '' && $region)
-            $location_array['gd_region'] = urldecode($region);
+        if ($region != '' && $region) {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 
         $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;
@@ -354,14 +360,17 @@  discard block
 block discarded – undo
 
         $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) {

Please login to merge, or discard this patch.

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	{
38	38	$is_detail_page = false;
39	39
40		- if((is_single() && geodir_is_geodir_page()) \|\| (is_page() && geodir_is_page('preview') )) {
	40	+ if ((is_single() && geodir_is_geodir_page()) \|\| (is_page() && geodir_is_page('preview'))) {
41	41	$is_detail_page = true;
42	42	}
43	43
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	'siteurl' => get_option('siteurl'),
52	52	'geodir_plugin_url' => geodir_plugin_url(),
53	53	'geodir_ajax_url' => geodir_get_ajax_url(),
54		- 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
	54	+ 'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),
55	55	'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
56	56	);
57	57
		@@ -72,17 +72,17 @@ discard block
		block discarded – undo
72	72	*
73	73	* }
74	74	*/
75		- $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
	75	+ $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);
76	76
77	77	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
78	78
79		- wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
80		- if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
	79	+ wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);
	80	+ if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }
81	81
82		- wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
	82	+ wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);
83	83	wp_enqueue_script('geodirectory-lightbox-jquery');
84	84
85		- wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
	85	+ wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);
86	86	if ($is_detail_page) {
87	87	wp_enqueue_script('geodirectory-jquery-simplemodal');
88	88	}
		@@ -99,7 +99,7 @@ discard block
		block discarded – undo
99	99	$map_extra = apply_filters('geodir_googlemap_script_extra', '');
100	100	wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_extra, '', NULL);
101	101
102		- wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
	102	+ wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
103	103	wp_enqueue_script('geodirectory-goMap-script');
104	104
105	105
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	wp_enqueue_script('plupload-all');
117	117	wp_enqueue_script('jquery-ui-sortable');
118	118
119		- wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
	119	+ wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
120	120	wp_enqueue_script('geodirectory-plupload-script');
121	121	// SCRIPT FOR UPLOAD END
122	122
		@@ -229,12 +229,12 @@ discard block
		block discarded – undo
229	229	*/
230	230	function geodir_add_async_forscript($url)
231	231	{
232		- if (strpos($url, '#asyncload')===false)
	232	+ if (strpos($url, '#asyncload') === false)
233	233	return $url;
234	234	else if (is_admin())
235	235	return str_replace('#asyncload', '', $url);
236	236	else
237		- return str_replace('#asyncload', '', $url)."' async='async";
	237	+ return str_replace('#asyncload', '', $url) . "' async='async";
238	238	}
239	239	add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
240	240
		@@ -248,7 +248,7 @@ discard block
		block discarded – undo
248	248	{
249	249
250	250
251		- if(get_option('geodir_scss_core')) {
	251	+ if (get_option('geodir_scss_core')) {
252	252
253	253
254	254	wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282	wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
283	283	wp_enqueue_style('geodir-chosen-style');
284	284
285		- }else{
	285	+ } else {
286	286	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
287	287	wp_enqueue_style('geodir-core-scss');
288	288
		@@ -290,7 +290,7 @@ discard block
		block discarded – undo
290	290
291	291	}
292	292
293		- if(is_rtl()){
	293	+ if (is_rtl()) {
294	294	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
295	295	wp_enqueue_style('geodirectory-frontend-rtl-style');
296	296	}
		@@ -365,7 +365,7 @@ discard block
		block discarded – undo
365	365	$term_id = get_queried_object_id();
366	366	$taxonomy = get_query_var('taxonomy');
367	367
368		- if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
	368	+ if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category') {
369	369	$term = get_term($term_id, $post_type . 'category');
370	370	}
371	371	}
		@@ -374,9 +374,9 @@ discard block
		block discarded – undo
374	374	$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
375	375
376	376	if (!is_array($taxonomy_search)) {
377		- $term = get_term((int)$taxonomy_search, $post_type . 'category');
378		- } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
379		- $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
	377	+ $term = get_term((int) $taxonomy_search, $post_type . 'category');
	378	+ } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
	379	+ $term = get_term((int) $taxonomy_search[0], $post_type . 'category');
380	380	}
381	381	}
382	382
		@@ -388,7 +388,7 @@ discard block
		block discarded – undo
388	388	if ($max_page > 1 \|\| $always_show) {
389	389	// Extra pagination info
390	390	$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
391		- $start_no = ( $paged - 1 ) * $posts_per_page + 1;
	391	+ $start_no = ($paged - 1) * $posts_per_page + 1;
392	392	$end_no = min($paged * $posts_per_page, $numposts);
393	393
394	394	if ($geodir_pagination_more_info != '') {
		@@ -474,7 +474,7 @@ discard block
		block discarded – undo
474	474	jQuery(function ($) {
475	475	$("#distance_slider").slider({
476	476	range: true,
477		- values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],
	477	+ values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],
478	478	min: 0,
479	479	max: <?php echo $dist; ?>,
480	480	step: <?php echo $dist_dif; ?>,
		@@ -539,7 +539,7 @@ discard block
		block discarded – undo
539	539
540	540
541	541	<script type="text/javascript">
542		- var default_location = '<?php if($search_location = geodir_get_default_location()) echo $search_location->city ;?>';
	542	+ var default_location = '<?php if ($search_location = geodir_get_default_location()) echo $search_location->city; ?>';
543	543	var latlng;
544	544	var Sgeocoder;
545	545	var address;
		@@ -552,7 +552,7 @@ discard block
		block discarded – undo
552	552	var $form = jQuery(this).closest('form');
553	553
554	554	if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();
555		- if (jQuery('.search_text', $form).val() == '' \|\| jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);
	555	+ if (jQuery('.search_text', $form).val() == '' \|\| jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);
556	556
557	557	// Disable location based search for disabled location post type.
558	558	if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {
		@@ -566,7 +566,7 @@ discard block
		block discarded – undo
566	566	}
567	567	}
568	568
569		- 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;?>')) {
	569	+ 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; ?>')) {
570	570	geodir_setsearch($form);
571	571	} else {
572	572	jQuery(".snear", $form).val('');
		@@ -586,7 +586,7 @@ discard block
		block discarded – undo
586	586	});
587	587
588	588	function geodir_setsearch($form) {
589		- 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);
	589	+ 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);
590	590	geocodeAddress($form);
591	591	}
592	592
		@@ -599,8 +599,8 @@ discard block
		block discarded – undo
599	599	function geocodeAddress($form) {
600	600	Sgeocoder = new google.maps.Geocoder(); // Call the geocode function
601	601
602		- if (jQuery('.snear', $form).val() == '' \|\| ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) \|\| jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
603		- if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
	602	+ if (jQuery('.snear', $form).val() == '' \|\| ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) \|\| jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
	603	+ if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
604	604	jQuery(".snear", $form).val('');
605	605	}
606	606	jQuery($form).submit();
		@@ -608,24 +608,24 @@ discard block
		block discarded – undo
608	608
609	609	var address = jQuery(".snear", $form).val();
610	610
611		- if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {
	611	+ if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {
612	612	initialise2();
613	613	} else {
614	614
615	615	Sgeocoder.geocode({'address': address<?php
616		- if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}
617		- if($near_add2 =
	616	+ if ($near_add = get_option('geodir_search_near_addition')) {echo '+", ' . $near_add . '"'; }
	617	+ if ($near_add2 =
618	618	/**
619	619	* Adds any extra info to the near search box query when trying to geolocate it via google api.
620	620	*
621	621	* @since 1.0.0
622	622	*/
623		- apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},
	623	+ apply_filters('geodir_search_near_addition', '')) {echo $near_add2; }//gt_advanced_near_search();?>},
624	624	function (results, status) {
625	625	if (status == google.maps.GeocoderStatus.OK) {
626	626	updateSearchPosition(results[0].geometry.location, $form);
627	627	} else {
628		- alert("<?php _e('Search was not successful for the following reason:','geodirectory');?>" + status);
	628	+ alert("<?php _e('Search was not successful for the following reason:', 'geodirectory'); ?>" + status);
629	629	}
630	630	});
631	631	}
		@@ -656,19 +656,19 @@ discard block
		block discarded – undo
656	656	var msg;
657	657	switch (err.code) {
658	658	case err.UNKNOWN_ERROR:
659		- msg = "<?php _e('Unable to find your location','geodirectory');?>";
	659	+ msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";
660	660	break;
661	661	case err.PERMISSION_DENINED:
662		- msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";
	662	+ msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";
663	663	break;
664	664	case err.POSITION_UNAVAILABLE:
665		- msg = "<?php _e('Your location is currently unknown','geodirectory');?>";
	665	+ msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";
666	666	break;
667	667	case err.BREAK:
668		- msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";
	668	+ msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";
669	669	break;
670	670	default:
671		- msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";
	671	+ msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";
672	672	}
673	673	jQuery('#info').html(msg);
674	674	}
		@@ -709,7 +709,7 @@ discard block
		block discarded – undo
709	709	* @param object $post The post object.
710	710	* @param string $link The link to the post.
711	711	*/
712		- $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
	712	+ $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>', $post, $link);
713	713	break;
714	714	case 'new' :
715	715	/**
		@@ -719,7 +719,7 @@ discard block
		block discarded – undo
719	719	* @param object $post The post object.
720	720	* @param string $link The link to the post.
721	721	*/
722		- $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
	722	+ $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>', $post, $link);
723	723	break;
724	724
725	725	}

		@@ -61,11 +61,12 @@ discard block
		block discarded – undo
61	61	function geodir_is_default_location_set()
62	62	{
63	63	$default_location = geodir_get_default_location();
64		- if (!empty($default_location))
65		- return true;
66		- else
67		- return false;
68		-}
	64	+ if (!empty($default_location)) {
	65	+ return true;
	66	+ } else {
	67	+ return false;
	68	+ }
	69	+ }
69	70
70	71	/**
71	72	* Returns location slug using location string.
		@@ -258,8 +259,9 @@ discard block
		block discarded – undo
258	259
259	260	}
260	261
261		- if ($geodir_location->is_default)
262		- update_option('geodir_default_location', $geodir_location);
	262	+ if ($geodir_location->is_default) {
	263	+ update_option('geodir_default_location', $geodir_location);
	264	+ }
263	265
264	266	return $geodir_location->location_id;
265	267
		@@ -307,9 +309,10 @@ discard block
		block discarded – undo
307	309	$status = $data->status;
308	310	if ($status == "OK") {
309	311	return $data->results[0]->address_components;
310		- } else
311		- return false;
312		-}
	312	+ } else {
	313	+ return false;
	314	+ }
	315	+ }
313	316
314	317	/**
315	318	* Returns current location terms.
		@@ -333,16 +336,19 @@ discard block
		block discarded – undo
333	336	}
334	337
335	338	$country = $gd_session->get('gd_country');
336		- if ($country != '' && $country)
337		- $location_array['gd_country'] = urldecode($country);
	339	+ if ($country != '' && $country) {
	340	+ $location_array['gd_country'] = urldecode($country);
	341	+ }
338	342
339	343	$region = $gd_session->get('gd_region');
340		- if ($region != '' && $region)
341		- $location_array['gd_region'] = urldecode($region);
	344	+ if ($region != '' && $region) {
	345	+ $location_array['gd_region'] = urldecode($region);
	346	+ }
342	347
343	348	$city = $gd_session->get('gd_city');
344		- if ($city != '' && $city)
345		- $location_array['gd_city'] = urldecode($city);
	349	+ if ($city != '' && $city) {
	350	+ $location_array['gd_city'] = urldecode($city);
	351	+ }
346	352	} else {
347	353	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')) {
348	354	return $location_array;
		@@ -354,14 +360,17 @@ discard block
		block discarded – undo
354	360
355	361	$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';
356	362
357		- if ($country != '')
358		- $location_array['gd_country'] = urldecode($country);
	363	+ if ($country != '') {
	364	+ $location_array['gd_country'] = urldecode($country);
	365	+ }
359	366
360		- if ($region != '')
361		- $location_array['gd_region'] = urldecode($region);
	367	+ if ($region != '') {
	368	+ $location_array['gd_region'] = urldecode($region);
	369	+ }
362	370
363		- if ($city != '')
364		- $location_array['gd_city'] = urldecode($city);
	371	+ if ($city != '') {
	372	+ $location_array['gd_city'] = urldecode($city);
	373	+ }
365	374
366	375	// Fix category link in ajax popular category widget on change post type
367	376	if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

GeoDirectory / geodirectory

Pull Request — master (#217)

Status

Category

Indentation +331 added lines, -331 removed lines patch added patch discarded remove patch

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

Indentation +202 added lines, -202 removed lines patch added patch discarded remove patch

Braces +31 added lines, -22 removed lines patch added patch discarded remove patch