GeoDirectory / geodirectory

geodirectory-admin/admin_install.php

Indentation +160 added lines, -160 removed lines

@@ -24,8 +24,8 @@ 
 function geodir_activation()

 {

 

-    geodir_install();

-    add_action('wp_loaded', 'geodir_flush_activation');

+	geodir_install();

+	add_action('wp_loaded', 'geodir_flush_activation');

 }

 

 /**

@@ -36,9 +36,9 @@ 
  */

 function geodir_flush_activation()

 {

-    // Remove rewrite rules and then recreate rewrite rules.

-    // flush late so everything is loaded

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	// flush late so everything is loaded

+	flush_rewrite_rules();

 }

 

 /**

@@ -50,44 +50,44 @@ 
  */

 function geodir_install()

 {

-    global $geodir_settings;

-

-    /**

-     * Called before the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_end'

-     */

-    do_action('geodir_installation_start');

-

-    // Do install

-    if (!get_option('geodir_default_data_installed')) {

-        geodir_create_tables(); // in admin db install.php

-        geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

-        geodir_create_default_fields();

-        //geodir_default_taxonomies();

-        geodir_set_default_options();

-        geodir_create_pages();

-        geodir_set_default_widgets();

-        gd_install_theme_compat();

-

-        update_option('geodir_default_data_installed', 1);

-

-    }

-

-    if (!get_option('geodir_default_data_installed_1.2.8')) {

-        //geodir_create_tables(); // in admin db install.php

-        update_option('geodir_default_data_installed_1.2.8', 1);

-    }

-

-    geodir_installation_end();

-    /**

-     * Called after the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_start'

-     */

-    do_action('geodir_installation_end');

+	global $geodir_settings;

+

+	/**

+	 * Called before the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_end'

+	 */

+	do_action('geodir_installation_start');

+

+	// Do install

+	if (!get_option('geodir_default_data_installed')) {

+		geodir_create_tables(); // in admin db install.php

+		geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

+		geodir_create_default_fields();

+		//geodir_default_taxonomies();

+		geodir_set_default_options();

+		geodir_create_pages();

+		geodir_set_default_widgets();

+		gd_install_theme_compat();

+

+		update_option('geodir_default_data_installed', 1);

+

+	}

+

+	if (!get_option('geodir_default_data_installed_1.2.8')) {

+		//geodir_create_tables(); // in admin db install.php

+		update_option('geodir_default_data_installed_1.2.8', 1);

+	}

+

+	geodir_installation_end();

+	/**

+	 * Called after the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_start'

+	 */

+	do_action('geodir_installation_end');

 

 

 }

@@ -104,16 +104,16 @@ 
 function geodir_create_pages()

 {

 

-    //geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

+	//geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

 

-    //New since 1.5.3

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	//New since 1.5.3

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 

 

 }

@@ -129,11 +129,11 @@ 
  */

 function geodir_installation_end()

 {

-    //update_option( "geodir_db_version", GEODIRECTORY_VERSION );

+	//update_option( "geodir_db_version", GEODIRECTORY_VERSION );

 

-    update_option("geodir_installed", 1);

-    update_option("geodir_installation_redirect", 1);

-    update_option('skip_install_geodir_pages', 0);

+	update_option("geodir_installed", 1);

+	update_option("geodir_installation_redirect", 1);

+	update_option('skip_install_geodir_pages', 0);

 }

 

 /**

@@ -147,45 +147,45 @@ 
  */

 function geodir_set_default_options()

 {

-    global $geodir_settings;

-    /**

-     * Contains settings array for general tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/general_settings_array.php");

-    /**

-     * Contains settings array for design tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/design_settings_array.php");

-    /**

-     * Contains settings array for notifications tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/notifications_settings_array.php");

-    /**

-     * Contains settings array for permalink tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/permalink_settings_array.php");

-    /**

-     * Contains settings array for title / meta tab.

-     *

-     * @since 1.5.4

-     * @package GeoDirectory

-     */

-    include_once("option-pages/title_meta_settings_array.php");

-    foreach ($geodir_settings as $value) {

-        geodir_update_options($value, true);

-    }

+	global $geodir_settings;

+	/**

+	 * Contains settings array for general tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/general_settings_array.php");

+	/**

+	 * Contains settings array for design tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/design_settings_array.php");

+	/**

+	 * Contains settings array for notifications tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/notifications_settings_array.php");

+	/**

+	 * Contains settings array for permalink tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/permalink_settings_array.php");

+	/**

+	 * Contains settings array for title / meta tab.

+	 *

+	 * @since 1.5.4

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/title_meta_settings_array.php");

+	foreach ($geodir_settings as $value) {

+		geodir_update_options($value, true);

+	}

 

 }

 

@@ -199,103 +199,103 @@ 
 function geodir_set_default_widgets()

 {

 

-    $widget_option_list = array();

-    $widgetinfo = array();

-    $sidebarvalue_array = array();

-    $sidebars_widgets = array();

+	$widget_option_list = array();

+	$widgetinfo = array();

+	$sidebarvalue_array = array();

+	$sidebars_widgets = array();

 

-    /*===========================*/

-    /*  Widgets ON HOME PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON HOME PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_home_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_home_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_home_content'] =

-        array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_content'] =

+		array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

 

-    $widget_option_list['geodir_home_right'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_right'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON LISTING PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON LISTING PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_listing_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_listing_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_listing_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_listing_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON SEARCH PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON SEARCH PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_search_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_search_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_search_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_search_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON DETAIL/SINGLE PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON DETAIL/SINGLE PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_detail_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_detail_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON AUTHOR PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON AUTHOR PAGE     */

+	/*===========================*/

 

 

-    $widget_option_list['geodir_author_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

+	$widget_option_list['geodir_author_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

 

 

-    $sidebars_widgets = get_option('sidebars_widgets');

+	$sidebars_widgets = get_option('sidebars_widgets');

 

-    foreach ($widget_option_list as $key => $widget_options) {

+	foreach ($widget_option_list as $key => $widget_options) {

 

-        foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+		foreach ($widget_options as $key2 => $widget_options_obj) {

+			$widgetid = 'widget_' . $key2;

 

-            $widgetinfo[$widgetid][] = $widget_options_obj;

+			$widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+			$sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

 

-            $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

+			$widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

-        }

+		}

 

-        if (!empty($sidebarvalue_array[$key])) {

+		if (!empty($sidebarvalue_array[$key])) {

 

-            $sidebars_widgets = get_option('sidebars_widgets');

-            $sidebars_widgets[$key] = $sidebarvalue_array[$key];

-            update_option('sidebars_widgets', $sidebars_widgets);

+			$sidebars_widgets = get_option('sidebars_widgets');

+			$sidebars_widgets[$key] = $sidebarvalue_array[$key];

+			update_option('sidebars_widgets', $sidebars_widgets);

 

-            foreach ($widget_update as $key => $value) {

+			foreach ($widget_update as $key => $value) {

 

-                update_option($key, $value);

+				update_option($key, $value);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 

 }

Spacing +2 added lines, -2 removed lines

@@ -271,11 +271,11 @@
     foreach ($widget_option_list as $key => $widget_options) {

 

         foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+            $widgetid = 'widget_'.$key2;

 

             $widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+            $sidebarvalue_array[$key][] = $key2."-".(count($widgetinfo[$widgetid]));

 

             $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

geodirectory-functions/compatibility/Jupiter.php

Indentation +141 added lines, -141 removed lines

@@ -16,28 +16,28 @@ 
  */
 function jupiter_action_calls()
 {
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-
-    // CAHNGE PAGE TITLES
-    remove_action('page_title', 'mk_page_title');
-    add_action('page_title', 'gd_mk_page_title');
-    // CHANGE BREADCRUMS FOR GD PAGES
-    remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
-    add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+
+	// CAHNGE PAGE TITLES
+	remove_action('page_title', 'mk_page_title');
+	add_action('page_title', 'gd_mk_page_title');
+	// CHANGE BREADCRUMS FOR GD PAGES
+	remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
+	add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
 
 
 }
@@ -52,19 +52,19 @@ 
 function gd_mk_theme_breadcrumbs()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('listing')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('detail')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('search')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('author')) {
-        jupiter_geodir_breadcrumb();
-    } else {
-        mk_theme_breadcrumbs();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('listing')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('detail')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('search')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('author')) {
+		jupiter_geodir_breadcrumb();
+	} else {
+		mk_theme_breadcrumbs();
+	}
 }
 
 /**
@@ -76,35 +76,35 @@ 
  */
 function gd_mk_page_title()
 {
-    global $wp;
-
-
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_page_title();
-    } elseif (geodir_is_page('listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('search')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('author')) {
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $gd_title = ob_get_clean();
-        $gd_title = str_replace('<h1>', "", $gd_title);
-        $gd_title = str_replace('</h1>', "", $gd_title);
-        jupiter_geodir_page_title($gd_title);
-    } else {
-        mk_page_title();
-    }
+	global $wp;
+
+
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_page_title();
+	} elseif (geodir_is_page('listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('search')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('author')) {
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$gd_title = ob_get_clean();
+		$gd_title = str_replace('<h1>', "", $gd_title);
+		$gd_title = str_replace('</h1>', "", $gd_title);
+		jupiter_geodir_page_title($gd_title);
+	} else {
+		mk_page_title();
+	}
 
 
 }
@@ -119,48 +119,48 @@ 
  */
 function jupiter_geodir_breadcrumb()
 {
-    $item = '';
-    ob_start(); // Start buffering;
-    geodir_breadcrumb();
-    $gd_crums = ob_get_clean();
-    if ($gd_crums) {
-        $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
-        $gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
-        $gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
-        $gd_crums = str_replace('</li><li>', "", $gd_crums);
-        $gd_crums = explode(" > ", $gd_crums);
-        $trail_end = array_pop($gd_crums);
-        $gd_crums['trail_end'] = $trail_end;
-        //print_r($gd_crums);exit;
-        //print_r($trail);
-        $item = $gd_crums;
-
-    }
-    if (!$item) {
-        return;
-    }
-    global $mk_options, $post;
-    $post_id = global_get_post_id();
-
-    if ($post_id) {
-        $local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
-        $breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
-        if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
-            $breadcrumb_skin_class = $breadcrumb_skin;
-        } else {
-            $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-        }
-    } else {
-        $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-    }
-
-
-    $delimiter = ' &#47; ';
-
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
-
-    echo implode($delimiter, $item);
-    echo "</div></div>";
+	$item = '';
+	ob_start(); // Start buffering;
+	geodir_breadcrumb();
+	$gd_crums = ob_get_clean();
+	if ($gd_crums) {
+		$gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
+		$gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
+		$gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
+		$gd_crums = str_replace('</li><li>', "", $gd_crums);
+		$gd_crums = explode(" > ", $gd_crums);
+		$trail_end = array_pop($gd_crums);
+		$gd_crums['trail_end'] = $trail_end;
+		//print_r($gd_crums);exit;
+		//print_r($trail);
+		$item = $gd_crums;
+
+	}
+	if (!$item) {
+		return;
+	}
+	global $mk_options, $post;
+	$post_id = global_get_post_id();
+
+	if ($post_id) {
+		$local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
+		$breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
+		if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
+			$breadcrumb_skin_class = $breadcrumb_skin;
+		} else {
+			$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+		}
+	} else {
+		$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+	}
+
+
+	$delimiter = ' &#47; ';
+
+	echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+
+	echo implode($delimiter, $item);
+	echo "</div></div>";
 
 }
 
@@ -174,41 +174,41 @@ 
  */
 function jupiter_geodir_page_title($title = '', $subtitle = '')
 {
-    global $mk_options;
-
-    $post_id = global_get_post_id();
-    $shadow_css = '';
-    if ($mk_options['page_title_shadow'] == 'true') {
-        $shadow_css = 'mk-drop-shadow';
-    }
-
-    $align = !empty($align) ? $align : 'left';
-
-    //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
-    echo '<div class="mk-grid">';
-    if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
-
-    }
-
-    if (!empty($subtitle)) {
-        echo '<div class="page-introduce-subtitle">';
-        echo $subtitle;
-        echo '</div>';
-    }
-    if ($mk_options['disable_breadcrumb'] == 'true') {
-        if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
-            /**
-             * Calls the theme breadcrumbs for Jupiter theme.
-             *
-             * @since 1.4.0
-             */
-            do_action('theme_breadcrumbs', $post_id);
-        }
-    }
-
-    echo '<div class="clearboth"></div></div></section>';
+	global $mk_options;
+
+	$post_id = global_get_post_id();
+	$shadow_css = '';
+	if ($mk_options['page_title_shadow'] == 'true') {
+		$shadow_css = 'mk-drop-shadow';
+	}
+
+	$align = !empty($align) ? $align : 'left';
+
+	//$title = 'xxxx';
+	echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+	echo '<div class="mk-grid">';
+	if (!empty($title)) {
+		echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+
+	}
+
+	if (!empty($subtitle)) {
+		echo '<div class="page-introduce-subtitle">';
+		echo $subtitle;
+		echo '</div>';
+	}
+	if ($mk_options['disable_breadcrumb'] == 'true') {
+		if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
+			/**
+			 * Calls the theme breadcrumbs for Jupiter theme.
+			 *
+			 * @since 1.4.0
+			 */
+			do_action('theme_breadcrumbs', $post_id);
+		}
+	}
+
+	echo '<div class="clearboth"></div></div></section>';
 
 
 }

Spacing +3 added lines, -3 removed lines

@@ -157,7 +157,7 @@ 
 
     $delimiter = ' / ';
 
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner '.$breadcrumb_skin_class.'-skin">';
 
     echo implode($delimiter, $item);
     echo "</div></div>";
@@ -185,10 +185,10 @@ 
     $align = !empty($align) ? $align : 'left';
 
     //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+    echo '<section id="mk-page-introduce" class="intro-'.$align.'">';
     echo '<div class="mk-grid">';
     if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+        echo '<h1 class="page-introduce-title '.$shadow_css.'">'.$title.'</h1>';
 
     }
 

