Inspection of "1.6.35" - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( aecc65...9f04c3 )

by Stiofan

created 2018-11-16 12:11 UTC

Status

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

@@ -36,177 +36,177 @@  discard block
 block discarded – undo
  */
 function geodir_templates_scripts()
 {
-    $is_detail_page = false;
-    $geodir_map_name = geodir_map_name();
+	$is_detail_page = false;
+	$geodir_map_name = geodir_map_name();
 
-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
-        $is_detail_page = true;
-    }
+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
+		$is_detail_page = true;
+	}
 
-    wp_enqueue_script('jquery');
+	wp_enqueue_script('jquery');
 
-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('geodirectory-script');
+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('geodirectory-script');
 
-    $geodir_vars_data = array(
-        'siteurl' => get_option('siteurl'),
-        'geodir_plugin_url' => geodir_plugin_url(),
-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),
-        'geodir_ajax_url' => geodir_get_ajax_url(),
-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
-        'is_rtl' => is_rtl() ? 1 : 0, // fix rtl issue
+	$geodir_vars_data = array(
+		'siteurl' => get_option('siteurl'),
+		'geodir_plugin_url' => geodir_plugin_url(),
+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),
+		'geodir_ajax_url' => geodir_get_ajax_url(),
+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
+		'is_rtl' => is_rtl() ? 1 : 0, // fix rtl issue
 		'lightBox_txtImage' => addslashes(__('Image', 'geodirectory')),
 		'lightBox_txtOf' => addslashes(__('of', 'geodirectory')),
-    );
-
-    /**
-     * 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');
-    }
+	);
+
+	/**
+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
+	 *
+	 * This is used by addons to add JS translatable variables.
+	 *
+	 * @since 1.4.4
+	 * @param array $geodir_vars_data {
+	 *    geodir var data used by addons to add JS translatable variables.
+	 *
+	 *    @type string $siteurl Site url.
+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.
+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
+	 *    @type int $is_rtl Checks if current locale is RTL.
+	 *
+	 * }
+	 */
+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
+
+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
+
+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
+
+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
+	wp_enqueue_script('geodirectory-lightbox-jquery');
+
+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
+	if ($is_detail_page) {
+		wp_enqueue_script('geodirectory-jquery-simplemodal');
+	}
 
-    if (in_array($geodir_map_name, array('auto', 'google'))) {
-        $map_lang = "&language=" . geodir_get_map_default_language();
-        $map_key = "&key=" . geodir_get_map_api_key();
-        /**
-         * Filter the variables that are added to the end of the google maps script call.
-         *
-         * This i used to change things like google maps language etc.
-         *
-         * @since 1.0.0
-         * @param string $var The string to filter, default is empty string.
-         */
-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');
-        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
+	if (in_array($geodir_map_name, array('auto', 'google'))) {
+		$map_lang = "&language=" . geodir_get_map_default_language();
+		$map_key = "&key=" . geodir_get_map_api_key();
+		/**
+		 * Filter the variables that are added to the end of the google maps script call.
+		 *
+		 * This i used to change things like google maps language etc.
+		 *
+		 * @since 1.0.0
+		 * @param string $var The string to filter, default is empty string.
+		 */
+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');
+		wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
         
-        // Overlapping Marker Spiderfier
-        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-g-overlappingmarker-script');
-    }
+		// Overlapping Marker Spiderfier
+		wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-g-overlappingmarker-script');
+	}
     
-    if ($geodir_map_name == 'osm') {
-        // Leaflet OpenStreetMap
-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-leaflet-style');
+	if ($geodir_map_name == 'osm') {
+		// Leaflet OpenStreetMap
+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-leaflet-style');
             
-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-leaflet-script');
+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-leaflet-script');
         
-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-leaflet-geo-script');
+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-leaflet-geo-script');
         
-        if ($is_detail_page) {
-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
-            wp_enqueue_style('geodirectory-leaflet-routing-style');
+		if ($is_detail_page) {
+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
+			wp_enqueue_style('geodirectory-leaflet-routing-style');
                 
-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
-            wp_enqueue_script('geodirectory-leaflet-routing-script');
-        }
+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
+			wp_enqueue_script('geodirectory-leaflet-routing-script');
+		}
         
-        // Overlapping Marker Spiderfier Leaflet
-        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-o-overlappingmarker-script');
-    }
-    wp_enqueue_script( 'jquery-ui-autocomplete' );
+		// Overlapping Marker Spiderfier Leaflet
+		wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-o-overlappingmarker-script');
+	}
+	wp_enqueue_script( 'jquery-ui-autocomplete' );
     