geodirectory-templates/popup-forms.php

Indentation +76 added lines, -76 removed lines

@@ -29,23 +29,23 @@ 
             <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID;?>"/>
 
             <h3><?php
-                /**
-                 * Filter the title for the send to friend popup form.
-                 *
-                 * @since 1.0.0
-                 * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
-                 */
-                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
+				/**
+				 * Filter the title for the send to friend popup form.
+				 *
+				 * @since 1.0.0
+				 * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
+				 */
+				echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
 
             <p id="reply_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
-            /**
-             * Called before each field in the send to friend popup template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called before.
-             */
-            do_action('geodir_before_stf_form_field', 'to_name');?>
+			/**
+			 * Called before each field in the send to friend popup template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called before.
+			 */
+			do_action('geodir_before_stf_form_field', 'to_name');?>
             <div class="row clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Friend Name', 'geodirectory');?> : <span>*</span></label></div>
@@ -54,16 +54,16 @@ 
                     <span class="message_error2" id="to_nameInfo"></span></div>
             </div>
             <?php
-            /**
-             * Called after each field in the send to friend popup template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called after.
-             */
-            do_action('geodir_after_stf_form_field', 'to_name');?>
+			/**
+			 * Called after each field in the send to friend popup template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called after.
+			 */
+			do_action('geodir_after_stf_form_field', 'to_name');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'to_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'to_email');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label> <?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -72,11 +72,11 @@ 
                     <span class="message_error2" id="to_emailInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'to_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'to_email');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'yourname');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'yourname');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Your Name', 'geodirectory');?> : <span>*</span></label></div>
@@ -85,11 +85,11 @@ 
                     <span class="message_error2" id="yournameInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'yourname');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'yourname');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'youremail');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'youremail');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label> <?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -98,11 +98,11 @@ 
                     <span class="message_error2" id="youremailInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'youremail');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'youremail');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_subject');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'frnd_subject');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Subject', 'geodirectory');?> : <span>*</span></label></div>
@@ -113,11 +113,11 @@ 
                     <span class="message_error2" id="frnd_subjectInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_subject');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'frnd_subject');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_comments');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'frnd_comments');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Comments', 'geodirectory');?> : <span>*</span></label></div>
@@ -127,11 +127,11 @@ 
                     <span class="message_error2" id="frnd_commentsInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_comments');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'frnd_comments');?>
             <?php if (function_exists('geodir_get_captch')) {
-                geodir_get_captch('-1');
-            }?>
+				geodir_get_captch('-1');
+			}?>
             <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory')?> " class="button "/>
         </form>
     </div> <?php
@@ -145,23 +145,23 @@ 
             <input type="hidden" name="pid" value="<?php echo $post_info->ID;?>"/>
 
             <h3><?php
-                /**
-                 * Filter the title for the send inquiry popup form.
-                 *
-                 * @since 1.0.0
-                 * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
-                 */
-                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
+				/**
+				 * Filter the title for the send inquiry popup form.
+				 *
+				 * @since 1.0.0
+				 * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
+				 */
+				echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
 
             <p id="inquiry_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
-            /**
-             * Called before each field in the send to friend inquiry template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called before.
-             */
-            do_action('geodir_before_inquiry_form_field', 'inq_name');?>
+			/**
+			 * Called before each field in the send to friend inquiry template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called before.
+			 */
+			do_action('geodir_before_inquiry_form_field', 'inq_name');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading"><label><?php _e('Your Name', 'geodirectory');?> :
                         <span>*</span></label></div>
@@ -170,16 +170,16 @@ 
                     <span class="message_error2" id="span_agt_mail_name"></span></div>
             </div>
             <?php
-            /**
-             * Called after each field in the send to friend inquiry template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called after.
-             */
-            do_action('geodir_after_inquiry_form_field', 'inq_name');?>
+			/**
+			 * Called after each field in the send to friend inquiry template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called after.
+			 */
+			do_action('geodir_after_inquiry_form_field', 'inq_name');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_email');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -189,11 +189,11 @@ 
                 </div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_email');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Contact Info', 'geodirectory');?> :</label></div>
@@ -202,11 +202,11 @@ 
                 </div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Comments', 'geodirectory');?> : <span>*</span></label></div>
@@ -216,8 +216,8 @@ 
                     <span class="message_error2" id="span_agt_mail_msg"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
             <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory');?>"
                    class="button clearfix"/>
         </form>

Spacing +37 added lines, -37 removed lines

@@ -19,14 +19,14 @@ 
  * @param int $post_id The post id requested by the popup.
  * @param object $post_info The post object requested by the popup.
  */
-do_action('geodir_popup_forms_template_start',$post_id,$post_info);
+do_action('geodir_popup_forms_template_start', $post_id, $post_info);
 
 if ($_REQUEST['popuptype'] == 'b_sendtofriend') { ?>
 
     <div id="basic-modal-content" class="clearfix">
         <form name="send_to_frnd" id="send_to_frnd" action="<?php echo get_permalink($post_info->ID); ?>" method="post">
             <input type="hidden" name="sendact" value="email_frnd"/>
-            <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID;?>"/>
+            <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID; ?>"/>
 
             <h3><?php
                 /**
@@ -35,7 +35,7 @@ 
                  * @since 1.0.0
                  * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
                  */
-                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
+                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND); ?></h3>
 
             <p id="reply_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
@@ -45,9 +45,9 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called before.
              */
-            do_action('geodir_before_stf_form_field', 'to_name');?>
+            do_action('geodir_before_stf_form_field', 'to_name'); ?>
             <div class="row clearfix">