-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
-    wp_enqueue_script('geodirectory-goMap-script');
-
-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('chosen');
-
-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('geodirectory-choose-ajax');
-
-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
-
-    if (is_page() && geodir_is_page('add-listing')) {
-        // SCRIPT FOR UPLOAD
-        wp_enqueue_script('plupload-all');
-        wp_enqueue_script('jquery-ui-sortable');
-
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
-        wp_enqueue_script('geodirectory-plupload-script');
-        // SCRIPT FOR UPLOAD END
-
-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
-            $ajax_url = admin_url('admin-ajax.php');
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
-            $ajax_url = admin_url('admin-ajax.php');
-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
-        } else {
-            $ajax_url = admin_url('admin-ajax.php');
-        }
+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
+	wp_enqueue_script('geodirectory-goMap-script');
+
+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('chosen');
+
+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('geodirectory-choose-ajax');
+
+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
+
+	if (is_page() && geodir_is_page('add-listing')) {
+		// SCRIPT FOR UPLOAD
+		wp_enqueue_script('plupload-all');
+		wp_enqueue_script('jquery-ui-sortable');
+
+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
+		wp_enqueue_script('geodirectory-plupload-script');
+		// SCRIPT FOR UPLOAD END
+
+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
+			$ajax_url = admin_url('admin-ajax.php');
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
+			$ajax_url = admin_url('admin-ajax.php');
+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
+		} else {
+			$ajax_url = admin_url('admin-ajax.php');
+		}
 
-        // place js config array for plupload
-        $plupload_init = array(
-            'runtimes' => 'html5,silverlight,browserplus,gears,html4',
-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
-            'container' => 'plupload-upload-ui', // will be adjusted per uploader
-            'drop_element' => 'dropbox', // will be adjusted per uploader
-            'file_data_name' => 'async-upload', // will be adjusted per uploader
-            'multiple_queues' => true,
-            'max_file_size' => geodir_max_upload_size(),
-            'url' => $ajax_url,
-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
-            'multipart' => true,
-            'urlstream_upload' => true,
-            'multi_selection' => false, // will be added per uploader
-            // additional post data to send to our ajax hook
-            'multipart_params' => array(
-                '_ajax_nonce' => "", // will be added per uploader
-                'action' => 'plupload_action', // the ajax action name
-                'imgid' => 0 // will be added per uploader
-            )
-        );
-        $base_plupload_config = json_encode($plupload_init);
-
-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
-            'upload_img_size' => geodir_max_upload_size());
-
-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
-
-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
-    } // End if for add place page
-
-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
-    if ($is_detail_page) {
+		// place js config array for plupload
+		$plupload_init = array(
+			'runtimes' => 'html5,silverlight,browserplus,gears,html4',
+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
+			'container' => 'plupload-upload-ui', // will be adjusted per uploader
+			'drop_element' => 'dropbox', // will be adjusted per uploader
+			'file_data_name' => 'async-upload', // will be adjusted per uploader
+			'multiple_queues' => true,
+			'max_file_size' => geodir_max_upload_size(),
+			'url' => $ajax_url,
+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
+			'multipart' => true,
+			'urlstream_upload' => true,
+			'multi_selection' => false, // will be added per uploader
+			// additional post data to send to our ajax hook
+			'multipart_params' => array(
+				'_ajax_nonce' => "", // will be added per uploader
+				'action' => 'plupload_action', // the ajax action name
+				'imgid' => 0 // will be added per uploader
+			)
+		);
+		$base_plupload_config = json_encode($plupload_init);
+
+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
+			'upload_img_size' => geodir_max_upload_size());
+
+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
+
+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
+	} // End if for add place page
+
+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
+	if ($is_detail_page) {
 		wp_enqueue_script('geodirectory-post-custom-js');
 	}
 
-    // font awesome rating script
+	// font awesome rating script
 	if (get_option('geodir_reviewrating_enable_font_awesome')) {
 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
 		wp_enqueue_script('geodir-barrating-js');
@@ -215,11 +215,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.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
-    wp_enqueue_script('geodir-on-document-load');
+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
+	wp_enqueue_script('geodir-on-document-load');
 
-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
-    wp_enqueue_script('google-geometa');
+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
+	wp_enqueue_script('google-geometa');
 }
 
 /**
@@ -233,8 +233,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'));
 }
 
 /**
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
  */
 function geodir_google_analytics_tracking_code()
 {
-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
 
         <script>
             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -262,9 +262,9 @@  discard block
 block discarded – undo
         </script>
 
         <?php
-    }elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
-        echo stripslashes(get_option('geodir_ga_tracking_code'));
-    }
+	}elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
+		echo stripslashes(get_option('geodir_ga_tracking_code'));
+	}
 }
 
 /**
@@ -278,16 +278,16 @@  discard block
 block discarded – undo
 function geodir_footer_scripts()
 {
 
-    echo stripslashes(get_option('geodir_footer_scripts'));
+	echo stripslashes(get_option('geodir_footer_scripts'));
 
-    /*
+	/*
      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041
      *
      * Flexbox wont wrap on ios for search form items
      */
-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
-    }
+	if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
+	}
 }
 
 
@@ -301,12 +301,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);
 
@@ -319,18 +319,18 @@  discard block
 block discarded – undo
 function geodir_templates_styles()
 {
 
-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_style('geodir-core-scss');
-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_style('geodir-core-scss');
+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
 
-    if(is_rtl()){
-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_style('geodirectory-frontend-rtl-style');
-    }
+	if(is_rtl()){
+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_style('geodirectory-frontend-rtl-style');
+	}
 
-    wp_register_script('font-awesome', 'https://use.fontawesome.com/releases/v5.5.0/js/all.js#faload', array('font-awesome-shim'), GEODIRECTORY_VERSION);
-    wp_register_script('font-awesome-shim', 'https://use.fontawesome.com/releases/v5.5.0/js/v4-shims.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script( 'font-awesome' );
+	wp_register_script('font-awesome', 'https://use.fontawesome.com/releases/v5.5.0/js/all.js#faload', array('font-awesome-shim'), GEODIRECTORY_VERSION);
+	wp_register_script('font-awesome-shim', 'https://use.fontawesome.com/releases/v5.5.0/js/v4-shims.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script( 'font-awesome' );
 
 
 }
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
  */
 function geodir_get_sidebar()
 {
-    get_sidebar('geodirectory');
+	get_sidebar('geodirectory');
 }
 
 /**
@@ -363,122 +363,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>&lt;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&lt;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&gt;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&gt;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
-        return;
+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
+		return;
 
-    if (!is_single()) {
-        if (function_exists('geodir_location_geo_home_link')) {
-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-        }
-        $numposts = $wp_query->found_posts;
+	if (!is_single()) {
+		if (function_exists('geodir_location_geo_home_link')) {
+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+		}
+		$numposts = $wp_query->found_posts;
 
-        $max_page = ceil($numposts / $posts_per_page);
+		$max_page = ceil($numposts / $posts_per_page);
 
-        if (empty($paged)) {
-            $paged = 1;
-        }
+		if (empty($paged)) {
+			$paged = 1;
+		}
         
-        $post_type = geodir_get_current_posttype();
-        $listing_type_name = get_post_type_plural_label($post_type);
-        if (geodir_is_page('listing') || geodir_is_page('search')) {            
-            $term = array();
+		$post_type = geodir_get_current_posttype();
+		$listing_type_name = get_post_type_plural_label($post_type);
+		if (geodir_is_page('listing') || geodir_is_page('search')) {            
+			$term = array();
             
-            if (is_tax()) {
-                $term_id = get_queried_object_id();
-                $taxonomy = get_query_var('taxonomy');
+			if (is_tax()) {
+				$term_id = get_queried_object_id();
+				$taxonomy = get_query_var('taxonomy');
 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
-                    $term = get_term($term_id, $post_type . 'category');
-                }
-            }
+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
+					$term = get_term($term_id, $post_type . 'category');
+				}
+			}
             
-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
                 
-                if (!is_array($taxonomy_search)) {
-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');
-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
-                }
-            }
+				if (!is_array($taxonomy_search)) {
+					$term = get_term((int)$taxonomy_search, $post_type . 'category');
+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');
+				}
+			}
             
-            if (!empty($term) && !is_wp_error($term)) {
-                $listing_type_name = $term->name;
-            }
-        }
+			if (!empty($term) && !is_wp_error($term)) {
+				$listing_type_name = $term->name;
+			}
+		}
 
-        if ($max_page > 1 || $always_show) {            
-            // Extra pagination info
-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;
-            $end_no = min($paged * $posts_per_page, $numposts);
+		if ($max_page > 1 || $always_show) {            
+			// Extra pagination info
+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;
+			$end_no = min($paged * $posts_per_page, $numposts);
 
-            if ($geodir_pagination_more_info != '') {
-                if ($listing_type_name) {
-                    $listing_type_name = __($listing_type_name, 'geodirectory');
-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
-                } else {
-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
-                }
-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
-                /**
-                 * Adds an extra pagination info above/under pagination.
-                 *
-                 * @since 1.5.9
-                 *
-                 * @param string $pagination_info Extra pagination info content.
-                 * @param string $listing_type_name Listing results type.
-                 * @param string $start_no First result number.
-                 * @param string $end_no Last result number.
-                 * @param string $numposts Total number of listings.
-                 * @param string $post_type The post type.
-                 */
-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
+			if ($geodir_pagination_more_info != '') {
+				if ($listing_type_name) {
+					$listing_type_name = __($listing_type_name, 'geodirectory');
+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
+				} else {
+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
+				}
+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
+				/**
+				 * Adds an extra pagination info above/under pagination.
+				 *
+				 * @since 1.5.9
+				 *
+				 * @param string $pagination_info Extra pagination info content.
+				 * @param string $listing_type_name Listing results type.
+				 * @param string $start_no First result number.
+				 * @param string $end_no Last result number.
+				 * @param string $numposts Total number of listings.
+				 * @param string $post_type The post type.
+				 */
+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
                 
-                if ($geodir_pagination_more_info == 'before') {
-                    $before = $before . $pagination_info;
-                } else if ($geodir_pagination_more_info == 'after') {
-                    $after = $pagination_info . $after;
-                }
-            }
+				if ($geodir_pagination_more_info == 'before') {
+					$before = $before . $pagination_info;
+				} else if ($geodir_pagination_more_info == 'after') {
+					$after = $pagination_info . $after;
+				}
+			}
             
-            echo "$before <div class='Navi gd-navi'>";
-            if ($paged >= ($pages_to_show - 1)) {
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
-            }
-            previous_posts_link($prelabel);
-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
-                if ($i >= 1 && $i <= $max_page) {
-                    if ($i == $paged) {
-                        echo "<strong class='on'>$i</strong>";
-                    } else {
-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
-                    }
-                }
-            }
-            next_posts_link($nxtlabel, $max_page);
-            if (($paged + $half_pages_to_show) < ($max_page)) {
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
-            }
-            echo "</div> $after";
-        }
+			echo "$before <div class='Navi gd-navi'>";
+			if ($paged >= ($pages_to_show - 1)) {
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
+			}
+			previous_posts_link($prelabel);
+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
+				if ($i >= 1 && $i <= $max_page) {
+					if ($i == $paged) {
+						echo "<strong class='on'>$i</strong>";
+					} else {
+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
+					}
+				}
+			}
+			next_posts_link($nxtlabel, $max_page);
+			if (($paged + $half_pages_to_show) < ($max_page)) {
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
+			}
+			echo "</div> $after";
+		}
         