-                    <input required field_type="text" name="to_name" id="to_name" type="text" value="" placeholder="<?php _e('Friend Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="to_name" id="to_name" type="text" value="" placeholder="<?php _e('Friend Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /**
@@ -56,55 +56,55 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called after.
              */
-            do_action('geodir_after_stf_form_field', 'to_name');?>
+            do_action('geodir_after_stf_form_field', 'to_name'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'to_email');?>
+            do_action('geodir_before_stf_form_field', 'to_email'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="to_email" id="to_email" type="email" value="" placeholder="<?php _e('Friend Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="to_email" id="to_email" type="email" value="" placeholder="<?php _e('Friend Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'to_email');?>
+            do_action('geodir_after_stf_form_field', 'to_email'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'yourname');?>
+            do_action('geodir_before_stf_form_field', 'yourname'); ?>
             <div class="row  clearfix">
-                    <input required field_type="text" name="yourname" id="yourname" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="yourname" id="yourname" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'yourname');?>
+            do_action('geodir_after_stf_form_field', 'yourname'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'youremail');?>
+            do_action('geodir_before_stf_form_field', 'youremail'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="youremail" id="youremail" type="email" value="" placeholder="<?php _e('Your Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="youremail" id="youremail" type="email" value="" placeholder="<?php _e('Your Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'youremail');?>
+            do_action('geodir_after_stf_form_field', 'youremail'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_subject');?>
+            do_action('geodir_before_stf_form_field', 'frnd_subject'); ?>
             <div class="row  clearfix">
                     <input required field_type="text" name="frnd_subject"
-                           value="<?php echo __('About', 'geodirectory') . ' ' . $post_info->post_title;?>"
-                           id="frnd_subject" type="text"  placeholder="<?php _e('Subject', 'geodirectory');?>"/>
+                           value="<?php echo __('About', 'geodirectory').' '.$post_info->post_title; ?>"
+                           id="frnd_subject" type="text"  placeholder="<?php _e('Subject', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_subject');?>
+            do_action('geodir_after_stf_form_field', 'frnd_subject'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_comments');?>
+            do_action('geodir_before_stf_form_field', 'frnd_comments'); ?>
             <div class="row  clearfix">
                     <textarea required field_type="textarea" name="frnd_comments" id="frnd_comments" cols=""
-                              rows="" placeholder="<?php echo SEND_TO_FRIEND_SAMPLE_CONTENT;?>"><?php echo SEND_TO_FRIEND_SAMPLE_CONTENT;?></textarea>
+                              rows="" placeholder="<?php echo SEND_TO_FRIEND_SAMPLE_CONTENT; ?>"><?php echo SEND_TO_FRIEND_SAMPLE_CONTENT; ?></textarea>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_comments');?>
+            do_action('geodir_after_stf_form_field', 'frnd_comments'); ?>
             <?php if (function_exists('geodir_get_captch')) {
                 geodir_get_captch('-1');
             }?>
@@ -118,7 +118,7 @@ 
         <form method="post" name="agt_mail_agent" id="agt_mail_agent"
               action="<?php echo get_permalink($post_info->ID); ?>">
             <input type="hidden" name="sendact" value="send_inqury"/>
-            <input type="hidden" name="pid" value="<?php echo $post_info->ID;?>"/>
+            <input type="hidden" name="pid" value="<?php echo $post_info->ID; ?>"/>
 
             <h3><?php
                 /**
@@ -127,7 +127,7 @@ 
                  * @since 1.0.0
                  * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
                  */
-                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
+                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY); ?> </h3>
 
             <p id="inquiry_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
@@ -137,9 +137,9 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called before.
              */
-            do_action('geodir_before_inquiry_form_field', 'inq_name');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_name'); ?>
             <div class="row  clearfix">
-                    <input required field_type="text" name="inq_name" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="inq_name" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /**
@@ -148,36 +148,36 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called after.
              */
-            do_action('geodir_after_inquiry_form_field', 'inq_name');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_name'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_email');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_email'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="inq_email" type="email" value="" placeholder="<?php _e('Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="inq_email" type="email" value="" placeholder="<?php _e('Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_email');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_email'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_phone'); ?>
             <div class="row  clearfix">
-                    <input name="inq_phone" id="agt_mail_phone" type="text" value="" placeholder="<?php _e('Phone number', 'geodirectory');?>"/>
+                    <input name="inq_phone" id="agt_mail_phone" type="text" value="" placeholder="<?php _e('Phone number', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_phone'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_msg'); ?>
             <div class="row  clearfix">
                     <textarea required field_type="textarea" name="inq_msg" cols=""
-                              rows="" placeholder="<?php echo SEND_INQUIRY_SAMPLE_CONTENT;?>"></textarea>
+                              rows="" placeholder="<?php echo SEND_INQUIRY_SAMPLE_CONTENT; ?>"></textarea>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
-            <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory');?>"
+            do_action('geodir_after_inquiry_form_field', 'inq_msg'); ?>
+            <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory'); ?>"
                    class="button clearfix"/>
         </form>
     </div> <?php

geodirectory-templates/add-listing.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 global $gd_session;
 
 if (!isset($_REQUEST['backandedit'])) {
-    $gd_session->un_set('listing');
+	$gd_session->un_set('listing');
 }
 // call header
 get_header();

geodirectory-widgets/listing_map_widget.php

Braces +6 added lines, -3 removed lines

@@ -198,7 +198,9 @@ 
                 $mapview = $maptype;

             }

 

-            if (empty($mapzoom)) $mapzoom = $zoom;

+            if (empty($mapzoom)) {
+            	$mapzoom = $zoom;
+            }
 

             // Set default map options

             $map_args['ajax_url'] = geodir_get_ajax_url();

@@ -326,8 +328,9 @@ 
 

                     foreach ($map_zoom_level as $level) {

                         $selected = '';

-                        if ($level == $zoom)

-                            $selected = 'selected="selected"';

+                        if ($level == $zoom) {
+                                                    $selected = 'selected="selected"';
+                        }
 

                         echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

 

Indentation +183 added lines, -183 removed lines

@@ -18,9 +18,9 @@ 
  */

 function init_listing_map_script()

 {

-    global $list_map_json;

+	global $list_map_json;

 

-    $list_map_json = array();

+	$list_map_json = array();

 

 }

 

@@ -35,18 +35,18 @@ 
  */

 function create_list_jsondata($post)

 {

-    global $wpdb, $list_map_json, $add_post_in_marker_array;

-

-    if ((is_main_query() || $add_post_in_marker_array) && isset($post->marker_json) && $post->marker_json != '') {

-        /**

-         * Filter the json data for search listing map.

-         *

-         * @since 1.5.7

-         * @param string $post->marker_json JSON representation of the post marker info.

-         * @param object $post The post object.

-         */

-        $list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

-    }

+	global $wpdb, $list_map_json, $add_post_in_marker_array;

+

+	if ((is_main_query() || $add_post_in_marker_array) && isset($post->marker_json) && $post->marker_json != '') {

+		/**

+		 * Filter the json data for search listing map.

+		 *

+		 * @since 1.5.7

+		 * @param string $post->marker_json JSON representation of the post marker info.

+		 * @param object $post The post object.

+		 */

+		$list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

+	}

 

 }

 

@@ -59,29 +59,29 @@ 
  */

 function show_listing_widget_map()

 {

-    global $list_map_json;

+	global $list_map_json;

 

-    if (!empty($list_map_json)) {

-        $list_map_json = array_unique($list_map_json);

-        $cat_content_info[] = implode(',', $list_map_json);

-    }

+	if (!empty($list_map_json)) {

+		$list_map_json = array_unique($list_map_json);

+		$cat_content_info[] = implode(',', $list_map_json);

+	}

 

-    $totalcount = count(array_unique($list_map_json));

+	$totalcount = count(array_unique($list_map_json));

 

 

-    if (!empty($cat_content_info)) {

-        $json_content = substr(implode(',', $cat_content_info), 1);

-        $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

-        $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08

-        $list_json = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

-    } else {

-        $list_json = '[{"totalcount":"0"}]';

-    }

+	if (!empty($cat_content_info)) {

+		$json_content = substr(implode(',', $cat_content_info), 1);

+		$json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

+		$json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08

+		$list_json = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+	} else {

+		$list_json = '[{"totalcount":"0"}]';

+	}

 

-    $listing_map_args = array('list_json' => $list_json);

+	$listing_map_args = array('list_json' => $list_json);

 

-    // Pass the json data in listing map script

-    wp_localize_script('geodir-listing-map-widget', 'listing_map_args', $listing_map_args);

+	// Pass the json data in listing map script

+	wp_localize_script('geodir-listing-map-widget', 'listing_map_args', $listing_map_args);

 

 }

 

@@ -93,187 +93,187 @@ 
 class geodir_map_listingpage extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the listing page map widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'widget geodir-map-listing-page', 'description' => __('Google Map for Listing page. It will show you google map V3 for Listing page.', 'geodirectory'));

-        parent::__construct(

-            'geodir_map_v3_listing_map', // Base ID

-            __('GD > GMap - Listing page', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

+	public function __construct() {

+		$widget_ops = array('classname' => 'widget geodir-map-listing-page', 'description' => __('Google Map for Listing page. It will show you google map V3 for Listing page.', 'geodirectory'));

+		parent::__construct(

+			'geodir_map_v3_listing_map', // Base ID

+			__('GD > GMap - Listing page', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

 

-        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array

+		add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array

 

-        add_action('the_post', 'create_list_jsondata'); // Add marker in json array

+		add_action('the_post', 'create_list_jsondata'); // Add marker in json array

 

-        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers

-    }

+		add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers

+	}

 

 	/**

 	 * Front-end display content for listing page map widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

+	 *

+	 * @global object $post The current post object.

 	 *

-     * @global object $post The current post object.

-     *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-

-        if (geodir_is_page('listing') || geodir_is_page('author') || geodir_is_page('search')

-            || geodir_is_page('detail')

-        ) :

-

-            extract($args, EXTR_SKIP);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $width = empty($instance['width']) ? '294' : apply_filters('widget_width', $instance['width']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $height = empty($instance['heigh']) ? '370' : apply_filters('widget_heigh', $instance['heigh']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);

-            /**

-             * Filter the listing map value widget_sticky, to set if the map should be sticky or not (scroll with page).

-             *

-             * @since 1.0.0

-             * @param bool $sticky True if should be sticky, false if not

-             */

-            $sticky = empty($instance['sticky']) ? '' : apply_filters('widget_sticky', $instance['sticky']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);

-            $showall = empty($instance['showall']) ? '0' : apply_filters('widget_showall', $instance['showall']);

+	public function widget($args, $instance)

+	{

+

+		if (geodir_is_page('listing') || geodir_is_page('author') || geodir_is_page('search')

+			|| geodir_is_page('detail')

+		) :

+

+			extract($args, EXTR_SKIP);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$width = empty($instance['width']) ? '294' : apply_filters('widget_width', $instance['width']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$height = empty($instance['heigh']) ? '370' : apply_filters('widget_heigh', $instance['heigh']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);

+			/**

+			 * Filter the listing map value widget_sticky, to set if the map should be sticky or not (scroll with page).

+			 *

+			 * @since 1.0.0

+			 * @param bool $sticky True if should be sticky, false if not

+			 */

+			$sticky = empty($instance['sticky']) ? '' : apply_filters('widget_sticky', $instance['sticky']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);

+			$showall = empty($instance['showall']) ? '0' : apply_filters('widget_showall', $instance['showall']);

 			

 			/**

-             * Filter the listing map should to be displayed or not.

-             *

-             * @since 1.4.6

+			 * Filter the listing map should to be displayed or not.

 			 *

-             * @param bool $display true if map should be displayed, false if not.

-             */

+			 * @since 1.4.6

+			 *

+			 * @param bool $display true if map should be displayed, false if not.

+			 */

 			$show_map = apply_filters( 'geodir_show_map_listing', $display = true );

 			if ( !$show_map ) {

 				return;

 			}

 

-            $map_args = array();

-            $map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']);

-            $map_args['width'] = $width;

-            $map_args['height'] = $height;

-

-            $map_args['scrollwheel'] = $scrollwheel;

-            $map_args['showall'] = $showall;

-            $map_args['child_collapse'] = '0';

-            $map_args['sticky'] = $sticky;

-            $map_args['enable_cat_filters'] = false;

-            $map_args['enable_text_search'] = false;

-            $map_args['enable_post_type_filters'] = false;

-            $map_args['enable_location_filters'] = false;

-            $map_args['enable_jason_on_load'] = true;

+			$map_args = array();

+			$map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']);

+			$map_args['width'] = $width;

+			$map_args['height'] = $height;

+

+			$map_args['scrollwheel'] = $scrollwheel;

+			$map_args['showall'] = $showall;

+			$map_args['child_collapse'] = '0';

+			$map_args['sticky'] = $sticky;

+			$map_args['enable_cat_filters'] = false;

+			$map_args['enable_text_search'] = false;

+			$map_args['enable_post_type_filters'] = false;

+			$map_args['enable_location_filters'] = false;

+			$map_args['enable_jason_on_load'] = true;

 			

-            if (is_single()) {

-

-                global $post;

-                $map_default_lat = $address_latitude = $post->post_latitude;

-                $map_default_lng = $address_longitude = $post->post_longitude;

-                $mapview = $post->post_mapview;

-                $mapzoom = $post->post_mapzoom;

-                $map_args['map_class_name'] = 'geodir-map-listing-page-single';

-

-            } else {

-                $default_location = geodir_get_default_location();

-

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

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

-                $map_args['map_class_name'] = 'geodir-map-listing-page';

-                $mapview = $maptype;

-            }

-

-            if (empty($mapzoom)) $mapzoom = $zoom;

-

-            // Set default map options

-            $map_args['ajax_url'] = geodir_get_ajax_url();

-            $map_args['latitude'] = $map_default_lat;

-            $map_args['longitude'] = $map_default_lng;

-            $map_args['zoom'] = $zoom;

-            //$map_args['scrollwheel'] = true;

-            $map_args['scrollwheel'] = $scrollwheel;

-            $map_args['showall'] = $showall;

-            $map_args['streetViewControl'] = true;

-            $map_args['maptype'] = $maptype;

-            $map_args['showPreview'] = '0';

-            $map_args['maxZoom'] = 21;

-            $map_args['autozoom'] = $autozoom;

-            $map_args['bubble_size'] = 'small';

+			if (is_single()) {

+

+				global $post;

+				$map_default_lat = $address_latitude = $post->post_latitude;

+				$map_default_lng = $address_longitude = $post->post_longitude;

+				$mapview = $post->post_mapview;

+				$mapzoom = $post->post_mapzoom;

+				$map_args['map_class_name'] = 'geodir-map-listing-page-single';

+

+			} else {

+				$default_location = geodir_get_default_location();

+

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

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

+				$map_args['map_class_name'] = 'geodir-map-listing-page';

+				$mapview = $maptype;

+			}

+

+			if (empty($mapzoom)) $mapzoom = $zoom;

+

+			// Set default map options

+			$map_args['ajax_url'] = geodir_get_ajax_url();

+			$map_args['latitude'] = $map_default_lat;

+			$map_args['longitude'] = $map_default_lng;

+			$map_args['zoom'] = $zoom;

+			//$map_args['scrollwheel'] = true;

+			$map_args['scrollwheel'] = $scrollwheel;

+			$map_args['showall'] = $showall;

+			$map_args['streetViewControl'] = true;

+			$map_args['maptype'] = $maptype;

+			$map_args['showPreview'] = '0';

+			$map_args['maxZoom'] = 21;

+			$map_args['autozoom'] = $autozoom;

+			$map_args['bubble_size'] = 'small';

             

-            $map_args['enable_marker_cluster'] = defined('GDCLUSTER_VERSION') && !empty($instance['marker_cluster']) ? true : false;

+			$map_args['enable_marker_cluster'] = defined('GDCLUSTER_VERSION') && !empty($instance['marker_cluster']) ? true : false;

 

-            echo $before_widget;

-            geodir_draw_map($map_args);

-            echo $after_widget;

+			echo $before_widget;

+			geodir_draw_map($map_args);

+			echo $after_widget;

 

-        endif;

-    }

+		endif;

+	}

 

 	/**

 	 * Sanitize listing page map widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

 	 *

 	 * @return array Updated safe values to be saved.

 	 */

-    public function update($new_instance, $old_instance) {

-        //save the widget

-        $instance = $old_instance;

-        $instance['width'] = strip_tags($new_instance['width']);

-        $instance['heigh'] = ($new_instance['heigh']);

-        $instance['maptype'] = ($new_instance['maptype']);

-        $instance['zoom'] = ($new_instance['zoom']);

-        $instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';

-        $instance['sticky'] = isset($new_instance['sticky']) ? $new_instance['sticky'] : '';

-        $instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';

-        $instance['showall'] = isset($new_instance['showall']) ? ($new_instance['showall']) : '';

-        $instance['marker_cluster'] = defined('GDCLUSTER_VERSION') && !empty($new_instance['marker_cluster']) ? 1 : '';

-

-        return $instance;

-    }

+	public function update($new_instance, $old_instance) {

+		//save the widget

+		$instance = $old_instance;

+		$instance['width'] = strip_tags($new_instance['width']);

+		$instance['heigh'] = ($new_instance['heigh']);

+		$instance['maptype'] = ($new_instance['maptype']);

+		$instance['zoom'] = ($new_instance['zoom']);

+		$instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';

+		$instance['sticky'] = isset($new_instance['sticky']) ? $new_instance['sticky'] : '';

+		$instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';

+		$instance['showall'] = isset($new_instance['showall']) ? ($new_instance['showall']) : '';

+		$instance['marker_cluster'] = defined('GDCLUSTER_VERSION') && !empty($new_instance['marker_cluster']) ? 1 : '';

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing page map widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

-    public function form($instance) {

-        // widget form in backend

-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0', 'marker_cluster' => '0'));

+	public function form($instance) {

+		// widget form in backend

+		$instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0', 'marker_cluster' => '0'));

         

-        $width = strip_tags($instance['width']);

-        $heigh = strip_tags($instance['heigh']);

-        $maptype = strip_tags($instance['maptype']);

-        $zoom = strip_tags($instance['zoom']);

-        $autozoom = strip_tags($instance['autozoom']);

-        $sticky = strip_tags($instance['sticky']);

-        $scrollwheel = strip_tags($instance['scrollwheel']);

-        $showall = strip_tags($instance['showall']);

-        $marker_cluster = (int)$instance['marker_cluster'];

-        ?>

+		$width = strip_tags($instance['width']);

+		$heigh = strip_tags($instance['heigh']);

+		$maptype = strip_tags($instance['maptype']);

+		$zoom = strip_tags($instance['zoom']);

+		$autozoom = strip_tags($instance['autozoom']);

+		$sticky = strip_tags($instance['sticky']);

+		$scrollwheel = strip_tags($instance['scrollwheel']);

+		$showall = strip_tags($instance['showall']);

+		$marker_cluster = (int)$instance['marker_cluster'];

+		?>

         <p>

             <label

                 for="<?php echo $this->get_field_id('width'); ?>"><?php _e('Map Width <small>(Default is : 294) you can use px or % here</small>', 'geodirectory'); ?>

@@ -302,14 +302,14 @@ 
                         name="<?php echo $this->get_field_name('maptype'); ?>">

 

                     <option <?php if (isset($maptype) && $maptype == 'ROADMAP') {

-                        echo 'selected="selected"';

-                    } ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>

                     <option <?php if (isset($maptype) && $maptype == 'SATELLITE') {

-                        echo 'selected="selected"';

-                    } ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>

                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {

-                        echo 'selected="selected"';

-                    } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

 					<option <?php selected($maptype, 'TERRAIN');?> 

 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>

                 </select>

@@ -317,8 +317,8 @@ 
         </p>

 

         <?php

-        $map_zoom_level = geodir_map_zoom_level();

-        ?>

+		$map_zoom_level = geodir_map_zoom_level();

+		?>

 

         <p>

             <label

@@ -328,14 +328,14 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('zoom'); ?>"

                         name="<?php echo $this->get_field_name('zoom'); ?>"> <?php

 

-                    foreach ($map_zoom_level as $level) {

-                        $selected = '';

-                        if ($level == $zoom)

-                            $selected = 'selected="selected"';

+					foreach ($map_zoom_level as $level) {

+						$selected = '';

+						if ($level == $zoom)

+							$selected = 'selected="selected"';

 

-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

+						echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

 

-                    } ?>

+					} ?>

 

                 </select>

 

@@ -347,8 +347,8 @@ 
                 for="<?php echo $this->get_field_id('autozoom'); ?>">

                 <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('autozoom'); ?>"

                        name="<?php echo $this->get_field_name('autozoom'); ?>"<?php if ($autozoom) {

-                    echo 'checked="checked"';

-                } ?> /> <?php _e('Map Auto Zoom ?', 'geodirectory'); ?></label>

+					echo 'checked="checked"';

+				} ?> /> <?php _e('Map Auto Zoom ?', 'geodirectory'); ?></label>

         </p>

 

         <p>

@@ -356,8 +356,8 @@ 
                 for="<?php echo $this->get_field_id('sticky'); ?>">

                 <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('sticky'); ?>"

                        name="<?php echo $this->get_field_name('sticky'); ?>"<?php if ($sticky) {

-                    echo 'checked="checked"';

-                } ?> /> <?php _e('Map Sticky(should stick to the right of screen) ?', 'geodirectory'); ?>

+					echo 'checked="checked"';

+				} ?> /> <?php _e('Map Sticky(should stick to the right of screen) ?', 'geodirectory'); ?>

             </label>

         </p>

 

@@ -383,7 +383,7 @@ 
     </p> -->

 

     <?php

-    }

+	}

 } // class geodir_map_listingpage

 

 register_widget('geodir_map_listingpage');

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
          * @param string $post->marker_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

+        $list_map_json[] = apply_filters('geodir_create_list_jsondata', $post->marker_json, $post);

     }

 

 }

@@ -73,7 +73,7 @@ 
         $json_content = substr(implode(',', $cat_content_info), 1);

         $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

         $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08

-        $list_json = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+        $list_json = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';

     } else {

         $list_json = '[{"totalcount":"0"}]';

     }

@@ -161,8 +161,8 @@ 
 			 *

              * @param bool $display true if map should be displayed, false if not.

              */

-			$show_map = apply_filters( 'geodir_show_map_listing', $display = true );

-			if ( !$show_map ) {

+			$show_map = apply_filters('geodir_show_map_listing', $display = true);

+			if (!$show_map) {

 				return;

 			}

 

@@ -262,7 +262,7 @@ 
 	 */

     public function form($instance) {

         // widget form in backend

-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0', 'marker_cluster' => '0'));

+        $instance = wp_parse_args((array) $instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0', 'marker_cluster' => '0'));

         

         $width = strip_tags($instance['width']);

         $heigh = strip_tags($instance['heigh']);

@@ -272,7 +272,7 @@ 
         $sticky = strip_tags($instance['sticky']);

         $scrollwheel = strip_tags($instance['scrollwheel']);

         $showall = strip_tags($instance['showall']);

-        $marker_cluster = (int)$instance['marker_cluster'];

+        $marker_cluster = (int) $instance['marker_cluster'];

         ?>

         <p>

             <label

@@ -310,7 +310,7 @@ 
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {

                         echo 'selected="selected"';

                     } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

-					<option <?php selected($maptype, 'TERRAIN');?> 

+					<option <?php selected($maptype, 'TERRAIN'); ?> 

 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>

                 </select>

             </label>

@@ -333,7 +333,7 @@ 
                         if ($level == $zoom)

                             $selected = 'selected="selected"';

 

-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

+                        echo '<option '.$selected.' value="'.$level.'">'.$level.'</option>';

 

                     } ?>

 

@@ -366,7 +366,7 @@ 
                 for="<?php echo $this->get_field_id('scrollwheel'); ?>">

                 <input id="<?php echo $this->get_field_id('scrollwheel'); ?>"

                        name="<?php echo $this->get_field_name('scrollwheel'); ?>" type="checkbox" value="1"

-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> /> <?php _e('Enable mouse scroll zoom ?', 'geodirectory'); ?>

+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> /> <?php _e('Enable mouse scroll zoom ?', 'geodirectory'); ?>

             </label>

         </p>

         <?php if (defined('GDCLUSTER_VERSION')) { ?>

geodirectory-templates/listing-listview.php

Braces +8 added lines, -3 removed lines

@@ -80,7 +80,10 @@ 
                     echo ' geodir-listview ';

                 } ?> <?php if ($post_view_class) {

                     echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

+                } ?>" <?php if (isset($listing_width) && $listing_width) {
+                	echo "style='width:{$listing_width}%;'";
+                }
+                // Width for widget listing

 

                 echo " data-post-id='$post->ID' ";

                 /**

@@ -402,8 +405,10 @@ 
              */

             do_action('geodir_after_listing_post_listview');

 

-        else:

-			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

+        else {
+        	:

+			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
+        }
             

 			/**

              * Called inside the `ul` of the listings template, when no listing found.

Spacing +14 added lines, -14 removed lines

@@ -75,7 +75,7 @@ 
                 ?>

 

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

+                    echo 'geodir-gridview '.$grid_view_class;

                 } else {

                     echo ' geodir-listview ';

                 } ?> <?php if ($post_view_class) {

@@ -116,7 +116,7 @@ 
                                     echo geodir_show_badges_on_image('featured', $post, get_permalink());

                                 }

 

-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');

+                                $geodir_days_new = (int) get_option('geodir_listing_new_days');

 

                                 if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

                                     echo geodir_show_badges_on_image('new', $post, get_permalink());

@@ -194,14 +194,14 @@ 
                                         } else {

                                             $uom = __('meters', 'geodirectory');

                                         }

-                                        echo round($distance) . ' ' . $uom . '<br />';

+                                        echo round($distance).' '.$uom.'<br />';

                                     } else {

                                         if ($uom == 'miles') {

                                             $uom = __('miles', 'geodirectory');

                                         } else {

                                             $uom = __('km', 'geodirectory');

                                         }

-                                        echo round($distance, 2) . ' ' . $uom . '<br />';

+                                        echo round($distance, 2).' '.$uom.'<br />';

                                     }

                                     ?>

                                 </h3>

@@ -231,13 +231,13 @@ 
                                  */

                                 $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

                                 if ($show_listing_excerpt) {

-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                        $content_out = geodir_max_excerpt( $character_count );

+                                    if (isset($character_count) && ($character_count || $character_count == '0')) {

+                                        $content_out = geodir_max_excerpt($character_count);

                                     } else {

                                         $content_out = get_the_excerpt();

                                     }

-                                    if ( ! empty( $content_out ) ) {

-                                        echo "<p>" . $content_out . "</p>";

+                                    if (!empty($content_out)) {

+                                        echo "<p>".$content_out."</p>";

                                     }

                                 }

                                 ?></div>

@@ -261,7 +261,7 @@ 
                          * @param object $post The post object.

                          * @param string $view The view type, default 'listing'.

                          */

-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

+                        do_action('geodir_after_listing_content', $post, 'listing'); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">

 

@@ -273,7 +273,7 @@ 
                                  * @param object $post The post object.

                                  * @param string $view The view type, default 'listing'.

                                  */

-                                do_action( 'geodir_before_review_html', $post, 'listing' );

+                                do_action('geodir_before_review_html', $post, 'listing');

 

                                 $review_show = geodir_is_reviews_show('listview');

 

@@ -316,7 +316,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

+                                do_action('geodir_after_favorite_html', $post->ID, 'listing');

 

 

                                 /**

@@ -327,7 +327,7 @@ 
                                  * @param int $post->ID The post id.

                                  * @param object $post The post object.

                                  */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

+                                do_action('geodir_listing_after_pinpoint', $post->ID, $post);

 

                                 if ($post->post_author == get_current_user_id()) { ?>

                                     <?php

@@ -356,7 +356,7 @@ 
                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                                                    echo '<i class="'.$geodir_listing_edit_icon.'"></i>';

                                                     ?>

                                                     <?php _e('Edit', 'geodirectory'); ?>

                                                 </a>

@@ -364,7 +364,7 @@ 
                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                                                    echo '<i class="'.$geodir_listing_delete_icon.'"></i>';

                                                     ?>

                                                     <?php _e('Delete', 'geodirectory'); ?>

                                                 </a>

Indentation +276 added lines, -276 removed lines

@@ -44,57 +44,57 @@ 
 

         <?php if (have_posts()) :

 

-            /**

-             * Called inside the `ul` of the listings template, but before any `li` elements.

-             *

-             * When used by the widget view template then it will only show if there are listings to be shown.

-             *

-             * @since 1.0.0

-             * @see 'geodir_after_listing_post_listview'

-             */

-            do_action('geodir_before_listing_post_listview');

-

-            while (have_posts()) : the_post();

-                global $post, $wpdb, $preview;

-

-                /**

-                 * Add a class to the `li` element of the listings list template.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The extra class for the `li` element, default empty.

-                 */

-                $post_view_class = apply_filters('geodir_post_view_extra_class', '');

-

-                /**

-                 * Add a class to the `article` tag inside the `li` element on the listings list template.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The extra class for the `article` element, default empty.

-                 */

-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

-                ?>

+			/**

+			 * Called inside the `ul` of the listings template, but before any `li` elements.

+			 *

+			 * When used by the widget view template then it will only show if there are listings to be shown.

+			 *

+			 * @since 1.0.0

+			 * @see 'geodir_after_listing_post_listview'

+			 */

+			do_action('geodir_before_listing_post_listview');

+

+			while (have_posts()) : the_post();

+				global $post, $wpdb, $preview;

+

+				/**

+				 * Add a class to the `li` element of the listings list template.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The extra class for the `li` element, default empty.

+				 */

+				$post_view_class = apply_filters('geodir_post_view_extra_class', '');

+

+				/**

+				 * Add a class to the `article` tag inside the `li` element on the listings list template.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The extra class for the `article` element, default empty.

+				 */

+				$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

+				?>

 

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

-                } else {

-                    echo ' geodir-listview ';

-                } ?> <?php if ($post_view_class) {

-                    echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

-

-                echo " data-post-id='$post->ID' ";

-                /**

-                 * Called inside the `<li>` tag for listing outputs.

-                 *

-                 * @since 1.5.9

-                 * @param object $post The post object.

-                 * @param string $string If called on the listing or widget template.

-                 */

-                do_action('geodir_listview_inside_li', $post, 'listing');

-                ?> >

+					echo 'geodir-gridview ' . $grid_view_class;

+				} else {

+					echo ' geodir-listview ';

+				} ?> <?php if ($post_view_class) {

+					echo $post_view_class;

+				} ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

+

+				echo " data-post-id='$post->ID' ";

+				/**

+				 * Called inside the `<li>` tag for listing outputs.

+				 *

+				 * @since 1.5.9

+				 * @param object $post The post object.

+				 * @param string $string If called on the listing or widget template.

+				 */

+				do_action('geodir_listview_inside_li', $post, 'listing');

+				?> >

                     <article class="geodir-category-listing <?php if ($post_view_article_class) {

-                        echo $post_view_article_class;

-                    } ?>">

+						echo $post_view_article_class;

+					} ?>">

                         <div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'listing'); ?>">

                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>

 