-        if (function_exists('geodir_location_geo_home_link')) {
-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-        }
-    }
+		if (function_exists('geodir_location_geo_home_link')) {
+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+		}
+	}
 }
 
 /**
@@ -489,20 +489,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 ($) {
@@ -560,20 +560,20 @@  discard block
 block discarded – undo
  * @package GeoDirectory
  */
 function geodir_add_sharelocation_scripts() {
-    $default_search_for_text = SEARCH_FOR_TEXT;
-    if (get_option('geodir_search_field_default_text'))
-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+	$default_search_for_text = SEARCH_FOR_TEXT;
+	if (get_option('geodir_search_field_default_text'))
+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
 
-    $default_near_text = NEAR_TEXT;
-    if (get_option('geodir_near_field_default_text'))
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+	$default_near_text = NEAR_TEXT;
+	if (get_option('geodir_near_field_default_text'))
+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
     
-    $search_location = geodir_get_default_location();
+	$search_location = geodir_get_default_location();
     
-    $default_search_for_text = addslashes(stripslashes($default_search_for_text));
-    $default_near_text = addslashes(stripslashes($default_near_text));
-    $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
-    ?>
+	$default_search_for_text = addslashes(stripslashes($default_search_for_text));
+	$default_near_text = addslashes(stripslashes($default_near_text));
+	$city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
+	?>
     <script type="text/javascript">
         var default_location = '<?php echo $city ;?>';
         var latlng;
@@ -665,14 +665,14 @@  discard block
 block discarded – undo
                     initialise2();
                 } else {
                     <?php
-                    $near_add = get_option('geodir_search_near_addition');
-                    /**
-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.
-                     *
-                     * @since 1.0.0
-                     */
-                    $near_add2 = apply_filters('geodir_search_near_addition', '');
-                    ?>
+					$near_add = get_option('geodir_search_near_addition');
+					/**
+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.
+					 *
+					 * @since 1.0.0
+					 */
+					$near_add2 = apply_filters('geodir_search_near_addition', '');
+					?>
                     if (window.gdMaps === 'google') {
                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
                             function (results, status) {
@@ -786,32 +786,32 @@  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;
 }
 
 /**
@@ -820,9 +820,9 @@  discard block
 block discarded – undo
  * @since 1.6.22
  */
 function geodir_fix_script_conflict() {
-    if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
-        wp_dequeue_script( 'flexslider' );
-    }
+	if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
+		wp_dequeue_script( 'flexslider' );
+	}
 }
 add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 );
 