@@ -102,37 +102,37 @@ 
                                     <?php echo $fimage; ?>

                                 </a>

                                 <?php

-                                /**

-                                 * Called before badges are output.

-                                 *

-                                 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.

-                                 *

-                                 * @since 1.0.0

-                                 * @param object $post The post object.

-                                 * @see 'geodir_after_badge_on_image'

-                                 */

-                                do_action('geodir_before_badge_on_image', $post);

-                                if (isset($post->is_featured) && $post->is_featured) {

-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());

-                                }

-

-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');

-

-                                if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

-                                    echo geodir_show_badges_on_image('new', $post, get_permalink());

-                                }

-

-                                /**

-                                 * Called after badges are output.

-                                 *

-                                 * Called on the listings template after the image and badges like `new` or `featured` have been output.

-                                 *

-                                 * @since 1.0.0

-                                 * @param object $post The post object.

-                                 * @see 'geodir_before_badge_on_image'

-                                 */

-                                do_action('geodir_after_badge_on_image', $post);

-                                ?>

+								/**

+								 * Called before badges are output.

+								 *

+								 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.

+								 *

+								 * @since 1.0.0

+								 * @param object $post The post object.

+								 * @see 'geodir_after_badge_on_image'

+								 */

+								do_action('geodir_before_badge_on_image', $post);

+								if (isset($post->is_featured) && $post->is_featured) {

+									echo geodir_show_badges_on_image('featured', $post, get_permalink());

+								}

+

+								$geodir_days_new = (int)get_option('geodir_listing_new_days');

+

+								if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

+									echo geodir_show_badges_on_image('new', $post, get_permalink());

+								}

+

+								/**

+								 * Called after badges are output.

+								 *

+								 * Called on the listings template after the image and badges like `new` or `featured` have been output.

+								 *

+								 * @since 1.0.0

+								 * @param object $post The post object.

+								 * @see 'geodir_before_badge_on_image'

+								 */

+								do_action('geodir_after_badge_on_image', $post);

+								?>

 

 

                             <?php } ?>

@@ -142,15 +142,15 @@ 
                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'listing'); ?>">

 

                             <?php

-                            /**

-                             * Called before the post title on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param string $type The template type, default 'listview'.

-                             * @param object $post The post object.

-                             * @see 'geodir_after_listing_post_title'

-                             */

-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>

+							/**

+							 * Called before the post title on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param string $type The template type, default 'listview'.

+							 * @param object $post The post object.

+							 * @see 'geodir_after_listing_post_title'

+							 */

+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>

 

                             <header class="geodir-entry-header"><h3 class="geodir-entry-title">

                                     <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">

@@ -162,226 +162,226 @@ 
                             <!-- .entry-header -->

 

                             <?php

-                            /**

-                             * Called after the post title on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param string $type The template type, default 'listview'.

-                             * @param object $post The post object.

-                             * @see 'geodir_before_listing_post_title'

-                             */

-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>

+							/**

+							 * Called after the post title on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param string $type The template type, default 'listview'.

+							 * @param object $post The post object.

+							 * @see 'geodir_before_listing_post_title'

+							 */

+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>

 

                             <?php /// Print Distance

-                            if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') || $related_nearest) {

-

-                                if ($related_nearest) {

-                                    $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);

-                                } else {

-                                    $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

-                                }

-

-                                $endLat = $post->post_latitude;

-                                $endLon = $post->post_longitude;

-                                $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

-                                $uom = get_option('geodir_search_dist_1');

-                                $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom); ?>

+							if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') || $related_nearest) {

+

+								if ($related_nearest) {

+									$startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);

+								} else {

+									$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

+								}

+

+								$endLat = $post->post_latitude;

+								$endLon = $post->post_longitude;

+								$endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

+								$uom = get_option('geodir_search_dist_1');

+								$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom); ?>

                                 <h3>

                                     <?php

 

-                                    if (round($distance, 2) == 0) {

-                                        $uom = get_option('geodir_search_dist_2');

-

-                                        $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

-                                        if ($uom == 'feet') {

-                                            $uom = __('feet', 'geodirectory');

-                                        } else {

-                                            $uom = __('meters', 'geodirectory');

-                                        }

-                                        echo round($distance) . ' ' . $uom . '<br />';

-                                    } else {

-                                        if ($uom == 'miles') {

-                                            $uom = __('miles', 'geodirectory');

-                                        } else {

-                                            $uom = __('km', 'geodirectory');

-                                        }

-                                        echo round($distance, 2) . ' ' . $uom . '<br />';

-                                    }

-                                    ?>

+									if (round($distance, 2) == 0) {

+										$uom = get_option('geodir_search_dist_2');

+

+										$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

+										if ($uom == 'feet') {

+											$uom = __('feet', 'geodirectory');

+										} else {

+											$uom = __('meters', 'geodirectory');

+										}

+										echo round($distance) . ' ' . $uom . '<br />';

+									} else {

+										if ($uom == 'miles') {

+											$uom = __('miles', 'geodirectory');

+										} else {

+											$uom = __('km', 'geodirectory');

+										}

+										echo round($distance, 2) . ' ' . $uom . '<br />';

+									}

+									?>

                                 </h3>

                             <?php } ?>

 

 

                             <?php

-                            /**

-                             * Called before the post excerpt on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param object $post The post object.

-                             * @see 'geodir_after_listing_post_excerpt'

-                             */

-                            do_action('geodir_before_listing_post_excerpt', $post); ?>

+							/**

+							 * Called before the post excerpt on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param object $post The post object.

+							 * @see 'geodir_after_listing_post_excerpt'

+							 */

+							do_action('geodir_before_listing_post_excerpt', $post); ?>

                             <?php echo geodir_show_listing_info('listing'); ?>

                             <div class="geodir-entry-content">

 

                                 <?php

-                                /**

-                                 * Filter to hide the listing excerpt

-                                 *

-                                 * @since 1.5.3

-                                 * @param bool $display Display the excerpt or not. Default true.

-                                 * @param string $view The view type, default 'listview'.

-                                 * @param object $post The post object.

-                                 */

-                                $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

-                                if ($show_listing_excerpt) {

-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                        $content_out = geodir_max_excerpt( $character_count );

-                                    } else {

-                                        $content_out = get_the_excerpt();

-                                    }

-                                    if ( ! empty( $content_out ) ) {

-                                        echo "<p>" . $content_out . "</p>";

-                                    }

-                                }

-                                ?></div>

+								/**

+								 * Filter to hide the listing excerpt

+								 *

+								 * @since 1.5.3

+								 * @param bool $display Display the excerpt or not. Default true.

+								 * @param string $view The view type, default 'listview'.

+								 * @param object $post The post object.

+								 */

+								$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

+								if ($show_listing_excerpt) {

+									if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

+										$content_out = geodir_max_excerpt( $character_count );

+									} else {

+										$content_out = get_the_excerpt();

+									}

+									if ( ! empty( $content_out ) ) {

+										echo "<p>" . $content_out . "</p>";

+									}

+								}

+								?></div>

 

                             <?php

-                            /**

-                             * Called after the post excerpt on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param object $post The post object.

-                             * @see 'geodir_before_listing_post_excerpt'

-                             */

-                            do_action('geodir_after_listing_post_excerpt', $post); ?>

+							/**

+							 * Called after the post excerpt on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param object $post The post object.

+							 * @see 'geodir_before_listing_post_excerpt'

+							 */

+							do_action('geodir_after_listing_post_excerpt', $post); ?>

                         </div>

                         <!-- gd-content ends here-->

                         <?php

-                        /**

-                         * Called after printing listing content.

-                         *

-                         * @since 1.5.3

-                         * @param object $post The post object.

-                         * @param string $view The view type, default 'listing'.

-                         */

-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

+						/**

+						 * Called after printing listing content.

+						 *

+						 * @since 1.5.3

+						 * @param object $post The post object.

+						 * @param string $view The view type, default 'listing'.

+						 */

+						do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">

 

                                 <?php

-                                /**

-                                 * Called before printing review stars html.

-                                 *

-                                 * @since 1.5.3

-                                 * @param object $post The post object.

-                                 * @param string $view The view type, default 'listing'.

-                                 */

-                                do_action( 'geodir_before_review_html', $post, 'listing' );

-

-                                $review_show = geodir_is_reviews_show('listview');

-

-                                if ($review_show) {

-

-                                    if (!$preview) {

-                                        $post_avgratings = geodir_get_post_rating($post->ID);

-                                        /**

-                                         * Called before the rating stars are output on the listings view template.

-                                         *

-                                         * @since 1.0.0

-                                         * @param float $post_avgratings The average rating for the post.

-                                         * @param int $post->ID The post ID.

-                                         * @see 'geodir_after_review_rating_stars_on_listview'

-                                         */

-                                        do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

-

-                                        echo geodir_get_rating_stars($post_avgratings, $post->ID);

-

-                                        /**

-                                         * Called after the rating stars are output on the listings view template.

-                                         *

-                                         * @since 1.0.0

-                                         * @param float $post_avgratings The average rating for the post.

-                                         * @param int $post->ID The post ID.

-                                         * @see 'geodir_before_review_rating_stars_on_listview'

-                                         */

-                                        do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

-                                    }

-                                    ?>

+								/**

+								 * Called before printing review stars html.

+								 *

+								 * @since 1.5.3

+								 * @param object $post The post object.

+								 * @param string $view The view type, default 'listing'.

+								 */

+								do_action( 'geodir_before_review_html', $post, 'listing' );

+

+								$review_show = geodir_is_reviews_show('listview');

+

+								if ($review_show) {

+

+									if (!$preview) {

+										$post_avgratings = geodir_get_post_rating($post->ID);

+										/**

+										 * Called before the rating stars are output on the listings view template.

+										 *

+										 * @since 1.0.0

+										 * @param float $post_avgratings The average rating for the post.

+										 * @param int $post->ID The post ID.

+										 * @see 'geodir_after_review_rating_stars_on_listview'

+										 */

+										do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+

+										echo geodir_get_rating_stars($post_avgratings, $post->ID);

+

+										/**

+										 * Called after the rating stars are output on the listings view template.

+										 *

+										 * @since 1.0.0

+										 * @param float $post_avgratings The average rating for the post.

+										 * @param int $post->ID The post ID.

+										 * @see 'geodir_before_review_rating_stars_on_listview'

+										 */

+										do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+									}

+									?>

                                     <a href="<?php comments_link(); ?>" class="geodir-pcomments"><i

                                             class="fa fa-comments"></i>

                                         <?php geodir_comments_number($post->rating_count); ?></a>

                                 <?php

-                                }

+								}

 

 

-                                /**

-                                 * Called after printing favorite html.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

+								/**

+								 * Called after printing favorite html.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

 

 

-                                /**

-                                 * Called after printing map pin point.

-                                 *

-                                 * @since 1.0.0

-                                 * @since 1.5.9 Added $post as second param.

-                                 * @param int $post->ID The post id.

-                                 * @param object $post The post object.

-                                 */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

+								/**

+								 * Called after printing map pin point.

+								 *

+								 * @since 1.0.0

+								 * @since 1.5.9 Added $post as second param.

+								 * @param int $post->ID The post id.

+								 * @param object $post The post object.

+								 */

+								do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

 

-                                if ($post->post_author == get_current_user_id()) { ?>

+								if ($post->post_author == get_current_user_id()) { ?>

                                     <?php

-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());

-                                    $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

-                                    $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

+									$addplacelink = get_permalink(geodir_add_listing_page_id());

+									$editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

+									$upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

 

-                                    $ajaxlink = geodir_get_ajax_url();

-                                    $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

+									$ajaxlink = geodir_get_ajax_url();

+									$deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

 

-                                    ?>

+									?>

 

                                     <span class="geodir-authorlink clearfix">

 											

 											<?php if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

-                                                /**

-                                                 * Called before the edit post link on the listings view template used on the author page.

-                                                 *

-                                                 * @since 1.0.0

-                                                 * @see 'geodir_after_edit_post_link_on_listing'

-                                                 */

-                                                do_action('geodir_before_edit_post_link_on_listing');

-                                                ?>

+												/**

+												 * Called before the edit post link on the listings view template used on the author page.

+												 *

+												 * @since 1.0.0

+												 * @see 'geodir_after_edit_post_link_on_listing'

+												 */

+												do_action('geodir_before_edit_post_link_on_listing');

+												?>

 

                                                 <a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"

                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                                                     <?php

-                                                    $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

-                                                    ?>

+													$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

+													echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+													?>

                                                     <?php _e('Edit', 'geodirectory'); ?>

                                                 </a>

                                                 <a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"

                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                                                     <?php

-                                                    $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

-                                                    ?>

+													$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

+													echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+													?>

                                                     <?php _e('Delete', 'geodirectory'); ?>

                                                 </a>

                                                 <?php

 

-                                                /**

-                                                 * Called after the edit post link on the listings view template used on the author page.

-                                                 *

-                                                 * @since 1.0.0

-                                                 * @see 'geodir_before_edit_post_link_on_listing'

-                                                 */

-                                                do_action('geodir_after_edit_post_link_on_listing');

-                                            } ?>

+												/**

+												 * Called after the edit post link on the listings view template used on the author page.

+												 *

+												 * @since 1.0.0

+												 * @see 'geodir_before_edit_post_link_on_listing'

+												 */

+												do_action('geodir_after_edit_post_link_on_listing');

+											} ?>

 											</span>

 

                                 <?php } ?>

@@ -394,32 +394,32 @@ 
                 </li>

 

             <?php

-            endwhile;

-

-            /**

-             * Called inside the `ul` of the listings template, but after all `li` elements.

-             *

-             * When used by the widget view template then it will only show if there are listings to be shown.

-             *

-             * @since 1.0.0

-             * @see 'geodir_before_listing_post_listview'

-             */

-            do_action('geodir_after_listing_post_listview');

-

-        else:

+			endwhile;

+

+			/**

+			 * Called inside the `ul` of the listings template, but after all `li` elements.

+			 *

+			 * When used by the widget view template then it will only show if there are listings to be shown.

+			 *

+			 * @since 1.0.0

+			 * @see 'geodir_before_listing_post_listview'

+			 */

+			do_action('geodir_after_listing_post_listview');