@@ -835,12 +835,12 @@  discard block
 block discarded – undo
  */
 function geodir_fontawesome_defer($url)
 {
-    if (strpos($url, 'use.fontawesome.com/releases/')===false)
-        return $url;
-    else if (is_admin())
-        return str_replace('#faload', '', $url);
-    else
-        return $url."' data-search-pseudo-elements defer='defer";
+	if (strpos($url, 'use.fontawesome.com/releases/')===false)
+		return $url;
+	else if (is_admin())
+		return str_replace('#faload', '', $url);
+	else
+		return $url."' data-search-pseudo-elements defer='defer";
 }
 //add_filter('clean_url', 'geodir_fontawesome_defer', 11, 1); // let users add this as a snippet if they need it
 
@@ -848,8 +848,8 @@  discard block
 block discarded – undo
  * Dequeue our fontawesome if using BB page.
  */
 function geodir_fix_beaver_builder(){
-    if(isset($_REQUEST['fl_builder'])){
-        wp_dequeue_script( 'font-awesome' );
-    }
+	if(isset($_REQUEST['fl_builder'])){
+		wp_dequeue_script( 'font-awesome' );
+	}
 }
 add_filter('wp_print_scripts','geodir_fix_beaver_builder',100);

Please login to merge, or discard this patch.

Braces +42 added lines, -26 removed lines patch added patch discarded remove patch

@@ -262,7 +262,7 @@  discard block
 block discarded – undo
         </script>
 
         <?php
-    }elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
+    } elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
         echo stripslashes(get_option('geodir_ga_tracking_code'));
     }
 }
@@ -301,13 +301,14 @@  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);
 
 /**
@@ -375,8 +376,10 @@  discard block
 block discarded – undo
 
     $half_pages_to_show = round($pages_to_show / 2);
 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
-        return;
+    if (geodir_is_page('home')) {
+    	// dont apply default  pagination for geodirectory home page.
+        return;
+    }
 
     if (!is_single()) {
         if (function_exists('geodir_location_geo_home_link')) {
@@ -496,11 +499,21 @@  discard block
 block discarded – undo
     }
     $dist_dif = 1000;
 
-    if ($dist <= 5000) $dist_dif = 500;
-    if ($dist <= 1000) $dist_dif = 100;
-    if ($dist <= 500) $dist_dif = 50;
-    if ($dist <= 100) $dist_dif = 10;
-    if ($dist <= 50) $dist_dif = 5;
+    if ($dist <= 5000) {
+    	$dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+    	$dist_dif = 100;
+    }
+    if ($dist <= 500) {
+    	$dist_dif = 50;
+    }
+    if ($dist <= 100) {
+    	$dist_dif = 10;
+    }
+    if ($dist <= 50) {
+    	$dist_dif = 5;
+    }
 
     ?>
     <script type="text/javascript">
@@ -561,12 +574,14 @@  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');
+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 
     $default_near_text = NEAR_TEXT;
-    if (get_option('geodir_near_field_default_text'))
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
     
     $search_location = geodir_get_default_location();
     
@@ -835,13 +850,14 @@  discard block
 block discarded – undo
  */
 function geodir_fontawesome_defer($url)
 {
-    if (strpos($url, 'use.fontawesome.com/releases/')===false)
-        return $url;
-    else if (is_admin())
-        return str_replace('#faload', '', $url);
-    else
-        return $url."' data-search-pseudo-elements defer='defer";
-}
+    if (strpos($url, 'use.fontawesome.com/releases/')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#faload', '', $url);
+    } else {
+            return $url."' data-search-pseudo-elements defer='defer";
+    }
+    }
 //add_filter('clean_url', 'geodir_fontawesome_defer', 11, 1); // let users add this as a snippet if they need it
 
 /**

Please login to merge, or discard this patch.

		@@ -262,7 +262,7 @@ discard block
		block discarded – undo
262	262	</script>
263	263
264	264	<?php
265		- }elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
	265	+ } elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
266	266	echo stripslashes(get_option('geodir_ga_tracking_code'));
267	267	}
268	268	}
		@@ -301,13 +301,14 @@ discard block
		block discarded – undo
301	301	*/
302	302	function geodir_add_async_forscript($url)
303	303	{
304		- if (strpos($url, '#asyncload')===false)
305		- return $url;
306		- else if (is_admin())
307		- return str_replace('#asyncload', '', $url);
308		- else
309		- return str_replace('#asyncload', '', $url)."' async='async";
310		-}
	304	+ if (strpos($url, '#asyncload')===false) {
	305	+ return $url;
	306	+ } else if (is_admin()) {
	307	+ return str_replace('#asyncload', '', $url);
	308	+ } else {
	309	+ return str_replace('#asyncload', '', $url)."' async='async";
	310	+ }
	311	+ }