+

+		else:

 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

             

 			/**

-             * Called inside the `ul` of the listings template, when no listing found.

-             *

-             * @since 1.5.5

+			 * Called inside the `ul` of the listings template, when no listing found.

+			 *

+			 * @since 1.5.5

 			 * @param string 'listing-listview' Listing listview template.

 			 * @param bool $favorite Are favorite listings results?

-             */

-            do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);

-        endif;

+			 */

+			do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);

+		endif;

 

-        ?>

+		?>

     </ul>  <!-- geodir_category_list_view ends here-->

 

     <div class="clear"></div>

geodirectory-templates/widget-listing-listview.php

Indentation +157 added lines, -157 removed lines

@@ -20,72 +20,72 @@ 
 /** This action is documented in geodirectory-templates/listing-listview.php */

 $grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns_widget);

 if ($gd_session->get('gd_listing_view') && !isset($before_widget)) {

-    $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));

+	$grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));

 }

 ?>

     <ul class="geodir_category_list_view clearfix <?php echo apply_filters('geodir_listing_listview_ul_extra_class', '', 'widget'); ?>">

         <?php

-        if (!empty($widget_listings)) {

-            /** This action is documented in geodirectory-templates/listing-listview.php */

-            do_action('geodir_before_listing_post_listview');

-            $all_postypes = geodir_get_posttypes();

-            $geodir_days_new = (int)get_option('geodir_listing_new_days');

-            foreach ($widget_listings as $widget_listing) {

-                global $gd_widget_listing_type;

-                $post = $widget_listing;

+		if (!empty($widget_listings)) {

+			/** This action is documented in geodirectory-templates/listing-listview.php */

+			do_action('geodir_before_listing_post_listview');

+			$all_postypes = geodir_get_posttypes();

+			$geodir_days_new = (int)get_option('geodir_listing_new_days');

+			foreach ($widget_listings as $widget_listing) {

+				global $gd_widget_listing_type;

+				$post = $widget_listing;

 

-                $GLOBALS['post'] = $post;

-                setup_postdata($post);

+				$GLOBALS['post'] = $post;

+				setup_postdata($post);

 

-                $gd_widget_listing_type = $post->post_type;

+				$gd_widget_listing_type = $post->post_type;

 

-                /** This action is documented in geodirectory-templates/listing-listview.php */

-                $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);

+				/** This action is documented in geodirectory-templates/listing-listview.php */

+				$post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);

 

-                /** This action is documented in geodirectory-templates/listing-listview.php */

-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

-                ?>

+				/** This action is documented in geodirectory-templates/listing-listview.php */

+				$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

+				?>

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

-                } else {

-                    echo ' geodir-listview ';

-                } ?> <?php if ($post_view_class) {

-                    echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) {

-                    echo "style='width:{$listing_width}%;'";

-                }

+					echo 'geodir-gridview ' . $grid_view_class;

+				} else {

+					echo ' geodir-listview ';

+				} ?> <?php if ($post_view_class) {

+					echo $post_view_class;

+				} ?>" <?php if (isset($listing_width) && $listing_width) {

+					echo "style='width:{$listing_width}%;'";

+				}

 

-                echo " data-post-id='$post->ID' ";

-                /** This action is documented in geodirectory-templates/listing-listview.php */

-                do_action('geodir_listview_inside_li', $post, 'widget');

-                ?>>

+				echo " data-post-id='$post->ID' ";

+				/** This action is documented in geodirectory-templates/listing-listview.php */

+				do_action('geodir_listview_inside_li', $post, 'widget');

+				?>>

                     <article class="geodir-category-listing <?php if ($post_view_article_class) {

-                        echo $post_view_article_class;

-                    } ?>">

+						echo $post_view_article_class;

+					} ?>">

                         <div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'widget'); ?>">

                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>

                                 <a href="<?php the_permalink(); ?>"><?php echo $fimage; ?></a>

                                 <?php

-                                /** This action is documented in geodirectory-templates/listing-listview.php */

-                                do_action('geodir_before_badge_on_image', $post);

-                                if ($post->is_featured) {

-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());

-                                }

+								/** This action is documented in geodirectory-templates/listing-listview.php */

+								do_action('geodir_before_badge_on_image', $post);

+								if ($post->is_featured) {

+									echo geodir_show_badges_on_image('featured', $post, get_permalink());

+								}

 

 

-                                if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

-                                    echo geodir_show_badges_on_image('new', $post, get_permalink());

-                                }

+								if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

+									echo geodir_show_badges_on_image('new', $post, get_permalink());

+								}

 

-                                /** This action is documented in geodirectory-templates/listing-listview.php */

-                                do_action('geodir_after_badge_on_image', $post);

-                            }

-                            ?>

+								/** This action is documented in geodirectory-templates/listing-listview.php */

+								do_action('geodir_after_badge_on_image', $post);

+							}

+							?>

                         </div>

                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'widget'); ?>">

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>

                             <header class="geodir-entry-header">

                                 <h3 class="geodir-entry-title">

                                     <a href="<?php the_permalink(); ?>"

@@ -94,158 +94,158 @@ 
                             </header>

                             <!-- .entry-header -->

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>

                             <?php /// Print Distance

-                            if (isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') {

-                                $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

+							if (isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') {

+								$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

 

-                                $endLat = $post->post_latitude;

-                                $endLon = $post->post_longitude;

-                                $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

-                                $uom = get_option('geodir_search_dist_1');

-                                $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

-                                ?>

+								$endLat = $post->post_latitude;

+								$endLon = $post->post_longitude;

+								$endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

+								$uom = get_option('geodir_search_dist_1');

+								$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

+								?>

                                 <h3>

                                     <?php

-                                    if (round($distance, 2) == 0) {

-                                        $uom = get_option('geodir_search_dist_2');

-                                        $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

-                                        if ($uom == 'feet') {

-                                            $uom = __('feet', 'geodirectory');

-                                        } else {

-                                            $uom = __('meters', 'geodirectory');

-                                        }

-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '

+									if (round($distance, 2) == 0) {

+										$uom = get_option('geodir_search_dist_2');

+										$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

+										if ($uom == 'feet') {

+											$uom = __('feet', 'geodirectory');

+										} else {

+											$uom = __('meters', 'geodirectory');

+										}

+										echo round($distance) . ' ' . __($uom, 'geodirectory') . '

 			<br />

 			';

-                                    } else {

-                                        if ($uom == 'miles') {

-                                            $uom = __('miles', 'geodirectory');

-                                        } else {

-                                            $uom = __('km', 'geodirectory');

-                                        }

-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '

+									} else {

+										if ($uom == 'miles') {

+											$uom = __('miles', 'geodirectory');

+										} else {

+											$uom = __('km', 'geodirectory');

+										}

+										echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '

 			<br />

 			';

-                                    }

-                                    ?>

+									}

+									?>

                                 </h3>

                             <?php } ?>

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_before_listing_post_excerpt', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_before_listing_post_excerpt', $post); ?>

                             <?php echo geodir_show_listing_info('listing'); ?>

                             <?php if (isset($character_count) && $character_count == '0') {

-                            } else { ?>

+							} else { ?>

                                 <div class="geodir-entry-content">

                                     <?php

-                                    /**

-                                     * Filter to hide the listing excerpt

-                                     *

-                                     * @since 1.5.3

-                                     * @param bool $display Display the excerpt or not. Default true.

-                                     * @param object $post The post object.

-                                     */

-                                    $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);

-                                    if ($show_listing_excerpt) {

-                                        if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                            $content_out = geodir_max_excerpt( $character_count );

-                                        } else {

-                                            $content_out = get_the_excerpt();

-                                        }

-                                        if ( ! empty( $content_out ) ) {

-                                            echo "<p>" . $content_out . "</p>";

-                                        }

-                                    }

-                                    ?>

+									/**

+									 * Filter to hide the listing excerpt

+									 *

+									 * @since 1.5.3

+									 * @param bool $display Display the excerpt or not. Default true.

+									 * @param object $post The post object.

+									 */

+									$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);

+									if ($show_listing_excerpt) {

+										if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

+											$content_out = geodir_max_excerpt( $character_count );

+										} else {

+											$content_out = get_the_excerpt();

+										}

+										if ( ! empty( $content_out ) ) {

+											echo "<p>" . $content_out . "</p>";

+										}

+									}

+									?>

                                 </div>

                             <?php } ?>

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_after_listing_post_excerpt', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_after_listing_post_excerpt', $post); ?>

                         </div>

                         <!-- gd-content ends here-->

                         <?php

-                        /**

-                         * Called after printing listing content.

-                         *

-                         * @since 1.5.3

-                         * @param object $post The post object.

-                         * @param string $view The view type, default 'widget'.

-                         */

-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>

+						/**

+						 * Called after printing listing content.

+						 *

+						 * @since 1.5.3

+						 * @param object $post The post object.

+						 * @param string $view The view type, default 'widget'.

+						 */

+						do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">

                                 <?php

-                                /**

-                                 * Called before printing review stars html.

-                                 *

-                                 * @since 1.5.3

-                                 * @param object $post The post object.

-                                 * @param string $view The view type, default 'widget'.

-                                 */

-                                do_action( 'geodir_before_review_html', $post, 'widget' );

-                                $review_show = geodir_is_reviews_show('listview');

-                                if ($review_show) {

+								/**

+								 * Called before printing review stars html.

+								 *

+								 * @since 1.5.3

+								 * @param object $post The post object.

+								 * @param string $view The view type, default 'widget'.

+								 */

+								do_action( 'geodir_before_review_html', $post, 'widget' );

+								$review_show = geodir_is_reviews_show('listview');

+								if ($review_show) {

 

-                                    $post_avgratings = geodir_get_post_rating($post->ID);

+									$post_avgratings = geodir_get_post_rating($post->ID);

 

-                                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                                    do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+									/** This action is documented in geodirectory-templates/listing-listview.php */

+									do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

 

-                                    echo geodir_get_rating_stars($post_avgratings, $post->ID);

+									echo geodir_get_rating_stars($post_avgratings, $post->ID);

 

-                                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                                    do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

-                                    ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i

+									/** This action is documented in geodirectory-templates/listing-listview.php */

+									do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+									?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i

                                         class="fa fa-comments"></i> <?php geodir_comments_number($post->rating_count); ?>

                                     </a>

                                 <?php

-                                }

+								}

 

 

-                                /**

-                                 * Called after printing favorite html.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );

+								/**

+								 * Called after printing favorite html.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );

 

-                                if ($post->post_author == get_current_user_id()) {

-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());

-                                    $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

-                                    $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

+								if ($post->post_author == get_current_user_id()) {

+									$addplacelink = get_permalink(geodir_add_listing_page_id());

+									$editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

+									$upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

 

-                                    $ajaxlink = geodir_get_ajax_url();

-                                    $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

-                                    ?>

+									$ajaxlink = geodir_get_ajax_url();

+									$deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

+									?>

                                     <span class="geodir-authorlink clearfix">

                                 <?php

-                if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

-                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                    do_action('geodir_before_edit_post_link_on_listing');

-                    ?>

+				if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

+					/** This action is documented in geodirectory-templates/listing-listview.php */

+					do_action('geodir_before_edit_post_link_on_listing');

+					?>

                     <a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"

                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                         <?php

-                        $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

-                        ?>

+						$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

+						echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+						?>

                         <?php _e('Edit', 'geodirectory'); ?>

                     </a>

                     <a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"

                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                         <?php

-                        $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

-                        ?>

+						$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

+						echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+						?>

                         <?php _e('Delete', 'geodirectory'); ?>

                     </a>

                     <?php

-                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                    do_action('geodir_after_edit_post_link_on_listing');

-                } ?>

+					/** This action is documented in geodirectory-templates/listing-listview.php */

+					do_action('geodir_after_edit_post_link_on_listing');

+				} ?>

 					</span>

                                 <?php } ?>

                             </div>

@@ -255,17 +255,17 @@ 
                     </article>

                 </li>

                 <?php

-                unset($gd_widget_listing_type);

-            }

-            /** This action is documented in geodirectory-templates/listing-listview.php */

-            do_action('geodir_after_listing_post_listview');

-        } else {

+				unset($gd_widget_listing_type);

+			}

+			/** This action is documented in geodirectory-templates/listing-listview.php */

+			do_action('geodir_after_listing_post_listview');

+		} else {

 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

             

 			/** This action is documented in geodirectory-templates/listing-listview.php */

-            do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);

-        }

-        ?>

+			do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);

+		}

+		?>

     </ul>  <!-- geodir_category_list_view ends here-->

     <div class="clear"></div>

 <?php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
             /** This action is documented in geodirectory-templates/listing-listview.php */

             do_action('geodir_before_listing_post_listview');

             $all_postypes = geodir_get_posttypes();

-            $geodir_days_new = (int)get_option('geodir_listing_new_days');

+            $geodir_days_new = (int) get_option('geodir_listing_new_days');

             foreach ($widget_listings as $widget_listing) {

                 global $gd_widget_listing_type;

                 $post = $widget_listing;

@@ -46,7 +46,7 @@ 
                 $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

                 ?>

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

+                    echo 'geodir-gridview '.$grid_view_class;

                 } else {

                     echo ' geodir-listview ';

                 } ?> <?php if ($post_view_class) {

@@ -116,7 +116,7 @@ 
                                         } else {

                                             $uom = __('meters', 'geodirectory');

                                         }

-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '

+                                        echo round($distance).' '.__($uom, 'geodirectory').'

 			<br />

 			';

                                     } else {

@@ -125,7 +125,7 @@ 
                                         } else {

                                             $uom = __('km', 'geodirectory');

                                         }

-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '

+                                        echo round($distance, 2).' '.__($uom, 'geodirectory').'

 			<br />

 			';

                                     }

@@ -149,13 +149,13 @@ 
                                      */

                                     $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);

                                     if ($show_listing_excerpt) {

-                                        if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                            $content_out = geodir_max_excerpt( $character_count );

+                                        if (isset($character_count) && ($character_count || $character_count == '0')) {

+                                            $content_out = geodir_max_excerpt($character_count);

                                         } else {

                                             $content_out = get_the_excerpt();

                                         }

-                                        if ( ! empty( $content_out ) ) {

-                                            echo "<p>" . $content_out . "</p>";

+                                        if (!empty($content_out)) {

+                                            echo "<p>".$content_out."</p>";

                                         }

                                     }

                                     ?>

@@ -174,7 +174,7 @@ 
                          * @param object $post The post object.

                          * @param string $view The view type, default 'widget'.

                          */

-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>

+                        do_action('geodir_after_listing_content', $post, 'widget'); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">

                                 <?php

@@ -185,7 +185,7 @@ 
                                  * @param object $post The post object.

                                  * @param string $view The view type, default 'widget'.

                                  */

-                                do_action( 'geodir_before_review_html', $post, 'widget' );

+                                do_action('geodir_before_review_html', $post, 'widget');

                                 $review_show = geodir_is_reviews_show('listview');

                                 if ($review_show) {

 

@@ -210,7 +210,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );

+                                do_action('geodir_after_favorite_html', $post->ID, 'widget');

 

                                 if ($post->post_author == get_current_user_id()) {

                                     $addplacelink = get_permalink(geodir_add_listing_page_id());

@@ -230,7 +230,7 @@ 
                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                         <?php

                         $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                        echo '<i class="'.$geodir_listing_edit_icon.'"></i>';

                         ?>

                         <?php _e('Edit', 'geodirectory'); ?>

                     </a>

@@ -238,7 +238,7 @@ 
                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                         <?php

                         $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                        echo '<i class="'.$geodir_listing_delete_icon.'"></i>';

                         ?>

                         <?php _e('Delete', 'geodirectory'); ?>

                     </a>

tests/lib/wordpress-tests-lib/includes/factory.php

Doc Comments +25 added lines

@@ -64,6 +64,9 @@ 
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -127,6 +130,9 @@ 
 
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -152,6 +158,9 @@ 
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -183,6 +192,9 @@ 
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		global $current_site, $base;
 		parent::__construct( $factory );
@@ -219,6 +231,9 @@ 
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -255,6 +270,10 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 * @param string $taxonomy
+	 */
 	function __construct( $factory = null, $taxonomy = null ) {
 		parent::__construct( $factory );
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
@@ -342,6 +361,9 @@ 
 
 	abstract function get_object_by_id( $object_id );
 
+	/**
+	 * @param integer $count
+	 */
 	function create_many( $count, $args = array(), $generation_definitions = null ) {
 		$results = array();
 		for ( $i = 0; $i < $count; $i++ ) {
@@ -405,6 +427,9 @@ 
 	public $next;
 	public $template_string;
 
+	/**
+	 * @param integer $start
+	 */
 	function __construct( $template_string = '%s', $start = null ) {
 		if ( $start ) {
 			$this->next = $start;

Braces +29 added lines, -21 removed lines

@@ -104,8 +104,9 @@ 
 			$type = $upload['type'];
 		} else {
 			$mime = wp_check_filetype( $upload['file'] );
-			if ($mime)
-				$type = $mime['type'];
+			if ($mime) {
+							$type = $mime['type'];
+			}
 		}
 
 		$attachment = array(
@@ -268,15 +269,17 @@ 
 	function create_object( $args ) {
 		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
 		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) )
-			return $term_id_pair;
+		if ( is_wp_error( $term_id_pair ) ) {
+					return $term_id_pair;
+		}
 		return $term_id_pair['term_id'];
 	}
 
 	function update_object( $term, $fields ) {
 		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) )
-			$taxonomy = $term->taxonomy;
+		if ( is_object( $term ) ) {
+					$taxonomy = $term->taxonomy;
+		}
 		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
 		return $term_id_pair['term_id'];
 	}
@@ -318,19 +321,22 @@ 
 	abstract function update_object( $object, $fields );
 
 	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) )
-			$generation_definitions = $this->default_generation_definitions;
+		if ( is_null( $generation_definitions ) ) {
+					$generation_definitions = $this->default_generation_definitions;
+		}
 
 		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
 		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) )
-			return $created;
+		if ( !$created || is_wp_error( $created ) ) {
+					return $created;
+		}
 
 		if ( $callbacks ) {
 			$updated_fields = $this->apply_callbacks( $callbacks, $created );
 			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) )
-				return $save_result;
+			if ( !$save_result || is_wp_error( $save_result ) ) {
+							return $save_result;
+			}
 		}
 		return $created;
 	}
@@ -352,20 +358,22 @@ 
 
 	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) )
-			$generation_definitions = $this->default_generation_definitions;
+		if ( is_null( $generation_definitions ) ) {
+					$generation_definitions = $this->default_generation_definitions;
+		}
 
 		foreach( array_keys( $generation_definitions ) as $field_name ) {
 			if ( !isset( $args[$field_name] ) ) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) )
-					$args[$field_name] = $generator;
-				elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				if ( is_scalar( $generator ) ) {
+									$args[$field_name] = $generator;
+				} elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) )
-					$args[$field_name] = $generator->next();
-				else
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+				} elseif ( is_object( $generator ) ) {
+									$args[$field_name] = $generator->next();
+				} else {
+									return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+				}
 			}
 		}
 		return $args;

Spacing +143 added lines, -143 removed lines

@@ -48,78 +48,78 @@ 
 	public $network;
 
 	function __construct() {
-		$this->post = new WP_UnitTest_Factory_For_Post( $this );
-		$this->attachment = new WP_UnitTest_Factory_For_Attachment( $this );
-		$this->comment = new WP_UnitTest_Factory_For_Comment( $this );
-		$this->user = new WP_UnitTest_Factory_For_User( $this );
-		$this->term = new WP_UnitTest_Factory_For_Term( $this );
-		$this->category = new WP_UnitTest_Factory_For_Term( $this, 'category' );
-		$this->tag = new WP_UnitTest_Factory_For_Term( $this, 'post_tag' );
-		if ( is_multisite() ) {
-			$this->blog = new WP_UnitTest_Factory_For_Blog( $this );
-			$this->network = new WP_UnitTest_Factory_For_Network( $this );
+		$this->post = new WP_UnitTest_Factory_For_Post($this);
+		$this->attachment = new WP_UnitTest_Factory_For_Attachment($this);
+		$this->comment = new WP_UnitTest_Factory_For_Comment($this);
+		$this->user = new WP_UnitTest_Factory_For_User($this);
+		$this->term = new WP_UnitTest_Factory_For_Term($this);
+		$this->category = new WP_UnitTest_Factory_For_Term($this, 'category');
+		$this->tag = new WP_UnitTest_Factory_For_Term($this, 'post_tag');
+		if (is_multisite()) {
+			$this->blog = new WP_UnitTest_Factory_For_Blog($this);
+			$this->network = new WP_UnitTest_Factory_For_Network($this);
 		}
 	}
 }
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'post_status' => 'publish',
-			'post_title' => new WP_UnitTest_Generator_Sequence( 'Post title %s' ),
-			'post_content' => new WP_UnitTest_Generator_Sequence( 'Post content %s' ),
-			'post_excerpt' => new WP_UnitTest_Generator_Sequence( 'Post excerpt %s' ),
+			'post_title' => new WP_UnitTest_Generator_Sequence('Post title %s'),
+			'post_content' => new WP_UnitTest_Generator_Sequence('Post content %s'),
+			'post_excerpt' => new WP_UnitTest_Generator_Sequence('Post excerpt %s'),
 			'post_type' => 'post'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_post( $args );
+	function create_object($args) {
+		return wp_insert_post($args);
 	}
 