311	312	add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
312	313
313	314	/**
		@@ -375,8 +376,10 @@ discard block
		block discarded – undo
375	376
376	377	$half_pages_to_show = round($pages_to_show / 2);
377	378
378		- if (geodir_is_page('home')) // dont apply default pagination for geodirectory home page.
379		- return;
	379	+ if (geodir_is_page('home')) {
	380	+ // dont apply default pagination for geodirectory home page.
	381	+ return;
	382	+ }
380	383
381	384	if (!is_single()) {
382	385	if (function_exists('geodir_location_geo_home_link')) {
		@@ -496,11 +499,21 @@ discard block
		block discarded – undo
496	499	}
497	500	$dist_dif = 1000;
498	501
499		- if ($dist <= 5000) $dist_dif = 500;
500		- if ($dist <= 1000) $dist_dif = 100;
501		- if ($dist <= 500) $dist_dif = 50;
502		- if ($dist <= 100) $dist_dif = 10;
503		- if ($dist <= 50) $dist_dif = 5;
	502	+ if ($dist <= 5000) {
	503	+ $dist_dif = 500;
	504	+ }
	505	+ if ($dist <= 1000) {
	506	+ $dist_dif = 100;
	507	+ }
	508	+ if ($dist <= 500) {
	509	+ $dist_dif = 50;
	510	+ }
	511	+ if ($dist <= 100) {
	512	+ $dist_dif = 10;
	513	+ }
	514	+ if ($dist <= 50) {
	515	+ $dist_dif = 5;
	516	+ }
504	517
505	518	?>
506	519	<script type="text/javascript">
		@@ -561,12 +574,14 @@ discard block
		block discarded – undo
561	574	*/
562	575	function geodir_add_sharelocation_scripts() {
563	576	$default_search_for_text = SEARCH_FOR_TEXT;
564		- if (get_option('geodir_search_field_default_text'))
565		- $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
	577	+ if (get_option('geodir_search_field_default_text')) {
	578	+ $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
	579	+ }
566	580
567	581	$default_near_text = NEAR_TEXT;
568		- if (get_option('geodir_near_field_default_text'))
569		- $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
	582	+ if (get_option('geodir_near_field_default_text')) {
	583	+ $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
	584	+ }
570	585
571	586	$search_location = geodir_get_default_location();
572	587
		@@ -835,13 +850,14 @@ discard block
		block discarded – undo
835	850	*/
836	851	function geodir_fontawesome_defer($url)
837	852	{
838		- if (strpos($url, 'use.fontawesome.com/releases/')===false)
839		- return $url;
840		- else if (is_admin())
841		- return str_replace('#faload', '', $url);
842		- else
843		- return $url."' data-search-pseudo-elements defer='defer";
844		-}
	853	+ if (strpos($url, 'use.fontawesome.com/releases/')===false) {
	854	+ return $url;
	855	+ } else if (is_admin()) {
	856	+ return str_replace('#faload', '', $url);
	857	+ } else {
	858	+ return $url."' data-search-pseudo-elements defer='defer";
	859	+ }
	860	+ }
845	861	//add_filter('clean_url', 'geodir_fontawesome_defer', 11, 1); // let users add this as a snippet if they need it
846	862
847	863	/**

GeoDirectory / geodirectory

Push — master ( aecc65...9f04c3 )

Status

Category

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

Braces +42 added lines, -26 removed lines patch added patch discarded remove patch