-	function update_object( $post_id, $fields ) {
+	function update_object($post_id, $fields) {
 		$fields['ID'] = $post_id;
-		return wp_update_post( $fields );
+		return wp_update_post($fields);
 	}
 
-	function get_object_by_id( $post_id ) {
-		return get_post( $post_id );
+	function get_object_by_id($post_id) {
+		return get_post($post_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
 
-	function create_object( $file, $parent = 0, $args = array() ) {
-		return wp_insert_attachment( $args, $file, $parent );
+	function create_object($file, $parent = 0, $args = array()) {
+		return wp_insert_attachment($args, $file, $parent);
 	}
 
-	function create_upload_object( $file, $parent = 0 ) {
+	function create_upload_object($file, $parent = 0) {
 		$contents = file_get_contents($file);
 		$upload = wp_upload_bits(basename($file), null, $contents);
 
 		$type = '';
-		if ( ! empty($upload['type']) ) {
+		if (!empty($upload['type'])) {
 			$type = $upload['type'];
 		} else {
-			$mime = wp_check_filetype( $upload['file'] );
+			$mime = wp_check_filetype($upload['file']);
 			if ($mime)
 				$type = $mime['type'];
 		}
 
 		$attachment = array(
-			'post_title' => basename( $upload['file'] ),
+			'post_title' => basename($upload['file']),
 			'post_content' => '',
 			'post_type' => 'attachment',
 			'post_parent' => $parent,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ],
+			'guid' => $upload['url'],
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$id = wp_insert_attachment($attachment, $upload['file'], $parent);
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $upload['file']));
 
 		return $id;
 	}
@@ -127,126 +127,126 @@ 
 
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'user_login' => new WP_UnitTest_Generator_Sequence( 'User %s' ),
+			'user_login' => new WP_UnitTest_Generator_Sequence('User %s'),
 			'user_pass' => 'password',
-			'user_email' => new WP_UnitTest_Generator_Sequence( 'user_%s@example.org' ),
+			'user_email' => new WP_UnitTest_Generator_Sequence('user_%s@example.org'),
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_user( $args );
+	function create_object($args) {
+		return wp_insert_user($args);
 	}
 
-	function update_object( $user_id, $fields ) {
+	function update_object($user_id, $fields) {
 		$fields['ID'] = $user_id;
-		return wp_update_user( $fields );
+		return wp_update_user($fields);
 	}
 
-	function get_object_by_id( $user_id ) {
-		return new WP_User( $user_id );
+	function get_object_by_id($user_id) {
+		return new WP_User($user_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
-			'comment_author_url' => new WP_UnitTest_Generator_Sequence( 'http://example.com/%s/' ),
+			'comment_author' => new WP_UnitTest_Generator_Sequence('Commenter %s'),
+			'comment_author_url' => new WP_UnitTest_Generator_Sequence('http://example.com/%s/'),
 			'comment_approved' => 1,
 			'comment_content' => 'This is a comment'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_comment( $this->addslashes_deep( $args ) );
+	function create_object($args) {
+		return wp_insert_comment($this->addslashes_deep($args));
 	}
 
-	function update_object( $comment_id, $fields ) {
+	function update_object($comment_id, $fields) {
 		$fields['comment_ID'] = $comment_id;
-		return wp_update_comment( $this->addslashes_deep( $fields ) );
+		return wp_update_comment($this->addslashes_deep($fields));
 	}
 
-	function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
+	function create_post_comments($post_id, $count = 1, $args = array(), $generation_definitions = null) {
 		$args['comment_post_ID'] = $post_id;
-		return $this->create_many( $count, $args, $generation_definitions );
+		return $this->create_many($count, $args, $generation_definitions);
 	}
 
-	function get_object_by_id( $comment_id ) {
-		return get_comment( $comment_id );
+	function get_object_by_id($comment_id) {
+		return get_comment($comment_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
+	function __construct($factory = null) {
 		global $current_site, $base;
-		parent::__construct( $factory );
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => $current_site->domain,
-			'path' => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
-			'title' => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
+			'path' => new WP_UnitTest_Generator_Sequence($base.'testpath%s'),
+			'title' => new WP_UnitTest_Generator_Sequence('Site %s'),
 			'site_id' => $current_site->id,
 		);
 	}
 
-	function create_object( $args ) {
+	function create_object($args) {
 		global $wpdb;
-		$meta = isset( $args['meta'] ) ? $args['meta'] : array();
-		$user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
+		$meta = isset($args['meta']) ? $args['meta'] : array();
+		$user_id = isset($args['user_id']) ? $args['user_id'] : get_current_user_id();
 		// temp tables will trigger db errors when we attempt to reference them as new temp tables
 		$suppress = $wpdb->suppress_errors();
-		$blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
-		$wpdb->suppress_errors( $suppress );
+		$blog = wpmu_create_blog($args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id']);
+		$wpdb->suppress_errors($suppress);
 
 		// Tell WP we're done installing.
-		wp_installing( false );
+		wp_installing(false);
 
 		return $blog;
 	}
 
-	function update_object( $blog_id, $fields ) {}
+	function update_object($blog_id, $fields) {}
 
-	function get_object_by_id( $blog_id ) {
-		return get_blog_details( $blog_id, false );
+	function get_object_by_id($blog_id) {
+		return get_blog_details($blog_id, false);
 	}
 }
 
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => WP_TESTS_DOMAIN,
-			'title' => new WP_UnitTest_Generator_Sequence( 'Network %s' ),
-			'path' => new WP_UnitTest_Generator_Sequence( '/testpath%s/' ),
-			'network_id' => new WP_UnitTest_Generator_Sequence( '%s', 2 ),
+			'title' => new WP_UnitTest_Generator_Sequence('Network %s'),
+			'path' => new WP_UnitTest_Generator_Sequence('/testpath%s/'),
+			'network_id' => new WP_UnitTest_Generator_Sequence('%s', 2),
 			'subdomain_install' => false,
 		);
 	}
 
-	function create_object( $args ) {
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+	function create_object($args) {
+		require_once ABSPATH.'wp-admin/includes/upgrade.php';
 
-		if ( ! isset( $args['user'] ) ) {
+		if (!isset($args['user'])) {
 			$email = WP_TESTS_EMAIL;
 		} else {
-			$email = get_userdata( $args['user'] )->user_email;
+			$email = get_userdata($args['user'])->user_email;
 		}
 
-		populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
+		populate_network($args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install']);
 		return $args['network_id'];
 	}
 
-	function update_object( $network_id, $fields ) {}
+	function update_object($network_id, $fields) {}
 
-	function get_object_by_id( $network_id ) {
-		return wp_get_network( $network_id );
+	function get_object_by_id($network_id) {
+		return wp_get_network($network_id);
 	}
 }
 
@@ -255,44 +255,44 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
-	function __construct( $factory = null, $taxonomy = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null, $taxonomy = null) {
+		parent::__construct($factory);
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
 		$this->default_generation_definitions = array(
-			'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
+			'name' => new WP_UnitTest_Generator_Sequence('Term %s'),
 			'taxonomy' => $this->taxonomy,
-			'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
+			'description' => new WP_UnitTest_Generator_Sequence('Term description %s'),
 		);
 	}
 
-	function create_object( $args ) {
-		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
-		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) )
+	function create_object($args) {
+		$args = array_merge(array('taxonomy' => $this->taxonomy), $args);
+		$term_id_pair = wp_insert_term($args['name'], $args['taxonomy'], $args);
+		if (is_wp_error($term_id_pair))
 			return $term_id_pair;
 		return $term_id_pair['term_id'];
 	}
 
-	function update_object( $term, $fields ) {
-		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) )
+	function update_object($term, $fields) {
+		$fields = array_merge(array('taxonomy' => $this->taxonomy), $fields);
+		if (is_object($term))
 			$taxonomy = $term->taxonomy;
-		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
+		$term_id_pair = wp_update_term($term, $taxonomy, $fields);
 		return $term_id_pair['term_id'];
 	}
 
-	function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
-		return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
+	function add_post_terms($post_id, $terms, $taxonomy, $append = true) {
+		return wp_set_post_terms($post_id, $terms, $taxonomy, $append);
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$term_id = $this->create( $args, $generation_definitions );
-		$taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
-		return get_term( $term_id, $taxonomy );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$term_id = $this->create($args, $generation_definitions);
+		$taxonomy = isset($args['taxonomy']) ? $args['taxonomy'] : $this->taxonomy;
+		return get_term($term_id, $taxonomy);
 	}
 
-	function get_object_by_id( $term_id ) {
-		return get_term( $term_id, $this->taxonomy );
+	function get_object_by_id($term_id) {
+		return get_term($term_id, $this->taxonomy);
 	}
 }
 
@@ -309,90 +309,90 @@ 
 	 * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
 	 * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
 	 */
-	function __construct( $factory, $default_generation_definitions = array() ) {
+	function __construct($factory, $default_generation_definitions = array()) {
 		$this->factory = $factory;
 		$this->default_generation_definitions = $default_generation_definitions;
 	}
 
-	abstract function create_object( $args );
-	abstract function update_object( $object, $fields );
+	abstract function create_object($args);
+	abstract function update_object($object, $fields);
 
-	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) )
+	function create($args = array(), $generation_definitions = null) {
+		if (is_null($generation_definitions))
 			$generation_definitions = $this->default_generation_definitions;
 
-		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
-		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) )
+		$generated_args = $this->generate_args($args, $generation_definitions, $callbacks);
+		$created = $this->create_object($generated_args);
+		if (!$created || is_wp_error($created))
 			return $created;
 
-		if ( $callbacks ) {
-			$updated_fields = $this->apply_callbacks( $callbacks, $created );
-			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) )
+		if ($callbacks) {
+			$updated_fields = $this->apply_callbacks($callbacks, $created);
+			$save_result = $this->update_object($created, $updated_fields);
+			if (!$save_result || is_wp_error($save_result))
 				return $save_result;
 		}
 		return $created;
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$object_id = $this->create( $args, $generation_definitions );
-		return $this->get_object_by_id( $object_id );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$object_id = $this->create($args, $generation_definitions);
+		return $this->get_object_by_id($object_id);
 	}
 
-	abstract function get_object_by_id( $object_id );
+	abstract function get_object_by_id($object_id);
 
-	function create_many( $count, $args = array(), $generation_definitions = null ) {
+	function create_many($count, $args = array(), $generation_definitions = null) {
 		$results = array();
-		for ( $i = 0; $i < $count; $i++ ) {
-			$results[] = $this->create( $args, $generation_definitions );
+		for ($i = 0; $i < $count; $i++) {
+			$results[] = $this->create($args, $generation_definitions);
 		}
 		return $results;
 	}
 
-	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
+	function generate_args($args = array(), $generation_definitions = null, &$callbacks = null) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) )
+		if (is_null($generation_definitions))
 			$generation_definitions = $this->default_generation_definitions;
 
-		foreach( array_keys( $generation_definitions ) as $field_name ) {
-			if ( !isset( $args[$field_name] ) ) {
+		foreach (array_keys($generation_definitions) as $field_name) {
+			if (!isset($args[$field_name])) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) )
+				if (is_scalar($generator))
 					$args[$field_name] = $generator;
-				elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				elseif (is_object($generator) && method_exists($generator, 'call')) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) )
+				} elseif (is_object($generator))
 					$args[$field_name] = $generator->next();
 				else
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+					return new WP_Error('invalid_argument', 'Factory default value should be either a scalar or an generator object.');
 			}
 		}
 		return $args;
 	}
 
-	function apply_callbacks( $callbacks, $created ) {
+	function apply_callbacks($callbacks, $created) {
 		$updated_fields = array();
-		foreach( $callbacks as $field_name => $generator ) {
-			$updated_fields[$field_name] = $generator->call( $created );
+		foreach ($callbacks as $field_name => $generator) {
+			$updated_fields[$field_name] = $generator->call($created);
 		}
 		return $updated_fields;
 	}
 
-	function callback( $function ) {
-		return new WP_UnitTest_Factory_Callback_After_Create( $function );
+	function callback($function) {
+		return new WP_UnitTest_Factory_Callback_After_Create($function);
 	}
 
 	function addslashes_deep($value) {
-		if ( is_array( $value ) ) {
-			$value = array_map( array( $this, 'addslashes_deep' ), $value );
-		} elseif ( is_object( $value ) ) {
-			$vars = get_object_vars( $value );
+		if (is_array($value)) {
+			$value = array_map(array($this, 'addslashes_deep'), $value);
+		} elseif (is_object($value)) {
+			$vars = get_object_vars($value);
 			foreach ($vars as $key=>$data) {
-				$value->{$key} = $this->addslashes_deep( $data );
+				$value->{$key} = $this->addslashes_deep($data);
 			}
-		} elseif ( is_string( $value ) ) {
-			$value = addslashes( $value );
+		} elseif (is_string($value)) {
+			$value = addslashes($value);
 		}
 
 		return $value;
@@ -405,8 +405,8 @@ 
 	public $next;
 	public $template_string;
 
-	function __construct( $template_string = '%s', $start = null ) {
-		if ( $start ) {
+	function __construct($template_string = '%s', $start = null) {
+		if ($start) {
 			$this->next = $start;
 		} else {
 			self::$incr++;
@@ -416,7 +416,7 @@ 
 	}
 
 	function next() {
-		$generated = sprintf( $this->template_string , $this->next );
+		$generated = sprintf($this->template_string, $this->next);
 		$this->next++;
 		return $generated;
 	}
@@ -425,11 +425,11 @@ 
 class WP_UnitTest_Factory_Callback_After_Create {
 	var $callback;
 
-	function __construct( $callback ) {
+	function __construct($callback) {
 		$this->callback = $callback;
 	}
 
-	function call( $object ) {
-		return call_user_func( $this->callback, $object );
+	function call($object) {
+		return call_user_func($this->callback, $object);
 	}
 }

tests/lib/wordpress-tests-lib/includes/functions.php

Doc Comments +6 added lines

@@ -10,6 +10,9 @@ 
 	return true;
 }
 
+/**
+ * @param integer $priority
+ */
 function _test_filter_build_unique_id($tag, $function, $priority) {
 	global $wp_filter;
 	static $filter_id_count = 0;
@@ -92,6 +95,9 @@ 
 	return '_wp_die_handler';
 }
 
+/**
+ * @param string $title
+ */
 function _wp_die_handler_txt( $message, $title, $args ) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";

Braces +6 added lines, -4 removed lines

@@ -14,8 +14,9 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
-		return $function;
+	if ( is_string($function) ) {
+			return $function;
+	}
 
 	if ( is_object($function) ) {
 		// Closures are currently implemented as objects
@@ -37,8 +38,9 @@ 
 
 	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
 	if ($all_posts) {
-		foreach ($all_posts as $id)
-			wp_delete_post( $id, true );
+		foreach ($all_posts as $id) {
+					wp_delete_post( $id, true );
+		}
 	}
 }
 

Spacing +23 added lines, -23 removed lines

@@ -6,7 +6,7 @@ 
 
 	$idx = _test_filter_build_unique_id($tag, $function_to_add, $priority);
 	$wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 	return true;
 }
 
@@ -14,19 +14,19 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if (is_string($function))
 		return $function;
 
-	if ( is_object($function) ) {
+	if (is_object($function)) {
 		// Closures are currently implemented as objects
-		$function = array( $function, '' );
+		$function = array($function, '');
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
-		return spl_object_hash($function[0]) . $function[1];
-	} else if ( is_string($function[0]) ) {
+	if (is_object($function[0])) {
+		return spl_object_hash($function[0]).$function[1];
+	} else if (is_string($function[0])) {
 		// Static Calling
 		return $function[0].$function[1];
 	}
@@ -38,31 +38,31 @@ 
 	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
 	if ($all_posts) {
 		foreach ($all_posts as $id)
-			wp_delete_post( $id, true );
+			wp_delete_post($id, true);
 	}
 }
 
 class Basic_Object {
 	private $foo = 'bar';
 
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->{$name};
 	}
 
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		return $this->{$name} = $value;
 	}
 
-	public function __isset( $name ) {
-		return isset( $this->{$name} );
+	public function __isset($name) {
+		return isset($this->{$name} );
 	}
 
-	public function __unset( $name ) {
-		unset( $this->{$name} );
+	public function __unset($name) {
+		unset($this->{$name} );
 	}
 
-	public function __call( $name, $arguments ) {
-		return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		return call_user_func_array(array($this, $name), $arguments);
 	}
 
 	private function callMe() {
@@ -72,9 +72,9 @@ 
 
 class Basic_Subclass extends Basic_Object {}
 
-function _wp_die_handler( $message, $title = '', $args = array() ) {
-	if ( !$GLOBALS['_wp_die_disabled'] ) {
-		_wp_die_handler_txt( $message, $title, $args);
+function _wp_die_handler($message, $title = '', $args = array()) {
+	if (!$GLOBALS['_wp_die_disabled']) {
+		_wp_die_handler_txt($message, $title, $args);
 	} else {
 		//Ignore at our peril
 	}
@@ -92,13 +92,13 @@ 
 	return '_wp_die_handler';
 }
 
-function _wp_die_handler_txt( $message, $title, $args ) {
+function _wp_die_handler_txt($message, $title, $args) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";
 	echo "Title : $title\n";
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		echo "Args: \n";
-		foreach( $args as $k => $v ){
+		foreach ($args as $k => $v) {
 			echo "\t $k : $v\n";
 		}
 	}
@@ -113,5 +113,5 @@ 
  * @since 4.2.0
  */
 function _set_default_permalink_structure_for_tests() {
-	update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+	update_option('permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
 }