GeoDirectory / geodirectory

geodirectory-functions/compatibility/Genesis.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 
     if ($remove_class) {
         $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
-        if ( $new_class == 'content' ) {
+        if ($new_class == 'content') {
             $new_class = 'content-no-sidebar';
             $classes[] = 'full-width-content';
         }

Indentation +171 added lines, -171 removed lines

@@ -17,26 +17,26 @@ 
 function gd_compat_php_genesis()
 {
 // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS
-    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_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);
 
 
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
 
 
 }
@@ -53,25 +53,25 @@ 
 function gd_genesis_compat_left_sidebars()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('home')) {
-        remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
-    } elseif (geodir_is_page('location')) {
-        remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
-    } elseif (geodir_is_page('listing')) {
-        remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11);
-    } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) {
-        //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 );
-        //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 );
-    } elseif (geodir_is_page('search')) {
-        remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11);
-    } elseif (geodir_is_page('author')) {
-        remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11);
-    }
+	if (is_page_geodir_home() || geodir_is_page('home')) {
+		remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
+	} elseif (geodir_is_page('location')) {
+		remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
+	} elseif (geodir_is_page('listing')) {
+		remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11);
+	} elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) {
+		//remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 );
+		//add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 );
+	} elseif (geodir_is_page('search')) {
+		remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11);
+	} elseif (geodir_is_page('author')) {
+		remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11);
+	}
 
 
 }
@@ -88,68 +88,68 @@ 
  */
 function geodir_set_body_scs($classes)
 {
-    $remove_class = false;
-    $new_class = '';
-    if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) {
-        $remove_class = true;
-        if (get_option('geodir_show_home_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        if (get_option('geodir_show_home_contant_section')) {
-            $new_class .= 'content';
-        }
-        if (get_option('geodir_show_home_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('listing')) {
-        $remove_class = true;
-        if (get_option('geodir_show_listing_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_listing_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('detail')) {
-        $remove_class = true;
-        if (get_option('geodir_detail_sidebar_left_section')) {
-            $new_class .= 'sidebar-content gd-details-sidebar-left';
-        } else {
-            $new_class .= 'content-sidebar';
-        }
-    } elseif (geodir_is_page('search')) {
-        $remove_class = true;
-        if (get_option('geodir_show_search_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_search_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('author')) {
-        $remove_class = true;
-        if (get_option('geodir_show_author_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_author_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('add-listing')) {
-        $remove_class = true;
-        $new_class .= 'content-sidebar';
-    }
-
-    if ($remove_class) {
-        $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
-        if ( $new_class == 'content' ) {
-            $new_class = 'content-no-sidebar';
-            $classes[] = 'full-width-content';
-        }
-        $classes[] = $new_class;
-    }
-
-    return $classes;
+	$remove_class = false;
+	$new_class = '';
+	if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) {
+		$remove_class = true;
+		if (get_option('geodir_show_home_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		if (get_option('geodir_show_home_contant_section')) {
+			$new_class .= 'content';
+		}
+		if (get_option('geodir_show_home_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('listing')) {
+		$remove_class = true;
+		if (get_option('geodir_show_listing_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_listing_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('detail')) {
+		$remove_class = true;
+		if (get_option('geodir_detail_sidebar_left_section')) {
+			$new_class .= 'sidebar-content gd-details-sidebar-left';
+		} else {
+			$new_class .= 'content-sidebar';
+		}
+	} elseif (geodir_is_page('search')) {
+		$remove_class = true;
+		if (get_option('geodir_show_search_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_search_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('author')) {
+		$remove_class = true;
+		if (get_option('geodir_show_author_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_author_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('add-listing')) {
+		$remove_class = true;
+		$new_class .= 'content-sidebar';
+	}
+
+	if ($remove_class) {
+		$classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
+		if ( $new_class == 'content' ) {
+			$new_class = 'content-no-sidebar';
+			$classes[] = 'full-width-content';
+		}
+		$classes[] = $new_class;
+	}
+
+	return $classes;
 }
 
 add_action('genesis_after_header', 'gd_genesis_compat_add_top_section_back', 11);
@@ -162,17 +162,17 @@ 
 function gd_genesis_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 
 
 }
@@ -185,12 +185,12 @@ 
  */
 function geodir_replace_breadcrumb()
 {
-    if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) {
-    } else {
-        echo '<div class="geodir-breadcrumb-bar"><div class="wrap">';
-        geodir_breadcrumb();
-        echo '</div></div>';
-    }
+	if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) {
+	} else {
+		echo '<div class="geodir-breadcrumb-bar"><div class="wrap">';
+		geodir_breadcrumb();
+		echo '</div></div>';
+	}
 }
 
 // Force Full Width on signup page
@@ -203,9 +203,9 @@ 
  */
 function geodir_genesis_meta()
 {
-    if (geodir_is_page('login')) {
-        add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content');
-    }
+	if (geodir_is_page('login')) {
+		add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content');
+	}
 }
 
 add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8);
@@ -218,7 +218,7 @@ 
 function geodir_add_listing_page_title_genesis_before()
 {
 
-    echo "<div class='entry' >";
+	echo "<div class='entry' >";
 }
 
 
@@ -232,7 +232,7 @@ 
 function geodir_add_listing_form_genesis_after()
 {
 
-    echo "</div>";
+	echo "</div>";
 }
 
 
@@ -251,38 +251,38 @@ 
 {
 
 
-    $title = '';
-    $subtitle = '';
-
-    if (geodir_is_page('listing')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_listings_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('add-listing')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_add_listing_page_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('author')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_author_page_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        echo '<div class="wrap gd-title-wrap">';
-        echo get_the_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('search')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_search_page_title();
-        echo '</div>';
-    }
+	$title = '';
+	$subtitle = '';
+
+	if (geodir_is_page('listing')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_listings_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('add-listing')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_add_listing_page_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('author')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_author_page_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('detail') || geodir_is_page('preview')) {
+		echo '<div class="wrap gd-title-wrap">';
+		echo get_the_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('search')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_search_page_title();
+		echo '</div>';
+	}
 }
 
 
@@ -295,8 +295,8 @@ 
  */
 function gd_genesis_listing_page_title_bar()
 {
-    geodir_action_listings_title();
-    //geodir_action_listings_description();
+	geodir_action_listings_title();
+	//geodir_action_listings_description();
 }
 
 
@@ -309,19 +309,19 @@ 
  */
 function gd_compat_php_genesis_geo_1280_fix()
 {
-    if (function_exists('geo1280_search_bar')) {
-        remove_action('genesis_after_header', 'geo1280_search_bar', 20);
-        add_action('genesis_after_header', 'geo1280_search_bar_fix', 4);
+	if (function_exists('geo1280_search_bar')) {
+		remove_action('genesis_after_header', 'geo1280_search_bar', 20);
+		add_action('genesis_after_header', 'geo1280_search_bar_fix', 4);
 
-        //
+		//
 
-        remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20);
-        remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20);
-        add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105);
+		remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20);
+		remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20);
+		add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105);
 
-        remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10);
-        add_action('geodir_wrapper_open', 'geo1280_page_title', 101);
-    }
+		remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10);
+		add_action('geodir_wrapper_open', 'geo1280_page_title', 101);
+	}
 }
 
 /**
@@ -333,11 +333,11 @@ 
 function geo1280_search_bar_fix()
 {
 
-    echo '<div class="geo1280-placeholder"></div>';
-    if (is_active_sidebar('search-bar')) {
-        genesis_widget_area('search-bar', array(
-            'before' => '<div class="search-bar widget-area"><div class="wrap">',
-            'after' => '</div></div>',
-        ));
-    }
+	echo '<div class="geo1280-placeholder"></div>';
+	if (is_active_sidebar('search-bar')) {
+		genesis_widget_area('search-bar', array(
+			'before' => '<div class="search-bar widget-area"><div class="wrap">',
+			'after' => '</div></div>',
+		));
+	}
 }

geodirectory-functions/user_functions.php

Indentation +122 added lines, -122 removed lines

@@ -13,34 +13,34 @@ 
  */
 function geodir_user_favourite_listing_count($user_id=false)
 {
-    global $wpdb, $plugin_prefix, $current_user;
+	global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+	if(!$user_id){$user_id = $current_user->ID;}
+	if(!$user_id){return array();}
 
-    $site_id = '';
-    if ( is_multisite() ) {
-        $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-    }
+	$site_id = '';
+	if ( is_multisite() ) {
+		$blog_id = get_current_blog_id();
+		if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+	}
 
-    $user_favorites = geodir_get_user_favourites($user_id);
-    $all_posts = get_option('geodir_favorite_link_user_dashboard');
+	$user_favorites = geodir_get_user_favourites($user_id);
+	$all_posts = get_option('geodir_favorite_link_user_dashboard');
 
-    $user_listing = array();
-    if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+	$user_listing = array();
+	if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
+		$user_favorites = "'" . implode("','", $user_favorites) . "'";
 
-        foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+		foreach ($all_posts as $ptype) {
+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
 
-            if ($total_posts > 0) {
-                $user_listing[$ptype] = $total_posts;
-            }
-        }
-    }
+			if ($total_posts > 0) {
+				$user_listing[$ptype] = $total_posts;
+			}
+		}
+	}
 
-    return $user_listing;
+	return $user_listing;
 }
 
 /**
@@ -50,48 +50,48 @@ 
  * @package GeoDirectory
  */
 function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
-    // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
-    $user_favourite = geodir_user_favourite_listing_count( $user_id );
-
-    if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
-        $favourite_links = $output_type == 'link' ? array() : '';
-        $post_types = geodir_get_posttypes( 'object' );
-
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
-
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
-
-                /**
-                 * Filter favorite listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $post_type_link Favorite listing link.
-                 * @param string $key Favorite listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
-
-                if ( $output_type == 'select' ) {
-                    $selected = '';
-                    if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
-                        $selected = 'selected="selected"';
-                    }
-
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
-                }
-            }
-        }
-
-        if ( ! empty( $favourite_links ) ) {
-            if ( $output_type == 'select' ) {
-                ?>
+	// My Favourites in Dashboard
+	$show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
+	$user_favourite = geodir_user_favourite_listing_count( $user_id );
+
+	if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
+		$favourite_links = $output_type == 'link' ? array() : '';
+		$post_types = geodir_get_posttypes( 'object' );
+
+		$author_link = get_author_posts_url( $user_id );
+		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+
+		foreach ( $post_types as $key => $postobj ) {
+			if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
+				$name = __( $postobj->labels->name, 'geodirectory' );
+				$post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
+
+				/**
+				 * Filter favorite listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $post_type_link Favorite listing link.
+				 * @param string $key Favorite listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
+
+				if ( $output_type == 'select' ) {
+					$selected = '';
+					if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
+						$selected = 'selected="selected"';
+					}
+
+					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
+				} elseif ( $output_type == 'link' ) {
+					$favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
+				}
+			}
+		}
+
+		if ( ! empty( $favourite_links ) ) {
+			if ( $output_type == 'select' ) {
+				?>
                 <li>
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
                         <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
@@ -99,55 +99,55 @@ 
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $favourite_links );
-            }
-        }
-    }
+			} elseif ( $output_type == 'link' ) {
+				echo implode( " | ", $favourite_links );
+			}
+		}
+	}
 }
 
 function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
-    $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
-    $user_listing = geodir_user_post_listing_count( $user_id );
-
-    if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
-        $listing_links = $output_type == 'link' ? array() : '';
-
-        $post_types = geodir_get_posttypes( 'object' );
-
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
-
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
-
-                /**
-                 * Filter my listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $listing_link My listing link.
-                 * @param string $key My listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
-                if ( $output_type == 'select' ) {
-                    $selected = '';
-                    if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
-                        $selected = 'selected="selected"';
-                    }
-
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
-                }
-            }
-        }
-
-        if ( ! empty( $listing_links ) ) {
-            if ( $output_type == 'select' ) {
-                ?>
+	$show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
+	$user_listing = geodir_user_post_listing_count( $user_id );
+
+	if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
+		$listing_links = $output_type == 'link' ? array() : '';
+
+		$post_types = geodir_get_posttypes( 'object' );
+
+		$author_link = get_author_posts_url( $user_id );
+		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+
+		foreach ( $post_types as $key => $postobj ) {
+			if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
+				$name = __( $postobj->labels->name, 'geodirectory' );
+				$listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
+
+				/**
+				 * Filter my listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $listing_link My listing link.
+				 * @param string $key My listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
+				if ( $output_type == 'select' ) {
+					$selected = '';
+					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
+						$selected = 'selected="selected"';
+					}
+
+					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
+				} elseif ( $output_type == 'link' ) {
+					$listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
+				}
+			}
+		}
+
+		if ( ! empty( $listing_links ) ) {
+			if ( $output_type == 'select' ) {
+				?>
                 <li>
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
                         <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
@@ -155,11 +155,11 @@ 
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $listing_links );
-            }
-        }
-    }
+			} elseif ( $output_type == 'link' ) {
+				echo implode( " | ", $listing_links );
+			}
+		}
+	}
 }
 
 /**
@@ -170,12 +170,12 @@ 
  * @return mixed
  */
 function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
-    $site_id = '';
-    if ( is_multisite() ) {
-        $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-    }
-
-    return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
+	if(!$user_id){$user_id = get_current_user_id();}
+	$site_id = '';
+	if ( is_multisite() ) {
+		$blog_id = get_current_blog_id();
+		if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+	}
+
+	return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
 }
\ No newline at end of file

Spacing +57 added lines, -57 removed lines

@@ -11,17 +11,17 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  * @return array User listing count for each post type.
  */
-function geodir_user_favourite_listing_count($user_id=false)
+function geodir_user_favourite_listing_count($user_id = false)
 {
     global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+    if (!$user_id) {$user_id = $current_user->ID; }
+    if (!$user_id) {return array(); }
 
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     $user_favorites = geodir_get_user_favourites($user_id);
@@ -29,10 +29,10 @@ 
 
     $user_listing = array();
     if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+        $user_favorites = "'".implode("','", $user_favorites)."'";
 
         foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE  post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
 
             if ($total_posts > 0) {
                 $user_listing[$ptype] = $total_posts;
@@ -49,22 +49,22 @@ 
  * @since 1.5.9
  * @package GeoDirectory
  */
-function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
     // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
-    $user_favourite = geodir_user_favourite_listing_count( $user_id );
+    $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
+    $user_favourite = geodir_user_favourite_listing_count($user_id);
 
-    if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
+    if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
         $favourite_links = $output_type == 'link' ? array() : '';
-        $post_types = geodir_get_posttypes( 'object' );
+        $post_types = geodir_get_posttypes('object');
 
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+        $author_link = get_author_posts_url($user_id);
+        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
+        foreach ($post_types as $key => $postobj) {
+            if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
+                $name = __($postobj->labels->name, 'geodirectory');
+                $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
 
                 /**
                  * Filter favorite listing link.
@@ -74,54 +74,54 @@ 
                  * @param string $key Favorite listing array key.
                  * @param int $current_user->ID Current user ID.
                  */
-                $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
+                $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
 
-                if ( $output_type == 'select' ) {
+                if ($output_type == 'select') {
                     $selected = '';
-                    if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
+                    if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
                         $selected = 'selected="selected"';
                     }
 
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
+                    $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.$name.'</option>';
+                } elseif ($output_type == 'link') {
+                    $favourite_links[] = '<a href="'.$post_type_link.'">'.$name.'</a>';
                 }
             }
         }
 
-        if ( ! empty( $favourite_links ) ) {
-            if ( $output_type == 'select' ) {
+        if (!empty($favourite_links)) {
+            if ($output_type == 'select') {
                 ?>
                 <li>
-                    <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
-                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
+                    <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Favorites', 'geodirectory'); ?>">
+                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Favorites", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
                         <?php echo $favourite_links; ?>
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $favourite_links );
+            } elseif ($output_type == 'link') {
+                echo implode(" | ", $favourite_links);
             }
         }
     }
 }
 
-function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
-    $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
-    $user_listing = geodir_user_post_listing_count( $user_id );
+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
+    $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
+    $user_listing = geodir_user_post_listing_count($user_id);
 
-    if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
+    if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
         $listing_links = $output_type == 'link' ? array() : '';
 
-        $post_types = geodir_get_posttypes( 'object' );
+        $post_types = geodir_get_posttypes('object');
 
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+        $author_link = get_author_posts_url($user_id);
+        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
+        foreach ($post_types as $key => $postobj) {
+            if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
+                $name = __($postobj->labels->name, 'geodirectory');
+                $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
 
                 /**
                  * Filter my listing link.
@@ -131,32 +131,32 @@ 
                  * @param string $key My listing array key.
                  * @param int $current_user->ID Current user ID.
                  */
-                $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
-                if ( $output_type == 'select' ) {
+                $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
+                if ($output_type == 'select') {
                     $selected = '';
-                    if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
+                    if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
                         $selected = 'selected="selected"';
                     }
 
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
+                    $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.$name.'</option>';
+                } elseif ($output_type == 'link') {
+                    $listing_links[] = '<a href="'.$listing_link.'">'.$name.'</a>';
                 }
             }
         }
 
-        if ( ! empty( $listing_links ) ) {
-            if ( $output_type == 'select' ) {
+        if (!empty($listing_links)) {
+            if ($output_type == 'select') {
                 ?>
                 <li>
-                    <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
-                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
+                    <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Listings', 'geodirectory'); ?>">
+                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Listings", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
                         <?php echo $listing_links; ?>
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $listing_links );
+            } elseif ($output_type == 'link') {
+                echo implode(" | ", $listing_links);
             }
         }
     }
@@ -169,12 +169,12 @@ 
  * @since 1.6.24
  * @return mixed
  */
-function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
+function geodir_get_user_favourites($user_id = '') {
+    if (!$user_id) {$user_id = get_current_user_id(); }
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);

geodirectory-widgets/listing_map_widget.php

Indentation +180 added lines, -180 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,110 +93,110 @@ 
 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()) {

+			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';

+				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();

+			} 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;

+				$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 ( geodir_is_page( 'search' ) ) {

 					$map_default_lat = '';

@@ -213,83 +213,83 @@ 
 						}

 					}

 				}

-            }

-

-            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 (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'); ?>

@@ -318,14 +318,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>

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

 

         <?php

-        $map_zoom_level = geodir_map_zoom_level();

-        ?>

+		$map_zoom_level = geodir_map_zoom_level();

+		?>

 

         <p>

             <label

@@ -344,14 +344,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>

 

@@ -363,8 +363,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>

@@ -372,8 +372,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>

 

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

 

     <?php

-    }

+	}

 } // class geodir_map_listingpage

 

 register_widget('geodir_map_listingpage');

Spacing +16 added lines, -16 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;

 			}

 

@@ -198,16 +198,16 @@ 
                 $map_args['map_class_name'] = 'geodir-map-listing-page';

                 $mapview = $maptype;

 

-				if ( geodir_is_page( 'search' ) ) {

+				if (geodir_is_page('search')) {

 					$map_default_lat = '';

 					$map_default_lng = '';

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

-						$map_default_lat = (float)sanitize_text_field( $_REQUEST['sgeo_lat'] );

-						$map_default_lng = (float)sanitize_text_field( $_REQUEST['sgeo_lon'] );

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

+						$map_default_lat = (float) sanitize_text_field($_REQUEST['sgeo_lat']);

+						$map_default_lng = (float) sanitize_text_field($_REQUEST['sgeo_lon']);

 					}

-					if ( empty( $map_default_lat ) && empty( $map_default_lng ) && ! empty( $_REQUEST['set_location_type'] ) && ! empty( $_REQUEST['set_location_val'] ) && function_exists( 'geodir_get_location_by_id' ) ) {

-						$location = geodir_get_location_by_id( '', (int)$_REQUEST['set_location_val'] );

-						if ( ! empty( $location ) ) {

+					if (empty($map_default_lat) && empty($map_default_lng) && !empty($_REQUEST['set_location_type']) && !empty($_REQUEST['set_location_val']) && function_exists('geodir_get_location_by_id')) {

+						$location = geodir_get_location_by_id('', (int) $_REQUEST['set_location_val']);

+						if (!empty($location)) {

 							$map_default_lat = $location->city_latitude;

 							$map_default_lng = $location->city_longitude;

 						}

@@ -278,7 +278,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']);

@@ -288,7 +288,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

@@ -326,7 +326,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>

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

                             $selected = 'selected="selected"';

 

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

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

 

                     } ?>

 

@@ -382,7 +382,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')) { ?>

Braces +6 added lines, -3 removed lines

@@ -215,7 +215,9 @@ 
 				}

             }

 

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

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

             // Set default map options

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

@@ -346,8 +348,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>';

 

geodirectory-functions/privacy/class-geodir-privacy-exporters.php

Doc Comments +4 added lines

@@ -316,6 +316,10 @@
 		return $personal_data;
 	}
 
+	/**
+	 * @param string $email_address
+	 * @param integer $page
+	 */
 	public static function posts_by_author( $email_address, $post_type, $page ) {
 		if ( empty( $email_address ) || empty( $post_type ) || empty( $page ) ) {
 			return array();

Spacing +189 added lines, -189 removed lines

@@ -6,7 +6,7 @@ 
  * @package GeoDirectory
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GeoDir_Privacy_Exporters Class.
@@ -23,32 +23,32 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public static function post_data_exporter( $email_address, $page ) {
-		$post_type 		= GeoDir_Privacy::exporter_post_type();
+	public static function post_data_exporter($email_address, $page) {
+		$post_type = GeoDir_Privacy::exporter_post_type();
 
 		$done           = false;
 		$page           = (int) $page;
 		$data_to_export = array();
 
-		$posts 			= self::posts_by_author( $email_address, $post_type, $page );
+		$posts = self::posts_by_author($email_address, $post_type, $page);
 
-		if ( 0 < count( $posts ) ) {
-			$obj_post_type = get_post_type_object( $post_type );
+		if (0 < count($posts)) {
+			$obj_post_type = get_post_type_object($post_type);
 
-			foreach ( $posts as $post_ID ) {
-				$gd_post = geodir_get_post_info( $post_ID );
-				if ( empty( $gd_post ) ) {
+			foreach ($posts as $post_ID) {
+				$gd_post = geodir_get_post_info($post_ID);
+				if (empty($gd_post)) {
 					continue;
 				}
 
 				$data_to_export[] = array(
-					'group_id'    => 'geodirectory-post-' . $post_type,
-					'group_label' => __( $obj_post_type->labels->name, 'geodirectory' ),
-					'item_id'     => 'post-' . $post_ID,
-					'data'        => self::get_post_personal_data( $gd_post ),
+					'group_id'    => 'geodirectory-post-'.$post_type,
+					'group_label' => __($obj_post_type->labels->name, 'geodirectory'),
+					'item_id'     => 'post-'.$post_ID,
+					'data'        => self::get_post_personal_data($gd_post),
 				);
 			}
-			$done = 10 > count( $posts );
+			$done = 10 > count($posts);
 		} else {
 			$done = true;
 		}
@@ -66,24 +66,24 @@ 
 	 * @param WP_Post $gd_post The post object.
 	 * @return array
 	 */
-	protected static function get_post_personal_data( $gd_post ) {
+	protected static function get_post_personal_data($gd_post) {
 		$post_categories = array();
 		$post_tags = array();
 		$default_category = '';
 
-		$cat_taxonomy = $gd_post->post_type . 'category';
-		$tag_taxonomy = $gd_post->post_type . '_tags';
+		$cat_taxonomy = $gd_post->post_type.'category';
+		$tag_taxonomy = $gd_post->post_type.'_tags';
 
-		$post_terms = wp_get_post_terms( $gd_post->ID, array( $cat_taxonomy, $tag_taxonomy ) );
-		if ( ! empty( $post_terms ) && ! is_wp_error( $post_terms ) ) {
-			foreach ( $post_terms as $term ) {
-				if ( $term->taxonomy == $cat_taxonomy ) {
+		$post_terms = wp_get_post_terms($gd_post->ID, array($cat_taxonomy, $tag_taxonomy));
+		if (!empty($post_terms) && !is_wp_error($post_terms)) {
+			foreach ($post_terms as $term) {
+				if ($term->taxonomy == $cat_taxonomy) {
 					$post_categories[] = $term->name;
 				} else {
 					$post_tags[] = $term->name;
 				}
 
-				if ( $gd_post->default_category == $term->term_id ) {
+				if ($gd_post->default_category == $term->term_id) {
 					$default_category = $term->name;
 				}
 			}
@@ -91,189 +91,189 @@ 
 
 		$personal_data = array();
 		$personal_data[] = array(
-			'name'  => __( 'Post ID', 'geodirectory' ),
+			'name'  => __('Post ID', 'geodirectory'),
 			'value' => $gd_post->ID,
 		);
 		$personal_data[] = array(
-			'name'  => __( 'Post Title', 'geodirectory' ),
+			'name'  => __('Post Title', 'geodirectory'),
 			'value' => $gd_post->post_title,
 		);
 		$personal_data[] = array(
-			'name'  => __( 'Post Description', 'geodirectory' ),
+			'name'  => __('Post Description', 'geodirectory'),
 			'value' => $gd_post->post_content,
 		);
 		$personal_data[] = array(
-			'name'  => __( 'Post Date', 'geodirectory' ),
+			'name'  => __('Post Date', 'geodirectory'),
 			'value' => $gd_post->post_date,
 		);
-		if ( ! empty( $gd_post->post_modified ) && $gd_post->post_modified != '0000-00-00 00:00:00' ) {
+		if (!empty($gd_post->post_modified) && $gd_post->post_modified != '0000-00-00 00:00:00') {
 		$personal_data[] = array(
-			'name'  => __( 'Post Modified Date', 'geodirectory' ),
+			'name'  => __('Post Modified Date', 'geodirectory'),
 			'value' => $gd_post->post_modified,
 		);
 		}
 		$personal_data[] = array(
-			'name'  => __( 'Post Status', 'geodirectory' ),
+			'name'  => __('Post Status', 'geodirectory'),
 			'value' => $gd_post->post_status,
 		);
-		if ( ! empty( $gd_post->submit_ip ) ) {
+		if (!empty($gd_post->submit_ip)) {
 			$personal_data[] = array(
-				'name'  => __( 'Submit IP', 'geodirectory' ),
+				'name'  => __('Submit IP', 'geodirectory'),
 				'value' => $gd_post->submit_ip,
 			);
 		}
 		$personal_data[] = array(
-			'name'  => __( 'Post Categories', 'geodirectory' ),
-			'value' => ( ! empty( $post_categories ) ? implode( ', ', $post_categories ) : '' ),
+			'name'  => __('Post Categories', 'geodirectory'),
+			'value' => (!empty($post_categories) ? implode(', ', $post_categories) : ''),
 		);
-		if ( $default_category ) {
+		if ($default_category) {
 			$personal_data[] = array(
-				'name'  => __( 'Default Category', 'geodirectory' ),
+				'name'  => __('Default Category', 'geodirectory'),
 				'value' => $default_category,
 			);
 		}
-		if ( ! empty( $post_tags ) ) {
+		if (!empty($post_tags)) {
 			$personal_data[] = array(
-				'name'  => __( 'Post Tags', 'geodirectory' ),
-				'value' => implode( ', ', $post_tags ),
+				'name'  => __('Post Tags', 'geodirectory'),
+				'value' => implode(', ', $post_tags),
 			);
 		}
 		$personal_data[] = array(
-			'name'  => __( 'Post URL', 'geodirectory' ),
-			'value' => get_permalink( $gd_post->ID ),
+			'name'  => __('Post URL', 'geodirectory'),
+			'value' => get_permalink($gd_post->ID),
 		);
 
 		// Post Images
-		$post_images = geodir_get_images( $gd_post->ID );
-		if ( ! empty( $post_images ) ) {
+		$post_images = geodir_get_images($gd_post->ID);
+		if (!empty($post_images)) {
 			$images = array();
-			foreach ( $post_images as $key => $post_image ) {
-				if ( ! empty( $post_image->src ) ) {
+			foreach ($post_images as $key => $post_image) {
+				if (!empty($post_image->src)) {
 					$images[] = $post_image->src;
 				}
 			}
 
-			if ( ! empty( $images ) ) {
+			if (!empty($images)) {
 				$personal_data[] = array(
-					'name'  => __( 'Post Images', 'geodirectory' ),
-					'value' => self::parse_files_value( $images ),
+					'name'  => __('Post Images', 'geodirectory'),
+					'value' => self::parse_files_value($images),
 				);
 			}
 		}
 
 		// Post Rating
-		$post_rating = geodir_get_post_rating( $gd_post->ID );
-		if ( $post_rating > 0 ) {
-			$post_rating = ( is_float( $post_rating) || ( strpos( $post_rating, ".", 1 ) == 1 && strlen( $post_rating ) > 3 ) ) ? number_format( $post_rating, 1, '.', '' ) : $post_rating;
+		$post_rating = geodir_get_post_rating($gd_post->ID);
+		if ($post_rating > 0) {
+			$post_rating = (is_float($post_rating) || (strpos($post_rating, ".", 1) == 1 && strlen($post_rating) > 3)) ? number_format($post_rating, 1, '.', '') : $post_rating;
 			$personal_data[] = array(
-				'name'  => __( 'Post Rating', 'geodirectory' ),
-				'value' => $post_rating . ' / 5',
+				'name'  => __('Post Rating', 'geodirectory'),
+				'value' => $post_rating.' / 5',
 			);
 		}
 
 		// Post Reviews
-		$post_reviews = geodir_get_review_count_total( $gd_post->ID );
-		if ( $post_reviews > 0 ) {
+		$post_reviews = geodir_get_review_count_total($gd_post->ID);
+		if ($post_reviews > 0) {
 			$personal_data[] = array(
-				'name'  => __( 'Post Reviews', 'geodirectory' ),
+				'name'  => __('Post Reviews', 'geodirectory'),
 				'value' => $post_reviews,
 			);
 		}
 
-		if ( ! empty( $gd_post->is_featured ) ) {
+		if (!empty($gd_post->is_featured)) {
 			$personal_data[] = array(
-				'name'  => __( 'Post Featured', 'geodirectory' ),
-				'value' => __( 'Yes', 'geodirectory' ),
+				'name'  => __('Post Featured', 'geodirectory'),
+				'value' => __('Yes', 'geodirectory'),
 			);
 		}
 
-		$custom_fields 	= geodir_post_custom_fields( $gd_post->package_id, 'all', $gd_post->post_type );
-		$post_fields 	= array_keys( (array) $gd_post );
+		$custom_fields = geodir_post_custom_fields($gd_post->package_id, 'all', $gd_post->post_type);
+		$post_fields = array_keys((array) $gd_post);
 
-		foreach ( $custom_fields as $key => $field ) {
-			$field_name 			= ! empty( $field['htmlvar_name'] ) ? $field['htmlvar_name'] : '';
-			if ( empty( $field_name ) ) {
+		foreach ($custom_fields as $key => $field) {
+			$field_name = !empty($field['htmlvar_name']) ? $field['htmlvar_name'] : '';
+			if (empty($field_name)) {
 				continue;
 			}
 
-			$field 					= stripslashes_deep( $field );
+			$field = stripslashes_deep($field);
 
-			$extra_fields 			= ! empty( $field['extra_fields'] ) ? $field['extra_fields'] : array();
+			$extra_fields = !empty($field['extra_fields']) ? $field['extra_fields'] : array();
 			$data_type              = $field['data_type'];
 			$field_type             = $field['field_type'];
-			$field_title			= $field['site_title'];
-			if ( $field_name == 'post' ) {
+			$field_title = $field['site_title'];
+			if ($field_name == 'post') {
 				$field_name = 'post_address';
 			}
 
-			if ( ! in_array( $field_name, $post_fields ) ) {
+			if (!in_array($field_name, $post_fields)) {
 				continue;
 			}
 
 			$name = $field_title;
 			$value = '';
-			switch ( $field_type ) {
+			switch ($field_type) {
 				case 'address':
-					$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $gd_post->post_type ) ? false : true;
-					if ( $location_allowed && ! empty( $gd_post->post_country ) && ! empty( $gd_post->post_region ) && ! empty( $gd_post->post_city ) ) {
+					$location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($gd_post->post_type) ? false : true;
+					if ($location_allowed && !empty($gd_post->post_country) && !empty($gd_post->post_region) && !empty($gd_post->post_city)) {
 						$personal_data[] = array(
-							'name'  => __( 'Post Address', 'geodirectory' ),
+							'name'  => __('Post Address', 'geodirectory'),
 							'value' => $gd_post->post_address,
 						);
 						$personal_data[] = array(
-							'name'  => __( 'Post City', 'geodirectory' ),
+							'name'  => __('Post City', 'geodirectory'),
 							'value' => $gd_post->post_city,
 						);
 						$personal_data[] = array(
-							'name'  => __( 'Post Region', 'geodirectory' ),
+							'name'  => __('Post Region', 'geodirectory'),
 							'value' => $gd_post->post_region,
 						);
 						$personal_data[] = array(
-							'name'  => __( 'Post Country', 'geodirectory' ),
+							'name'  => __('Post Country', 'geodirectory'),
 							'value' => $gd_post->post_country,
 						);
 						$personal_data[] = array(
-							'name'  => __( 'Post Zip', 'geodirectory' ),
+							'name'  => __('Post Zip', 'geodirectory'),
 							'value' => $gd_post->post_zip,
 						);
 						$personal_data[] = array(
-							'name'  => __( 'Post Latitude', 'geodirectory' ),
+							'name'  => __('Post Latitude', 'geodirectory'),
 							'value' => $gd_post->post_latitude,
 						);
 						$personal_data[] = array(
-							'name'  => __( 'Post Longitude', 'geodirectory' ),
+							'name'  => __('Post Longitude', 'geodirectory'),
 							'value' => $gd_post->post_longitude,
 						);
-						if ( ! empty( $gd_post->post_neighbourhood ) ) {
+						if (!empty($gd_post->post_neighbourhood)) {
 							$personal_data[] = array(
-								'name'  => __( 'Post Neighbourhood', 'geodirectory' ),
+								'name'  => __('Post Neighbourhood', 'geodirectory'),
 								'value' => $gd_post->post_neighbourhood,
 							);
 						}
 					}
 				break;
 				case 'checkbox':
-					if ( ! empty( $gd_post->{$field_name} ) ) {
-						$value = __( 'Yes', 'geodirectory' );
+					if (!empty($gd_post->{$field_name} )) {
+						$value = __('Yes', 'geodirectory');
 					} else {
-						$value = __( 'No', 'geodirectory' );
+						$value = __('No', 'geodirectory');
 					}
 					break;
 				case 'datepicker':
 					$value = $gd_post->{$field_name} != '0000-00-00' ? $gd_post->{$field_name} : '';
 					break;
 				case 'radio':
-					if ( $gd_post->{$field_name} !== '' ) {
-						if ( $gd_post->{$field_name} == 'f' || $gd_post->{$field_name} == '0') {
-							$value = __( 'No', 'geodirectory' );
-						} else if ( $gd_post->{$field_name} == 't' || $gd_post->{$field_name} == '1') {
-							$value = __( 'Yes', 'geodirectory' );
+					if ($gd_post->{$field_name} !== '') {
+						if ($gd_post->{$field_name} == 'f' || $gd_post->{$field_name} == '0') {
+							$value = __('No', 'geodirectory');
+						} else if ($gd_post->{$field_name} == 't' || $gd_post->{$field_name} == '1') {
+							$value = __('Yes', 'geodirectory');
 						} else {
-							if ( !empty( $field['option_values'] ) ) {
-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep( $field['option_values'] ), true );
-								if ( ! empty( $cf_option_values ) ) {
-									foreach ( $cf_option_values as $cf_option_value ) {
-										if ( isset( $cf_option_value['value'] ) && $cf_option_value['value'] == $gd_post->{$field_name} ) {
+							if (!empty($field['option_values'])) {
+								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($field['option_values']), true);
+								if (!empty($cf_option_values)) {
+									foreach ($cf_option_values as $cf_option_value) {
+										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $gd_post->{$field_name} ) {
 											$value = $cf_option_value['label'];
 										}
 									}
@@ -283,12 +283,12 @@ 
 					}
 					break;
 				case 'select':
-					$value = __( $gd_post->{$field_name}, 'geodirectory');
-					if ( !empty( $field['option_values'] ) ) {
-						$cf_option_values = geodir_string_values_to_options(stripslashes_deep( $field['option_values'] ), true );
-						if ( ! empty( $cf_option_values ) ) {
-							foreach ( $cf_option_values as $cf_option_value ) {
-								if ( isset( $cf_option_value['value'] ) && $cf_option_value['value'] == $gd_post->{$field_name} ) {
+					$value = __($gd_post->{$field_name}, 'geodirectory');
+					if (!empty($field['option_values'])) {
+						$cf_option_values = geodir_string_values_to_options(stripslashes_deep($field['option_values']), true);
+						if (!empty($cf_option_values)) {
+							foreach ($cf_option_values as $cf_option_value) {
+								if (isset($cf_option_value['value']) && $cf_option_value['value'] == $gd_post->{$field_name} ) {
 									$value = $cf_option_value['label'];
 								}
 							}
@@ -296,23 +296,23 @@ 
 					}
 					break;
 				case 'multiselect':
-					$field_values = explode( ',', trim( $gd_post->{$field_name}, "," ) );
-					if ( is_array( $field_values ) ) {
-						$field_values = array_map( 'trim', $field_values );
+					$field_values = explode(',', trim($gd_post->{$field_name}, ","));
+					if (is_array($field_values)) {
+						$field_values = array_map('trim', $field_values);
 					}
 					$values = array();
-					if ( ! empty( $field['option_values'] ) ) {
-						$cf_option_values = geodir_string_values_to_options(stripslashes_deep( $field['option_values'] ), true );
+					if (!empty($field['option_values'])) {
+						$cf_option_values = geodir_string_values_to_options(stripslashes_deep($field['option_values']), true);
 
-						if ( ! empty( $cf_option_values ) ) {
-							foreach ( $cf_option_values as $cf_option_value ) {
-								if ( isset( $cf_option_value['value'] ) && in_array( $cf_option_value['value'], $field_values ) ) {
+						if (!empty($cf_option_values)) {
+							foreach ($cf_option_values as $cf_option_value) {
+								if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
 									$values[] = $cf_option_value['label'];
 								}
 							}
 						}
 					}
-					$value = ! empty( $values ) ? implode( ', ', $values ) : '';
+					$value = !empty($values) ? implode(', ', $values) : '';
 					break;
 				case 'time':
 					$value = $gd_post->{$field_name} != '00:00:00' ? $gd_post->{$field_name} : '';
@@ -326,70 +326,70 @@ 
 					$value = $gd_post->{$field_name} ? $gd_post->{$field_name} : '';
 					break;
 				case 'file':
-					$files = explode( ",", $gd_post->{$field_name} );
-					if ( ! empty( $files ) ) {
-						$allowed_file_types = !empty( $extra_fields['gd_file_types'] ) && is_array( $extra_fields['gd_file_types'] ) && !in_array( "*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+					$files = explode(",", $gd_post->{$field_name} );
+					if (!empty($files)) {
+						$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 
 						$file_urls = array();
-						foreach ( $files as $file ) {
-							if ( ! empty( $file ) ) {
-								$image_name_arr = explode( '/', $file );
-								$curr_img_dir = $image_name_arr[ count( $image_name_arr ) - 2];
+						foreach ($files as $file) {
+							if (!empty($file)) {
+								$image_name_arr = explode('/', $file);
+								$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
 								$filename = end($image_name_arr);
 								$img_name_arr = explode('.', $filename);
 
-								$arr_file_type = wp_check_filetype( $filename );
-								if ( empty( $arr_file_type['ext'] ) || empty( $arr_file_type['type'] ) ) {
+								$arr_file_type = wp_check_filetype($filename);
+								if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
 									continue;
 								}
 
 								$uploaded_file_type = $arr_file_type['type'];
 								$uploaded_file_ext = $arr_file_type['ext'];
 
-								if ( ! empty( $allowed_file_types ) && !in_array( $uploaded_file_ext, $allowed_file_types ) ) {
+								if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
 									continue; // Invalid file type.
 								}
-								$image_file_types = array( 'image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon' );
-								$audio_file_types = array( 'audio/mpeg', 'audio/ogg', 'audio/mp4', 'audio/vnd.wav', 'audio/basic', 'audio/mid' );
+								$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
+								$audio_file_types = array('audio/mpeg', 'audio/ogg', 'audio/mp4', 'audio/vnd.wav', 'audio/basic', 'audio/mid');
 
 								// If the uploaded file is image
-								if ( in_array( $uploaded_file_type, $image_file_types ) ) {
+								if (in_array($uploaded_file_type, $image_file_types)) {
 									$file_urls[] = $file;
 								}
 							}
 						}
-						$value = ! empty( $file_urls ) ? self::parse_files_value( $file_urls ) : '';
+						$value = !empty($file_urls) ? self::parse_files_value($file_urls) : '';
 					}
 					break;
 			}
 
-			if ( ! empty( $name ) && $value !== '' ) {
+			if (!empty($name) && $value !== '') {
 				$personal_data[] = array(
-					'name'  => __( $name, 'geodirectory' ),
+					'name'  => __($name, 'geodirectory'),
 					'value' => $value,
 				);
 			}
 		}
 
-		if ( ! empty( $gd_post->geodir_link_business ) && ( $post_type = get_post_type( (int)$gd_post->geodir_link_business ) ) ) {
+		if (!empty($gd_post->geodir_link_business) && ($post_type = get_post_type((int) $gd_post->geodir_link_business))) {
 			$personal_data[] = array(
-				'name'  => __( 'Link Business Title', 'geodirectory' ),
-				'value' => get_the_title( (int)$gd_post->geodir_link_business ),
+				'name'  => __('Link Business Title', 'geodirectory'),
+				'value' => get_the_title((int) $gd_post->geodir_link_business),
 			);
 			$personal_data[] = array(
-				'name'  => __( 'Link Business URL', 'geodirectory' ),
-				'value' => get_permalink( (int)$gd_post->geodir_link_business ),
+				'name'  => __('Link Business URL', 'geodirectory'),
+				'value' => get_permalink((int) $gd_post->geodir_link_business),
 			);
 		}
-		if ( defined( 'GEODIR_FRANCHISE_VERSION' ) ) {
-			if ( ! empty( $gd_post->franchise ) && ( $post_type = get_post_type( (int)$gd_post->franchise ) ) ) {
+		if (defined('GEODIR_FRANCHISE_VERSION')) {
+			if (!empty($gd_post->franchise) && ($post_type = get_post_type((int) $gd_post->franchise))) {
 				$personal_data[] = array(
-					'name'  => __( 'Main Listing Title', 'geodirectory' ),
-					'value' => get_the_title( (int)$gd_post->franchise ),
+					'name'  => __('Main Listing Title', 'geodirectory'),
+					'value' => get_the_title((int) $gd_post->franchise),
 				);
 				$personal_data[] = array(
-					'name'  => __( 'Main Listing URL', 'geodirectory' ),
-					'value' => get_permalink( (int)$gd_post->franchise ),
+					'name'  => __('Main Listing URL', 'geodirectory'),
+					'value' => get_permalink((int) $gd_post->franchise),
 				);
 			}
 		}
@@ -401,28 +401,28 @@ 
 		 * @param array    $personal_data Array of name value pairs to expose in the export.
 		 * @param WP_Post $gd_post The post object.
 		 */
-		$personal_data = apply_filters( 'geodir_privacy_export_post_personal_data', $personal_data, $gd_post );
+		$personal_data = apply_filters('geodir_privacy_export_post_personal_data', $personal_data, $gd_post);
 
 		return $personal_data;
 	}
 
-	public static function posts_by_author( $email_address, $post_type, $page ) {
-		if ( empty( $email_address ) || empty( $post_type ) || empty( $page ) ) {
+	public static function posts_by_author($email_address, $post_type, $page) {
+		if (empty($email_address) || empty($post_type) || empty($page)) {
 			return array();
 		}
 
-		$user = get_user_by( 'email', $email_address );
-		if ( empty( $user ) ) {
+		$user = get_user_by('email', $email_address);
+		if (empty($user)) {
 			return array();
 		}
 
-		$statuses = array_keys( get_post_statuses() );
+		$statuses = array_keys(get_post_statuses());
 		$skip_statuses = geodir_imex_export_skip_statuses();
-		if ( ! empty( $skip_statuses ) ) {
-			$statuses = array_diff( $statuses, $skip_statuses );
+		if (!empty($skip_statuses)) {
+			$statuses = array_diff($statuses, $skip_statuses);
 		}
 
-		$query_args    = array(
+		$query_args = array(
 			'post_type'			=> $post_type,
 			'post_status'		=> $statuses,
 			'fields'			=> 'ids',
@@ -433,66 +433,66 @@ 
 			'order'	   			=> 'ASC'
 		);
 
-		$query_args = apply_filters( 'geodir_privacy_post_data_exporter_post_query', $query_args, $post_type, $email_address, $page );
+		$query_args = apply_filters('geodir_privacy_post_data_exporter_post_query', $query_args, $post_type, $email_address, $page);
 
-		$posts = get_posts( $query_args );
+		$posts = get_posts($query_args);
 
-		return apply_filters( 'geodir_privacy_post_data_exporter_posts', $posts, $query_args, $post_type, $email_address, $page );
+		return apply_filters('geodir_privacy_post_data_exporter_posts', $posts, $query_args, $post_type, $email_address, $page);
 	}
 
-	public static function review_data_exporter( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
+	public static function review_data_exporter($response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key) {
 		global $wpdb;
 
 		$exporter_key = GeoDir_Privacy::personal_data_exporter_key();
 
-		if ( $exporter_key == 'wordpress-comments' && ! empty( $response['data'] ) ) {
-			foreach ( $response['data'] as $key => $item ) {
-				$comment_id = str_replace( 'comment-', '', $item['item_id'] );
+		if ($exporter_key == 'wordpress-comments' && !empty($response['data'])) {
+			foreach ($response['data'] as $key => $item) {
+				$comment_id = str_replace('comment-', '', $item['item_id']);
 				$data = $item['data'];
 
-				$review = geodir_get_review( $comment_id );
-				if ( ! empty( $review ) ) {
-					if ( ! empty( $review->overall_rating ) ) {
+				$review = geodir_get_review($comment_id);
+				if (!empty($review)) {
+					if (!empty($review->overall_rating)) {
 						$data[] = array(
-							'name'  => __( 'Rating (Overall)', 'geodirectory' ),
-							'value' => (float)$review->overall_rating . ' / 5',
+							'name'  => __('Rating (Overall)', 'geodirectory'),
+							'value' => (float) $review->overall_rating.' / 5',
 						);
 					}
-					if ( ! empty( $review->post_city ) ) {
+					if (!empty($review->post_city)) {
 						$data[] = array(
-							'name'  => __( 'Review City', 'geodirectory' ),
+							'name'  => __('Review City', 'geodirectory'),
 							'value' => $review->post_city,
 						);
 					}
-					if ( ! empty( $review->post_region ) ) {
+					if (!empty($review->post_region)) {
 						$data[] = array(
-							'name'  => __( 'Review Region', 'geodirectory' ),
+							'name'  => __('Review Region', 'geodirectory'),
 							'value' => $review->post_region,
 						);
 					}
-					if ( ! empty( $review->post_country ) ) {
+					if (!empty($review->post_country)) {
 						$data[] = array(
-							'name'  => __( 'Review Country', 'geodirectory' ),
+							'name'  => __('Review Country', 'geodirectory'),
 							'value' => $review->post_country,
 						);
 					}
-					if ( ! empty( $review->post_latitude ) ) {
+					if (!empty($review->post_latitude)) {
 						$data[] = array(
-							'name'  => __( 'Review Latitude', 'geodirectory' ),
+							'name'  => __('Review Latitude', 'geodirectory'),
 							'value' => $review->post_latitude,
 						);
 					}
-					if ( ! empty( $review->post_longitude ) ) {
+					if (!empty($review->post_longitude)) {
 						$data[] = array(
-							'name'  => __( 'Review Longitude', 'geodirectory' ),
+							'name'  => __('Review Longitude', 'geodirectory'),
 							'value' => $review->post_longitude,
 						);
 					}
 
-					$data = apply_filters( 'geodir_privacy_export_review_data', $data, $review, $email_address );
+					$data = apply_filters('geodir_privacy_export_review_data', $data, $review, $email_address);
 
-					if ( ! empty( $data ) ) {
-						$response['data'][ $key ]['data'] = $data;
+					if (!empty($data)) {
+						$response['data'][$key]['data'] = $data;
 					}
 				}
 			}
@@ -508,36 +508,36 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public static function favorites_data_exporter( $email_address, $page ) {
+	public static function favorites_data_exporter($email_address, $page) {
 		$done           = true;
 		$page           = (int) $page;
 		$data_to_export = array();
 
-		$items 			= GeoDir_Privacy::favorites_by_user( $email_address, $page );
+		$items = GeoDir_Privacy::favorites_by_user($email_address, $page);
 
-		if ( 0 < count( $items ) ) {
-			foreach ( $items as $item ) {
-				$gd_post = geodir_get_post_info( $item );
-				if ( empty( $gd_post ) ) {
+		if (0 < count($items)) {
+			foreach ($items as $item) {
+				$gd_post = geodir_get_post_info($item);
+				if (empty($gd_post)) {
 					continue;
 				}
 
 				$data_to_export[] = array(
 					'group_id'    => 'geodirectory-post-favorites',
-					'group_label' => __( 'GeoDirectory Favorite Listings', 'geodirectory' ),
-					'item_id'     => 'gd-favorite-' . $gd_post->ID,
+					'group_label' => __('GeoDirectory Favorite Listings', 'geodirectory'),
+					'item_id'     => 'gd-favorite-'.$gd_post->ID,
 					'data'        => array(
 						array(
-							'name'  => __( 'Post ID', 'geodirectory' ),
+							'name'  => __('Post ID', 'geodirectory'),
 							'value' => $gd_post->ID,
 						),
 						array(
-							'name'  => __( 'Post Title', 'geodirectory' ),
+							'name'  => __('Post Title', 'geodirectory'),
 							'value' => $gd_post->post_title,
 						),
 						array(
-							'name'  => __( 'Post URL', 'geodirectory' ),
-							'value' => get_permalink( $gd_post->ID ),
+							'name'  => __('Post URL', 'geodirectory'),
+							'value' => get_permalink($gd_post->ID),
 						)
 					),
 				);
@@ -550,27 +550,27 @@ 
 		);
 	}
 
-	public static function parse_files_value( $files ) {
-		if ( empty( $files ) ) {
+	public static function parse_files_value($files) {
+		if (empty($files)) {
 			return '';
 		}
 
-		if ( ! is_array( $files ) ) {
+		if (!is_array($files)) {
 			return $files;
 		}
 
-		if ( count( $files ) == 1 ) {
+		if (count($files) == 1) {
 			return $files[0];
 		}
 
 		$links = array();
-		foreach ( $files as $file ) {
-			if ( false === strpos( $file, ' ' ) && ( 0 === strpos( $file, 'http://' ) || 0 === strpos( $file, 'https://' ) ) ) {
-				$file = '<a href="' . esc_url( $file ) . '">' . esc_html( $file ) . '</a>';
+		foreach ($files as $file) {
+			if (false === strpos($file, ' ') && (0 === strpos($file, 'http://') || 0 === strpos($file, 'https://'))) {
+				$file = '<a href="'.esc_url($file).'">'.esc_html($file).'</a>';
 			}
 			$links[] = $file;
 		}
-		$links = ! empty( $links ) ? implode( ' <br> ', $links ) : '';
+		$links = !empty($links) ? implode(' <br> ', $links) : '';
 
 		return $links;
 	}

geodirectory-functions/privacy/class-geodir-privacy-erasers.php

Doc Comments +4 added lines

@@ -103,6 +103,10 @@
 		);
 	}
 
+	/**
+	 * @param string $email_address
+	 * @param integer $page
+	 */
 	public static function reviews_by_author( $email_address, $page, $posts_per_page = 10 ) {
 		global $wpdb;
 

Indentation +4 added lines, -4 removed lines

@@ -159,12 +159,12 @@
 		$messages       = array();
 
 		$site_id = '';
-        if ( is_multisite() ) {
-            $blog_id = get_current_blog_id();
-            if ( $blog_id && $blog_id != '1' ) {
+		if ( is_multisite() ) {
+			$blog_id = get_current_blog_id();
+			if ( $blog_id && $blog_id != '1' ) {
 				$site_id  = '_' . $blog_id;
 			}
-        }
+		}
 
 		if ( delete_user_meta( $user->ID, 'gd_user_favourite_post' . $site_id ) ) {
 			$messages[]    = __( 'Removed "Favorite Listings" data from user.', 'geodirectory' );

Spacing +34 added lines, -34 removed lines

@@ -6,7 +6,7 @@ 
  * @package GeoDirectory
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GeoDir_Privacy_Erasers Class.
@@ -22,7 +22,7 @@ 
 	 * @param  int    $page          Review page.
 	 * @return array
 	 */
-	public static function review_data_eraser( $email_address, $page ) {
+	public static function review_data_eraser($email_address, $page) {
 		global $wpdb;
 
 		$response = array(
@@ -32,7 +32,7 @@ 
 			'done'           => true,
 		);
 
-		if ( empty( $email_address ) ) {
+		if (empty($email_address)) {
 			return $response;
 		}
 
@@ -40,18 +40,18 @@ 
 		$items_removed  = false;
 		$items_retained = false;
 
-		$reviews = self::reviews_by_author( $email_address, $page );
+		$reviews = self::reviews_by_author($email_address, $page);
 
-		if ( empty( $reviews ) ) {
+		if (empty($reviews)) {
 			return $response;
 		}
 
-		$messages    = array();
+		$messages = array();
 
-		foreach ( $reviews as $review ) {
+		foreach ($reviews as $review) {
 			$anonymized_review                         		= array();
 			$anonymized_review['user_id']               	= 0;
-			$anonymized_review['rating_ip']    				= wp_privacy_anonymize_data( 'ip', $review->rating_ip );
+			$anonymized_review['rating_ip'] = wp_privacy_anonymize_data('ip', $review->rating_ip);
 
 			$review_id = (int) $review->id;
 
@@ -65,14 +65,14 @@ 
 			 * @param object 	 $review             Review object.
 			 * @param array      $anonymized_review  Anonymized review data.
 			 */
-			$anon_message = apply_filters( 'geodir_anonymize_post_review', true, $review, $anonymized_review );
+			$anon_message = apply_filters('geodir_anonymize_post_review', true, $review, $anonymized_review);
 
-			if ( true !== $anon_message ) {
-				if ( $anon_message && is_string( $anon_message ) ) {
-					$messages[] = esc_html( $anon_message );
+			if (true !== $anon_message) {
+				if ($anon_message && is_string($anon_message)) {
+					$messages[] = esc_html($anon_message);
 				} else {
 					/* translators: %d: Review ID */
-					$messages[] = sprintf( __( 'Review %d contains personal data but could not be anonymized.', 'geodirectory' ), $review_id );
+					$messages[] = sprintf(__('Review %d contains personal data but could not be anonymized.', 'geodirectory'), $review_id);
 				}
 
 				$items_retained = true;
@@ -84,16 +84,16 @@ 
 				'id' => $review_id,
 			);
 
-			$updated = $wpdb->update( GEODIR_REVIEW_TABLE, $anonymized_review, $args );
+			$updated = $wpdb->update(GEODIR_REVIEW_TABLE, $anonymized_review, $args);
 
-			if ( $updated ) {
+			if ($updated) {
 				$items_removed = true;
 			} else {
 				$items_retained = true;
 			}
 		}
 
-		$done = count( $reviews ) < $number;
+		$done = count($reviews) < $number;
 
 		return array(
 			'items_removed'  => $items_removed,
@@ -103,29 +103,29 @@ 
 		);
 	}
 
-	public static function reviews_by_author( $email_address, $page, $posts_per_page = 10 ) {
+	public static function reviews_by_author($email_address, $page, $posts_per_page = 10) {
 		global $wpdb;
 
-		if ( empty( $email_address ) || empty( $page ) ) {
+		if (empty($email_address) || empty($page)) {
 			return array();
 		}
 
-		$user = get_user_by( 'email', $email_address );
-		if ( empty( $user ) ) {
+		$user = get_user_by('email', $email_address);
+		if (empty($user)) {
 			return array();
 		}
 
-		if ( absint( $page ) < 1 ) {
+		if (absint($page) < 1) {
 			$page = 1;
 		}
 
-		$limit = absint( ( $page - 1 ) * $posts_per_page ) . ", " . $posts_per_page;
+		$limit = absint(($page - 1) * $posts_per_page).", ".$posts_per_page;
 			
-		$query = $wpdb->prepare( "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d ORDER BY comment_id ASC LIMIT " . $limit, array( $user->ID ) );
+		$query = $wpdb->prepare("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE user_id = %d ORDER BY comment_id ASC LIMIT ".$limit, array($user->ID));
 
-		$reviews = $wpdb->get_results( $query );
+		$reviews = $wpdb->get_results($query);
 
-		return apply_filters( 'geodir_privacy_review_data_eraser_reviews', $reviews, $email_address, $user, $page );
+		return apply_filters('geodir_privacy_review_data_eraser_reviews', $reviews, $email_address, $user, $page);
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @param  int    $page          Page number.
 	 * @return array
 	 */
-	public static function favorites_data_eraser( $email_address, $page ) {
+	public static function favorites_data_eraser($email_address, $page) {
 		$response = array(
 			'items_removed'  => false,
 			'items_retained' => false,
@@ -145,12 +145,12 @@ 
 			'done'           => true,
 		);
 
-		if ( empty( $email_address ) ) {
+		if (empty($email_address)) {
 			return $response;
 		}
 
-		$user = get_user_by( 'email', $email_address );
-		if ( empty( $user ) ) {
+		$user = get_user_by('email', $email_address);
+		if (empty($user)) {
 			return $response;
 		}
 
@@ -159,15 +159,15 @@ 
 		$messages       = array();
 
 		$site_id = '';
-        if ( is_multisite() ) {
+        if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            if ( $blog_id && $blog_id != '1' ) {
-				$site_id  = '_' . $blog_id;
+            if ($blog_id && $blog_id != '1') {
+				$site_id = '_'.$blog_id;
 			}
         }
 
-		if ( delete_user_meta( $user->ID, 'gd_user_favourite_post' . $site_id ) ) {
-			$messages[]    = __( 'Removed "Favorite Listings" data from user.', 'geodirectory' );
+		if (delete_user_meta($user->ID, 'gd_user_favourite_post'.$site_id)) {
+			$messages[]    = __('Removed "Favorite Listings" data from user.', 'geodirectory');
 			$items_removed = true;
 		}
 

geodirectory-widgets/geodirectory_popular_widget.php

Indentation +238 added lines, -238 removed lines

@@ -14,83 +14,83 @@ 
  */

 class geodir_popular_post_category extends WP_Widget

 {

-    /**

-     * Register the popular post category widget.

-     *

-     * @since 1.0.0

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

-     */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_popular_post_category', 'description' => __('GD > Popular Post Category', 'geodirectory'));

-        parent::__construct(

-            'popular_post_category', // Base ID

-            __('GD > Popular Post Category', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

-

-    /**

-     * Front-end display content for popular post category widget.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     *

-     * @param array $args     Widget arguments.

-     * @param array $instance Saved values from database.

-     */

-    public function widget($args, $instance)

-    {

-        geodir_popular_post_category_output($args, $instance);

-    }

-

-    /**

-     * Sanitize popular post category widget form values as they are saved.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added default_post_type parameter.

-     * @since 1.6.9 Added parent_only parameter.

-     *

-     * @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['title'] = strip_tags($new_instance['title']);

-        $category_limit = (int)$new_instance['category_limit'];

-        $instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

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

-        $instance['parent_only'] = !empty($new_instance['parent_only']) ? true : false;

-        return $instance;

-    }

-

-    /**

-     * Back-end popular post category widget settings form.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added option to set default post type.

-     * @since 1.6.9 Added option to show parent categories only.

-     *

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

-     */

-    public function form($instance) 

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

-

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

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

-        $category_limit = $category_limit > 0 ? $category_limit : 15;

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

-        $parent_only = !empty($instance['parent_only']) ? true: false;

+	/**

+	 * Register the popular post category widget.

+	 *

+	 * @since 1.0.0

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

+	 */

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_popular_post_category', 'description' => __('GD > Popular Post Category', 'geodirectory'));

+		parent::__construct(

+			'popular_post_category', // Base ID

+			__('GD > Popular Post Category', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

+

+	/**

+	 * Front-end display content for popular post category widget.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Declare function public.

+	 *

+	 * @param array $args     Widget arguments.

+	 * @param array $instance Saved values from database.

+	 */

+	public function widget($args, $instance)

+	{

+		geodir_popular_post_category_output($args, $instance);

+	}

+

+	/**

+	 * Sanitize popular post category widget form values as they are saved.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added default_post_type parameter.

+	 * @since 1.6.9 Added parent_only parameter.

+	 *

+	 * @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['title'] = strip_tags($new_instance['title']);

+		$category_limit = (int)$new_instance['category_limit'];

+		$instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

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

+		$instance['parent_only'] = !empty($new_instance['parent_only']) ? true : false;

+		return $instance;

+	}

+

+	/**

+	 * Back-end popular post category widget settings form.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added option to set default post type.

+	 * @since 1.6.9 Added option to show parent categories only.

+	 *

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

+	 */

+	public function form($instance) 

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

+

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

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

+		$category_limit = $category_limit > 0 ? $category_limit : 15;

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

+		$parent_only = !empty($instance['parent_only']) ? true: false;

         

-        $post_type_options = geodir_get_posttypes('options');

-        ?>

+		$post_type_options = geodir_get_posttypes('options');

+		?>

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>"/>

@@ -116,7 +116,7 @@ 
             <label for="<?php echo $this->get_field_id('parent_only'); ?>"><?php _e( 'Show parent categories only', 'geodirectory' ); ?></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_popular_post_category

 

 register_widget('geodir_popular_post_category');

@@ -130,40 +130,40 @@ 
 class geodir_popular_postview extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the popular posts 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' => 'geodir_popular_post_view', 'description' => __('GD > Popular Post View', 'geodirectory'));

-        parent::__construct(

-            'popular_post_view', // Base ID

-            __('GD > Popular Post View', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_popular_post_view', 'description' => __('GD > Popular Post View', 'geodirectory'));

+		parent::__construct(

+			'popular_post_view', // Base ID

+			__('GD > Popular Post View', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for popular posts widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        geodir_popular_postview_output($args, $instance);

-    }

+	{

+		geodir_popular_postview_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize popular posts 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.

@@ -171,106 +171,106 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-

-        if ($new_instance['title'] == '') {

-            $title = geodir_ucwords(strip_tags($new_instance['category_title']));

-            //$instance['title'] = $title;

-        }

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

-

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

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

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

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

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

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

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

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

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

-        $instance['character_count'] = $new_instance['character_count'];

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

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

-        else

-            $instance['add_location_filter'] = '0';

-

-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        $instance['show_special_only'] = isset($new_instance['show_special_only']) && $new_instance['show_special_only'] ? 1 : 0;

-        $instance['with_pics_only'] = isset($new_instance['with_pics_only']) && $new_instance['with_pics_only'] ? 1 : 0;

-        $instance['with_videos_only'] = isset($new_instance['with_videos_only']) && $new_instance['with_videos_only'] ? 1 : 0;

-        $instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;

-        $instance['hide_if_empty'] = !empty($new_instance['hide_if_empty']) ? 1 : 0;

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+

+		if ($new_instance['title'] == '') {

+			$title = geodir_ucwords(strip_tags($new_instance['category_title']));

+			//$instance['title'] = $title;

+		}

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

+

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

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

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

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

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

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

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

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

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

+		$instance['character_count'] = $new_instance['character_count'];

+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

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

+		else

+			$instance['add_location_filter'] = '0';

+

+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

+		$instance['show_special_only'] = isset($new_instance['show_special_only']) && $new_instance['show_special_only'] ? 1 : 0;

+		$instance['with_pics_only'] = isset($new_instance['with_pics_only']) && $new_instance['with_pics_only'] ? 1 : 0;

+		$instance['with_videos_only'] = isset($new_instance['with_videos_only']) && $new_instance['with_videos_only'] ? 1 : 0;

+		$instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;

+		$instance['hide_if_empty'] = !empty($new_instance['hide_if_empty']) ? 1 : 0;

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end popular posts 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)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

-            array('title' => '',

-                'post_type' => '',

-                'category' => array(),

-                'category_title' => '',

-                'list_sort' => '',

-                'title_tag' => 'h3',

-                'list_order' => '',

-                'post_number' => '5',

-                'layout' => 'gridview_onehalf',

-                'listing_width' => '',

-                'add_location_filter' => '1',

-                'character_count' => '20',

-                'show_featured_only' => '',

-                'show_special_only' => '',

-                'with_pics_only' => '',

-                'with_videos_only' => '',

-                'use_viewing_post_type' => '',

-                'hide_if_empty' => ''

-            )

-        );

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance,

+			array('title' => '',

+				'post_type' => '',

+				'category' => array(),

+				'category_title' => '',

+				'list_sort' => '',

+				'title_tag' => 'h3',

+				'list_order' => '',

+				'post_number' => '5',

+				'layout' => 'gridview_onehalf',

+				'listing_width' => '',

+				'add_location_filter' => '1',

+				'character_count' => '20',

+				'show_featured_only' => '',

+				'show_special_only' => '',

+				'with_pics_only' => '',

+				'with_videos_only' => '',

+				'use_viewing_post_type' => '',

+				'hide_if_empty' => ''

+			)

+		);

 

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

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

 

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

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

 

-        $category = $instance['category'];

+		$category = $instance['category'];

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

-        $character_count = $instance['character_count'];

+		$character_count = $instance['character_count'];

 

-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

-        $show_special_only = isset($instance['show_special_only']) && $instance['show_special_only'] ? true : false;

-        $with_pics_only = isset($instance['with_pics_only']) && $instance['with_pics_only'] ? true : false;

-        $with_videos_only = isset($instance['with_videos_only']) && $instance['with_videos_only'] ? true : false;

-        $use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;

-        $hide_if_empty = !empty($instance['hide_if_empty']) ? true : false;

+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

+		$show_special_only = isset($instance['show_special_only']) && $instance['show_special_only'] ? true : false;

+		$with_pics_only = isset($instance['with_pics_only']) && $instance['with_pics_only'] ? true : false;

+		$with_videos_only = isset($instance['with_videos_only']) && $instance['with_videos_only'] ? true : false;

+		$use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;

+		$hide_if_empty = !empty($instance['hide_if_empty']) ? true : false;

 

-        ?>

+		?>

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

                 <small>(%posttype_singular_label% ,

@@ -304,9 +304,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>

 

                         <option <?php if ($post_type == $postypes_obj) {

-                            echo 'selected="selected"';

-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

-                            echo geodir_utf8_ucfirst($extvalue[1]); ?></option>

+							echo 'selected="selected"';

+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

+							echo geodir_utf8_ucfirst($extvalue[1]); ?></option>

 

                     <?php } ?>

 

@@ -321,30 +321,30 @@ 
 

                 <?php

 

-                $post_type = ($post_type != '') ? $post_type : 'gd_place';

+				$post_type = ($post_type != '') ? $post_type : 'gd_place';

 

-                $all_postypes = geodir_get_posttypes();

+				$all_postypes = geodir_get_posttypes();

 

-                if (!in_array($post_type, $all_postypes))

-                    $post_type = 'gd_place';

+				if (!in_array($post_type, $all_postypes))

+					$post_type = 'gd_place';

 

-                $category_taxonomy = geodir_get_taxonomies($post_type);

-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

+				$category_taxonomy = geodir_get_taxonomies($post_type);

+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

 

-                ?>

+				?>

 

                 <select multiple="multiple" class="widefat" name="<?php echo $this->get_field_name('category'); ?>[]"

                         onchange="geodir_popular_widget_cat_title(this)">

 

                     <option <?php if (!is_array($category) || (is_array($category) && in_array('0', $category))) {

-                        echo 'selected="selected"';

-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) {

-                        $selected = '';

-                        if (is_array($category) && in_array($category_obj->term_id, $category))

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

+						$selected = '';

+						if (is_array($category) && in_array($category_obj->term_id, $category))

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

 

-                        ?>

+						?>

 

                         <option <?php echo $selected; ?>

                             value="<?php echo $category_obj->term_id; ?>"><?php echo geodir_utf8_ucfirst($category_obj->name); ?></option>

@@ -365,32 +365,32 @@ 
             <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>

 

                 <?php

-                $list_sort_arr = array(

-                    "az"        =>  __('A-Z', 'geodirectory'),

-                    "latest"        =>  __('Latest', 'geodirectory'),

-                    "featured"        =>  __('Featured', 'geodirectory'),

-                    "high_review"        =>  __('Review', 'geodirectory'),

-                    "high_rating"        =>  __('Rating', 'geodirectory'),

-                    "random"        =>  __('Random', 'geodirectory'),

-                );

-

-                /**

-                 * Filter the Popular post view widget sorting options.

-                 *

-                 * @since 1.6.22

-                 * @param array $list_sort_arr The array of key value pairs of settings.

-                 * @param array $instance The array of widget settings.

-                 */

-                $list_sort_arr = apply_filters('geodir_popular_post_view_list_sort',$list_sort_arr,$instance);

-                ?>

+				$list_sort_arr = array(

+					"az"        =>  __('A-Z', 'geodirectory'),

+					"latest"        =>  __('Latest', 'geodirectory'),

+					"featured"        =>  __('Featured', 'geodirectory'),

+					"high_review"        =>  __('Review', 'geodirectory'),

+					"high_rating"        =>  __('Rating', 'geodirectory'),

+					"random"        =>  __('Random', 'geodirectory'),

+				);

+

+				/**

+				 * Filter the Popular post view widget sorting options.

+				 *

+				 * @since 1.6.22

+				 * @param array $list_sort_arr The array of key value pairs of settings.

+				 * @param array $instance The array of widget settings.

+				 */

+				$list_sort_arr = apply_filters('geodir_popular_post_view_list_sort',$list_sort_arr,$instance);

+				?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"

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

                     <?php

-                    foreach($list_sort_arr as $sort_val => $sort_title){

-                        echo "<option value='$sort_val' ".selected($list_sort,$sort_val)." >$sort_title</option>";

-                    }

-                    ?>

+					foreach($list_sort_arr as $sort_val => $sort_title){

+						echo "<option value='$sort_val' ".selected($list_sort,$sort_val)." >$sort_title</option>";

+					}

+					?>

                 </select>

             </label>

         </p>

@@ -399,28 +399,28 @@ 
             <label for="<?php echo $this->get_field_id('title_tag'); ?>"><?php _e('Title tag:', 'geodirectory');?>

 

                 <?php

-                $title_tag_arr = array(

-                    "h3"        =>  __('h3 (default)', 'geodirectory'),

-                    "h2"        =>  __('h2 (if main content of page)', 'geodirectory'),

-                );

-

-                /**

-                 * Filter the Popular post view widget title tag.

-                 *

-                 * @since 1.6.26

-                 * @param array $title_tag_arr The array of key value pairs of settings.

-                 * @param array $instance The array of widget settings.

-                 */

-                $title_tag_arr = apply_filters('geodir_popular_post_view_title_tag',$title_tag_arr,$instance);

-                ?>

+				$title_tag_arr = array(

+					"h3"        =>  __('h3 (default)', 'geodirectory'),

+					"h2"        =>  __('h2 (if main content of page)', 'geodirectory'),

+				);

+

+				/**

+				 * Filter the Popular post view widget title tag.

+				 *

+				 * @since 1.6.26

+				 * @param array $title_tag_arr The array of key value pairs of settings.

+				 * @param array $instance The array of widget settings.

+				 */

+				$title_tag_arr = apply_filters('geodir_popular_post_view_title_tag',$title_tag_arr,$instance);

+				?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('title_tag'); ?>"

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

                     <?php

-                    foreach($title_tag_arr as $title_val => $title_title){

-                        echo "<option value='$title_val' ".selected($title_tag,$title_val)." >$title_title</option>";

-                    }

-                    ?>

+					foreach($title_tag_arr as $title_val => $title_title){

+						echo "<option value='$title_val' ".selected($title_tag,$title_val)." >$title_title</option>";

+					}

+					?>

                 </select>

             </label>

         </p>

@@ -442,24 +442,24 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"

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

                     <option <?php if ($layout == 'gridview_onehalf') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onethird') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onefourth') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onefifth') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'list') {

-                        echo 'selected="selected"';

-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>

 

                 </select>

             </label>

@@ -529,8 +529,8 @@ 
                 for="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"><?php _e('Use current viewing post type:', 'geodirectory'); ?>

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

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

-                    echo 'checked="checked"';

-                } ?>  value="1"/>

+					echo 'checked="checked"';

+				} ?>  value="1"/>

             </label>

         </p>

         <p>

@@ -578,7 +578,7 @@ 
         </script>

 

     <?php

-    }

+	}

 } // class geodir_popular_postview

 

 register_widget('geodir_popular_postview');
\ No newline at end of file

Spacing +37 added lines, -37 removed lines

@@ -61,7 +61,7 @@ 
         //save the widget

         $instance = $old_instance;

         $instance['title'] = strip_tags($new_instance['title']);

-        $category_limit = (int)$new_instance['category_limit'];

+        $category_limit = (int) $new_instance['category_limit'];

         $instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

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

         $instance['parent_only'] = !empty($new_instance['parent_only']) ? true : false;

@@ -81,10 +81,10 @@ 
     public function form($instance) 

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

 

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

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

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

         $category_limit = $category_limit > 0 ? $category_limit : 15;

         $default_post_type = isset($instance['default_post_type']) ? $instance['default_post_type'] : '';

         $parent_only = !empty($instance['parent_only']) ? true: false;

@@ -97,23 +97,23 @@ 
             </label>

         </p>

         <p>

-            <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Default post type to use (if not set by page)', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Default post type to use (if not set by page)', 'geodirectory'); ?>

                 <select class="widefat" id="<?php echo $this->get_field_id('default_post_type'); ?>" name="<?php echo $this->get_field_name('default_post_type'); ?>">

                 <?php foreach ($post_type_options as $name => $title) { ?>

-                    <option value="<?php echo $name;?>" <?php selected($name, $default_post_type);?>><?php echo $title; ?></option>

+                    <option value="<?php echo $name; ?>" <?php selected($name, $default_post_type); ?>><?php echo $title; ?></option>

                 <?php } ?>

                 </select>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('category_limit'); ?>"><?php _e('Customize categories count to appear by default:', 'geodirectory'); ?>

-                <input class="widefat" id="<?php echo $this->get_field_id('category_limit'); ?>" name="<?php echo $this->get_field_name('category_limit'); ?>" type="text" value="<?php echo (int)esc_attr($category_limit); ?>"/>

+                <input class="widefat" id="<?php echo $this->get_field_id('category_limit'); ?>" name="<?php echo $this->get_field_name('category_limit'); ?>" type="text" value="<?php echo (int) esc_attr($category_limit); ?>"/>

                 <p class="description" style="padding:0"><?php _e('After categories count reaches this limit option More Categories / Less Categoris will be displayed to show/hide categories. Default: 15', 'geodirectory'); ?></p>

             </label>

         </p>

         <p>

-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('parent_only'); ?>" name="<?php echo $this->get_field_name('parent_only'); ?>"<?php checked( $parent_only ); ?> value="1" />

-            <label for="<?php echo $this->get_field_id('parent_only'); ?>"><?php _e( 'Show parent categories only', 'geodirectory' ); ?></label>

+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('parent_only'); ?>" name="<?php echo $this->get_field_name('parent_only'); ?>"<?php checked($parent_only); ?> value="1" />

+            <label for="<?php echo $this->get_field_id('parent_only'); ?>"><?php _e('Show parent categories only', 'geodirectory'); ?></label>

         </p>

     <?php

     }

@@ -217,7 +217,7 @@ 
 	public function form($instance)

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

+        $instance = wp_parse_args((array) $instance,

             array('title' => '',

                 'post_type' => '',

                 'category' => array(),

@@ -272,9 +272,9 @@ 
 

         ?>

         <p>

-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

                 <small>(%posttype_singular_label% ,

-                    %posttype_plural_label% <?php _e('can be used', 'geodirectory');?>)

+                    %posttype_plural_label% <?php _e('can be used', 'geodirectory'); ?>)

                 </small>

 

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

@@ -285,7 +285,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>

 

                 <?php $postypes = geodir_get_posttypes();

 				/**

@@ -317,7 +317,7 @@ 
 

         <p id="post_type_cats">

             <label

-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>

 

                 <?php

 

@@ -356,13 +356,13 @@ 
 

                 <input type="hidden" name="<?php echo $this->get_field_name('category_title'); ?>"

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

-                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory');?>"/>

+                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory'); ?>"/>

 

             </label>

         </p>

 

         <p>

-            <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>

 

                 <?php

                 $list_sort_arr = array(

@@ -381,14 +381,14 @@ 
                  * @param array $list_sort_arr The array of key value pairs of settings.

                  * @param array $instance The array of widget settings.

                  */

-                $list_sort_arr = apply_filters('geodir_popular_post_view_list_sort',$list_sort_arr,$instance);

+                $list_sort_arr = apply_filters('geodir_popular_post_view_list_sort', $list_sort_arr, $instance);

                 ?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"

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

                     <?php

-                    foreach($list_sort_arr as $sort_val => $sort_title){

-                        echo "<option value='$sort_val' ".selected($list_sort,$sort_val)." >$sort_title</option>";

+                    foreach ($list_sort_arr as $sort_val => $sort_title) {

+                        echo "<option value='$sort_val' ".selected($list_sort, $sort_val)." >$sort_title</option>";

                     }

                     ?>

                 </select>

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

 

         <p>

-            <label for="<?php echo $this->get_field_id('title_tag'); ?>"><?php _e('Title tag:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('title_tag'); ?>"><?php _e('Title tag:', 'geodirectory'); ?>

 

                 <?php

                 $title_tag_arr = array(

@@ -411,14 +411,14 @@ 
                  * @param array $title_tag_arr The array of key value pairs of settings.

                  * @param array $instance The array of widget settings.

                  */

-                $title_tag_arr = apply_filters('geodir_popular_post_view_title_tag',$title_tag_arr,$instance);

+                $title_tag_arr = apply_filters('geodir_popular_post_view_title_tag', $title_tag_arr, $instance);

                 ?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('title_tag'); ?>"

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

                     <?php

-                    foreach($title_tag_arr as $title_val => $title_title){

-                        echo "<option value='$title_val' ".selected($title_tag,$title_val)." >$title_title</option>";

+                    foreach ($title_tag_arr as $title_val => $title_title) {

+                        echo "<option value='$title_val' ".selected($title_tag, $title_val)." >$title_title</option>";

                     }

                     ?>

                 </select>

@@ -428,7 +428,7 @@ 
         <p>

 

             <label

-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>

 

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

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

@@ -438,7 +438,7 @@ 
 

         <p>

             <label for="<?php echo $this->get_field_id('layout'); ?>">

-                <?php _e('Layout:', 'geodirectory');?>

+                <?php _e('Layout:', 'geodirectory'); ?>

                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"

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

                     <option <?php if ($layout == 'gridview_onehalf') {

@@ -467,7 +467,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory'); ?>

 

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

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

@@ -477,7 +477,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>

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

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

                        value="<?php echo esc_attr($character_count); ?>"/>

@@ -486,41 +486,41 @@ 
 

         <p>

             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

-                <?php _e('Enable Location Filter:', 'geodirectory');?>

+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>

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

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

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>

                        value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('show_featured_only'); ?>">

-                <?php _e('Show only featured listings:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only featured listings:', 'geodirectory'); ?> <input type="checkbox"

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

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

+                                                                                            name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>

                                                                                             value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('show_special_only'); ?>">

-                <?php _e('Show only listings with special offers:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with special offers:', 'geodirectory'); ?> <input type="checkbox"

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

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

+                                                                                                       name="<?php echo $this->get_field_name('show_special_only'); ?>" <?php if ($show_special_only) echo 'checked="checked"'; ?>

                                                                                                        value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('with_pics_only'); ?>">

-                <?php _e('Show only listings with pics:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with pics:', 'geodirectory'); ?> <input type="checkbox"

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

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

+                                                                                             name="<?php echo $this->get_field_name('with_pics_only'); ?>" <?php if ($with_pics_only) echo 'checked="checked"'; ?>

                                                                                              value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('with_videos_only'); ?>">

-                <?php _e('Show only listings with videos:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with videos:', 'geodirectory'); ?> <input type="checkbox"

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

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

+                                                                                               name="<?php echo $this->get_field_name('with_videos_only'); ?>" <?php if ($with_videos_only) echo 'checked="checked"'; ?>

                                                                                                value="1"/>

             </label>

         </p>

@@ -570,7 +570,7 @@ 
 

             }

 

-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>

+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>

             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();

 

             <?php } ?>

Braces +37 added lines, -14 removed lines

@@ -191,10 +191,11 @@ 
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);

         $instance['title_tag'] = strip_tags($new_instance['title_tag']);

         $instance['character_count'] = $new_instance['character_count'];

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

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

-        else

-            $instance['add_location_filter'] = '0';

+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 

         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

         $instance['show_special_only'] = isset($new_instance['show_special_only']) && $new_instance['show_special_only'] ? 1 : 0;

@@ -325,8 +326,9 @@ 
 

                 $all_postypes = geodir_get_posttypes();

 

-                if (!in_array($post_type, $all_postypes))

-                    $post_type = 'gd_place';

+                if (!in_array($post_type, $all_postypes)) {
+                                    $post_type = 'gd_place';
+                }
 

                 $category_taxonomy = geodir_get_taxonomies($post_type);

                 $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

@@ -341,8 +343,9 @@ 
                     } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) {

                         $selected = '';

-                        if (is_array($category) && in_array($category_obj->term_id, $category))

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

+                        if (is_array($category) && in_array($category_obj->term_id, $category)) {
+                                                    echo $selected = 'selected="selected"';
+                        }
 

                         ?>

 

@@ -356,7 +359,12 @@ 
 

                 <input type="hidden" name="<?php echo $this->get_field_name('category_title'); ?>"

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

-                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory');?>"/>

+                       value="<?php if ($category_title != '') {
+	echo $category_title;
+} else {
+	echo __('All', 'geodirectory');
+}
+?>"/>

 

             </label>

         </p>

@@ -488,7 +496,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

                 <?php _e('Enable Location Filter:', 'geodirectory');?>

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

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

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

@@ -496,7 +507,10 @@ 
             <label for="<?php echo $this->get_field_id('show_featured_only'); ?>">

                 <?php _e('Show only featured listings:', 'geodirectory');?> <input type="checkbox"

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

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

+                                                                                            name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                             value="1"/>

             </label>

         </p>

@@ -504,7 +518,10 @@ 
             <label for="<?php echo $this->get_field_id('show_special_only'); ?>">

                 <?php _e('Show only listings with special offers:', 'geodirectory');?> <input type="checkbox"

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

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

+                                                                                                       name="<?php echo $this->get_field_name('show_special_only'); ?>" <?php if ($show_special_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                                        value="1"/>

             </label>

         </p>

@@ -512,7 +529,10 @@ 
             <label for="<?php echo $this->get_field_id('with_pics_only'); ?>">

                 <?php _e('Show only listings with pics:', 'geodirectory');?> <input type="checkbox"

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

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

+                                                                                             name="<?php echo $this->get_field_name('with_pics_only'); ?>" <?php if ($with_pics_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                              value="1"/>

             </label>

         </p>

@@ -520,7 +540,10 @@ 
             <label for="<?php echo $this->get_field_id('with_videos_only'); ?>">

                 <?php _e('Show only listings with videos:', 'geodirectory');?> <input type="checkbox"

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

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

+                                                                                               name="<?php echo $this->get_field_name('with_videos_only'); ?>" <?php if ($with_videos_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                                value="1"/>

             </label>

         </p>

geodirectory-functions/privacy/class-geodir-privacy.php

Indentation +25 added lines, -25 removed lines

@@ -71,31 +71,31 @@
 	public function get_privacy_message() {
 
 		$content = '<h2>' . __( 'Listings', 'geodirectory' ) . '</h2>' .
-		           '<p>' . __( 'We collect information about you during the add listing process on our site. This information may include, but is not limited to, your name, email address, phone number, address, locations details including GPS co-ordinates and any other details that might be requested from you for the purpose of adding your business/personal listings.', 'geodirectory' ) . '</p>' .
-		           '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
-		           '<ul>' .
-		           '<li>' . __( '- Display this information in a public facing manner (such as a web page or API request) and allow website users to search and view submitted listing information.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Send you important account/order/service information.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Provide a way for users to contact your listing via the provided contact information.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Notify you of user interactions such as but not limited to review and contact notifications.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Respond to your queries or complaints.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'geodirectory' ) . '</li>' .
-		           '</ul>' .
-		           '<h2>' . __( 'Reviews', 'geodirectory' ) . '</h2>' .
-		           '<p>' . __( 'We collect information about you during the leave a review process on our site. This information may include, but is not limited to, your name, email address, IP address, website url, image(s), review ratings and review texts.', 'geodirectory' ) . '</p>' .
-		           '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
-		           '<ul>' .
-		           '<li>' . __( '- Display this information in a public facing manner (such as a web page or API request).', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Notify you of interactions such as approval or rejection of your review.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Notify you of user interactions such as reply notifications.', 'geodirectory' ) . '</li>' .
-		           '</ul>' .
-		           '<h2>' . __( 'Listing contact forms', 'geodirectory' ) . '</h2>' .
-		           '<p>' . __( 'We may collect information about you when you submit a contact form to a listing. This information may include, but is not limited to, your name, email address, IP address and contact texts.', 'geodirectory' ) . '</p>' .
-		           '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
-		           '<ul>' .
-		           '<li>' . __( '- Send your contact message and details to the listings contact email.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Monitor the contact system for spam and abuse.', 'geodirectory' ) . '</li>' .
-		           '</ul>';
+				   '<p>' . __( 'We collect information about you during the add listing process on our site. This information may include, but is not limited to, your name, email address, phone number, address, locations details including GPS co-ordinates and any other details that might be requested from you for the purpose of adding your business/personal listings.', 'geodirectory' ) . '</p>' .
+				   '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
+				   '<ul>' .
+				   '<li>' . __( '- Display this information in a public facing manner (such as a web page or API request) and allow website users to search and view submitted listing information.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Send you important account/order/service information.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Provide a way for users to contact your listing via the provided contact information.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Notify you of user interactions such as but not limited to review and contact notifications.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Respond to your queries or complaints.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'geodirectory' ) . '</li>' .
+				   '</ul>' .
+				   '<h2>' . __( 'Reviews', 'geodirectory' ) . '</h2>' .
+				   '<p>' . __( 'We collect information about you during the leave a review process on our site. This information may include, but is not limited to, your name, email address, IP address, website url, image(s), review ratings and review texts.', 'geodirectory' ) . '</p>' .
+				   '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
+				   '<ul>' .
+				   '<li>' . __( '- Display this information in a public facing manner (such as a web page or API request).', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Notify you of interactions such as approval or rejection of your review.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Notify you of user interactions such as reply notifications.', 'geodirectory' ) . '</li>' .
+				   '</ul>' .
+				   '<h2>' . __( 'Listing contact forms', 'geodirectory' ) . '</h2>' .
+				   '<p>' . __( 'We may collect information about you when you submit a contact form to a listing. This information may include, but is not limited to, your name, email address, IP address and contact texts.', 'geodirectory' ) . '</p>' .
+				   '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
+				   '<ul>' .
+				   '<li>' . __( '- Send your contact message and details to the listings contact email.', 'geodirectory' ) . '</li>' .
+				   '<li>' . __( '- Monitor the contact system for spam and abuse.', 'geodirectory' ) . '</li>' .
+				   '</ul>';
 
 
 		return apply_filters( 'geodir_privacy_policy_content', $content) ;

Doc Comments +4 added lines

@@ -285,6 +285,10 @@
 		return apply_filters( 'geodir_privacy_allow_erase_favorites_data', $allow );
 	}
 
+	/**
+	 * @param string $email_address
+	 * @param integer $page
+	 */
 	public static function favorites_by_user( $email_address, $page ) {
 		if ( empty( $email_address ) ) {
 			return array();

Spacing +86 added lines, -86 removed lines

@@ -6,7 +6,7 @@ 
  * @package GeoDirectory
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GeoDir_Privacy Class.
@@ -17,44 +17,44 @@ 
 	 * Init - hook into events.
 	 */
 	public function __construct() {
-		parent::__construct( __( 'GeoDirectory', 'geodirectory' ) );
+		parent::__construct(__('GeoDirectory', 'geodirectory'));
 
 		// Include supporting classes.
-		include_once( 'class-geodir-privacy-erasers.php' );
-		include_once( 'class-geodir-privacy-exporters.php' );
+		include_once('class-geodir-privacy-erasers.php');
+		include_once('class-geodir-privacy-exporters.php');
 
-		$gd_post_types = geodir_get_posttypes( 'object' );
+		$gd_post_types = geodir_get_posttypes('object');
 
-		if ( ! empty( $gd_post_types ) ) {
-			foreach ( $gd_post_types as $post_type => $info ) {
+		if (!empty($gd_post_types)) {
+			foreach ($gd_post_types as $post_type => $info) {
 				$name = $info->labels->name;
 
-				if ( self::allow_export_post_type_data( $post_type ) ) {
+				if (self::allow_export_post_type_data($post_type)) {
 					// This hook registers GeoDirectory data exporters.
-					$this->add_exporter( 'geodirectory-post-' . $post_type, wp_sprintf( __( 'User %s', 'geodirectory' ), $name ), array( 'GeoDir_Privacy_Exporters', 'post_data_exporter' ) );
+					$this->add_exporter('geodirectory-post-'.$post_type, wp_sprintf(__('User %s', 'geodirectory'), $name), array('GeoDir_Privacy_Exporters', 'post_data_exporter'));
 				}
 			}
 		}
 
 		// Handles custom anonomization types not included in core.
-		add_filter( 'wp_privacy_anonymize_data', array( $this, 'anonymize_custom_data_types' ), 10, 3 );
+		add_filter('wp_privacy_anonymize_data', array($this, 'anonymize_custom_data_types'), 10, 3);
 
-		if ( self::allow_export_reviews_data() ) {
+		if (self::allow_export_reviews_data()) {
 			// Review data export
-			add_filter( 'wp_privacy_personal_data_export_page', array( 'GeoDir_Privacy_Exporters', 'review_data_exporter' ), 10, 7 );
+			add_filter('wp_privacy_personal_data_export_page', array('GeoDir_Privacy_Exporters', 'review_data_exporter'), 10, 7);
 		}
 
-		if ( self::allow_erase_reviews_data() ) {
+		if (self::allow_erase_reviews_data()) {
 			// Review data erase
-			$this->add_eraser( 'geodirectory-post-reviews', __( 'User Listing Reviews', 'geodirectory' ), array( 'GeoDir_Privacy_Erasers', 'review_data_eraser' ) );
+			$this->add_eraser('geodirectory-post-reviews', __('User Listing Reviews', 'geodirectory'), array('GeoDir_Privacy_Erasers', 'review_data_eraser'));
 		}
 
 		// Post favorites
-		if ( self::allow_export_favorites_data() ) {
-			$this->add_exporter( 'geodirectory-post-favorites', __( 'GeoDirectory Favorite Listings', 'geodirectory' ), array( 'GeoDir_Privacy_Exporters', 'favorites_data_exporter' ) );
+		if (self::allow_export_favorites_data()) {
+			$this->add_exporter('geodirectory-post-favorites', __('GeoDirectory Favorite Listings', 'geodirectory'), array('GeoDir_Privacy_Exporters', 'favorites_data_exporter'));
 		}
-		if ( self::allow_erase_favorites_data() ) {
-			$this->add_eraser( 'geodirectory-post-favorites', __( 'GeoDirectory Favorite Listings', 'geodirectory' ), array( 'GeoDir_Privacy_Erasers', 'favorites_data_eraser' ) );
+		if (self::allow_erase_favorites_data()) {
+			$this->add_eraser('geodirectory-post-favorites', __('GeoDirectory Favorite Listings', 'geodirectory'), array('GeoDir_Privacy_Erasers', 'favorites_data_eraser'));
 		}
 	}
 
@@ -67,35 +67,35 @@ 
 	 */
 	public function get_privacy_message() {
 
-		$content = '<h2>' . __( 'Listings', 'geodirectory' ) . '</h2>' .
-		           '<p>' . __( 'We collect information about you during the add listing process on our site. This information may include, but is not limited to, your name, email address, phone number, address, locations details including GPS co-ordinates and any other details that might be requested from you for the purpose of adding your business/personal listings.', 'geodirectory' ) . '</p>' .
-		           '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
-		           '<ul>' .
-		           '<li>' . __( '- Display this information in a public facing manner (such as a web page or API request) and allow website users to search and view submitted listing information.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Send you important account/order/service information.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Provide a way for users to contact your listing via the provided contact information.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Notify you of user interactions such as but not limited to review and contact notifications.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Respond to your queries or complaints.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'geodirectory' ) . '</li>' .
-		           '</ul>' .
-		           '<h2>' . __( 'Reviews', 'geodirectory' ) . '</h2>' .
-		           '<p>' . __( 'We collect information about you during the leave a review process on our site. This information may include, but is not limited to, your name, email address, IP address, website url, image(s), review ratings and review texts.', 'geodirectory' ) . '</p>' .
-		           '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
-		           '<ul>' .
-		           '<li>' . __( '- Display this information in a public facing manner (such as a web page or API request).', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Notify you of interactions such as approval or rejection of your review.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Notify you of user interactions such as reply notifications.', 'geodirectory' ) . '</li>' .
-		           '</ul>' .
-		           '<h2>' . __( 'Listing contact forms', 'geodirectory' ) . '</h2>' .
-		           '<p>' . __( 'We may collect information about you when you submit a contact form to a listing. This information may include, but is not limited to, your name, email address, IP address and contact texts.', 'geodirectory' ) . '</p>' .
-		           '<p>' . __( 'Handling this data also allows us to:', 'geodirectory' ) . '</p>' .
-		           '<ul>' .
-		           '<li>' . __( '- Send your contact message and details to the listings contact email.', 'geodirectory' ) . '</li>' .
-		           '<li>' . __( '- Monitor the contact system for spam and abuse.', 'geodirectory' ) . '</li>' .
+		$content = '<h2>'.__('Listings', 'geodirectory').'</h2>'.
+		           '<p>'.__('We collect information about you during the add listing process on our site. This information may include, but is not limited to, your name, email address, phone number, address, locations details including GPS co-ordinates and any other details that might be requested from you for the purpose of adding your business/personal listings.', 'geodirectory').'</p>'.
+		           '<p>'.__('Handling this data also allows us to:', 'geodirectory').'</p>'.
+		           '<ul>'.
+		           '<li>'.__('- Display this information in a public facing manner (such as a web page or API request) and allow website users to search and view submitted listing information.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Send you important account/order/service information.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Provide a way for users to contact your listing via the provided contact information.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Notify you of user interactions such as but not limited to review and contact notifications.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Respond to your queries or complaints.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'geodirectory').'</li>'.
+		           '</ul>'.
+		           '<h2>'.__('Reviews', 'geodirectory').'</h2>'.
+		           '<p>'.__('We collect information about you during the leave a review process on our site. This information may include, but is not limited to, your name, email address, IP address, website url, image(s), review ratings and review texts.', 'geodirectory').'</p>'.
+		           '<p>'.__('Handling this data also allows us to:', 'geodirectory').'</p>'.
+		           '<ul>'.
+		           '<li>'.__('- Display this information in a public facing manner (such as a web page or API request).', 'geodirectory').'</li>'.
+		           '<li>'.__('- Notify you of interactions such as approval or rejection of your review.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Notify you of user interactions such as reply notifications.', 'geodirectory').'</li>'.
+		           '</ul>'.
+		           '<h2>'.__('Listing contact forms', 'geodirectory').'</h2>'.
+		           '<p>'.__('We may collect information about you when you submit a contact form to a listing. This information may include, but is not limited to, your name, email address, IP address and contact texts.', 'geodirectory').'</p>'.
+		           '<p>'.__('Handling this data also allows us to:', 'geodirectory').'</p>'.
+		           '<ul>'.
+		           '<li>'.__('- Send your contact message and details to the listings contact email.', 'geodirectory').'</li>'.
+		           '<li>'.__('- Monitor the contact system for spam and abuse.', 'geodirectory').'</li>'.
 		           '</ul>';
 
 
-		return apply_filters( 'geodir_privacy_policy_content', $content) ;
+		return apply_filters('geodir_privacy_policy_content', $content);
 	}
 
 	/**
@@ -106,10 +106,10 @@ 
 	 * @param string $data The data being anonymized.
 	 * @return string Anonymized string.
 	 */
-	public function anonymize_custom_data_types( $anonymous, $type, $data ) {
-		switch ( $type ) {
+	public function anonymize_custom_data_types($anonymous, $type, $data) {
+		switch ($type) {
 			case 'phone':
-				$anonymous = preg_replace( '/\d/u', '0', $data );
+				$anonymous = preg_replace('/\d/u', '0', $data);
 				break;
 			case 'numeric_id':
 				$anonymous = 0;
@@ -122,46 +122,46 @@ 
 	}
 
 	public static function personal_data_exporter_key() {
-		if ( ! wp_doing_ajax() ) {
+		if (!wp_doing_ajax()) {
 			return false;
 		}
 
-		if ( empty( $_POST['id'] ) ) {
+		if (empty($_POST['id'])) {
 			return false;
 		}
 		$request_id = (int) $_POST['id'];
 
-		if ( $request_id < 1 ) {
+		if ($request_id < 1) {
 			return false;
 		}
 
-		if ( ! current_user_can( 'export_others_personal_data' ) ) {
+		if (!current_user_can('export_others_personal_data')) {
 			return false;
 		}
 
 		// Get the request data.
-		$request = wp_get_user_request_data( $request_id );
+		$request = wp_get_user_request_data($request_id);
 
-		if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+		if (!$request || 'export_personal_data' !== $request->action_name) {
 			return false;
 		}
 
 		$email_address = $request->email;
-		if ( ! is_email( $email_address ) ) {
+		if (!is_email($email_address)) {
 			return false;
 		}
 
-		if ( ! isset( $_POST['exporter'] ) ) {
+		if (!isset($_POST['exporter'])) {
 			return false;
 		}
 		$exporter_index = (int) $_POST['exporter'];
 
-		if ( ! isset( $_POST['page'] ) ) {
+		if (!isset($_POST['page'])) {
 			return false;
 		}
 		$page = (int) $_POST['page'];
 
-		$send_as_email = isset( $_POST['sendAsEmail'] ) ? ( 'true' === $_POST['sendAsEmail'] ) : false;
+		$send_as_email = isset($_POST['sendAsEmail']) ? ('true' === $_POST['sendAsEmail']) : false;
 
 		/**
 		 * Filters the array of exporter callbacks.
@@ -182,37 +182,37 @@ 
 		 *     }
 		 * }
 		 */
-		$exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+		$exporters = apply_filters('wp_privacy_personal_data_exporters', array());
 
-		if ( ! is_array( $exporters ) ) {
+		if (!is_array($exporters)) {
 			return false;
 		}
 
 		// Do we have any registered exporters?
-		if ( 0 < count( $exporters ) ) {
-			if ( $exporter_index < 1 ) {
+		if (0 < count($exporters)) {
+			if ($exporter_index < 1) {
 				return false;
 			}
 
-			if ( $exporter_index > count( $exporters ) ) {
+			if ($exporter_index > count($exporters)) {
 				return false;
 			}
 
-			if ( $page < 1 ) {
+			if ($page < 1) {
 				return false;
 			}
 
-			$exporter_keys = array_keys( $exporters );
-			$exporter_key  = $exporter_keys[ $exporter_index - 1 ];
-			$exporter      = $exporters[ $exporter_key ];
+			$exporter_keys = array_keys($exporters);
+			$exporter_key  = $exporter_keys[$exporter_index - 1];
+			$exporter      = $exporters[$exporter_key];
 			
-			if ( ! is_array( $exporter ) || empty( $exporter_key ) ) {
+			if (!is_array($exporter) || empty($exporter_key)) {
 				return false;
 			}
-			if ( ! array_key_exists( 'exporter_friendly_name', $exporter ) ) {
+			if (!array_key_exists('exporter_friendly_name', $exporter)) {
 				return false;
 			}
-			if ( ! array_key_exists( 'callback', $exporter ) ) {
+			if (!array_key_exists('callback', $exporter)) {
 				return false;
 			}
 		}
@@ -230,7 +230,7 @@ 
 		 * @param int    $request_id      The privacy request post ID associated with this request.
 		 * @param bool   $send_as_email   Whether the final results of the export should be emailed to the user.
 		 */
-		$exporter_key = apply_filters( 'geodir_privacy_personal_data_exporter', $exporter_key, $exporter, $exporter_index, $email_address, $page, $request_id, $send_as_email );
+		$exporter_key = apply_filters('geodir_privacy_personal_data_exporter', $exporter_key, $exporter, $exporter_index, $email_address, $page, $request_id, $send_as_email);
 
 		return $exporter_key;
 	}
@@ -238,66 +238,66 @@ 
 	public static function exporter_post_type() {
 		$exporter_key = self::personal_data_exporter_key();
 
-		if ( empty( $exporter_key ) ) {
+		if (empty($exporter_key)) {
 			return false;
 		}
 
-		if ( strpos( $exporter_key, 'geodirectory-post-' ) !== 0 ) {
+		if (strpos($exporter_key, 'geodirectory-post-') !== 0) {
 			return false;
 		}
 
-		$post_type = str_replace( 'geodirectory-post-', '', $exporter_key );
+		$post_type = str_replace('geodirectory-post-', '', $exporter_key);
 
-		if ( $post_type != '' && in_array( $post_type, geodir_get_posttypes() ) ) {
+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
 			return $post_type;
 		}
 
 		return false;
 	}
 
-	public static function allow_export_post_type_data( $post_type ) {
+	public static function allow_export_post_type_data($post_type) {
 		$allow = true;
 
-		return apply_filters( 'geodir_privacy_allow_export_post_type_data', $allow, $post_type );
+		return apply_filters('geodir_privacy_allow_export_post_type_data', $allow, $post_type);
 	}
 
 	public static function allow_export_reviews_data() {
 		$allow = true;
 
-		return apply_filters( 'geodir_privacy_allow_export_reviews_data', $allow );
+		return apply_filters('geodir_privacy_allow_export_reviews_data', $allow);
 	}
 
 	public static function allow_erase_reviews_data() {
 		$allow = true;
 
-		return apply_filters( 'geodir_privacy_allow_erase_reviews_data', $allow );
+		return apply_filters('geodir_privacy_allow_erase_reviews_data', $allow);
 	}
 
 	public static function allow_export_favorites_data() {
 		$allow = true;
 
-		return apply_filters( 'geodir_privacy_allow_export_favorites_data', $allow );
+		return apply_filters('geodir_privacy_allow_export_favorites_data', $allow);
 	}
 
 	public static function allow_erase_favorites_data() {
 		$allow = true;
 
-		return apply_filters( 'geodir_privacy_allow_erase_favorites_data', $allow );
+		return apply_filters('geodir_privacy_allow_erase_favorites_data', $allow);
 	}
 
-	public static function favorites_by_user( $email_address, $page ) {
-		if ( empty( $email_address ) ) {
+	public static function favorites_by_user($email_address, $page) {
+		if (empty($email_address)) {
 			return array();
 		}
 
-		$user = get_user_by( 'email', $email_address );
-		if ( empty( $user ) ) {
+		$user = get_user_by('email', $email_address);
+		if (empty($user)) {
 			return array();
 		}
 
-		$favourites = geodir_get_user_favourites( $user->ID );
+		$favourites = geodir_get_user_favourites($user->ID);
 
-		return ( ! empty( $favourites ) && is_array( $favourites ) ? $favourites : array() );
+		return (!empty($favourites) && is_array($favourites) ? $favourites : array());
 	}
 }
 

geodirectory-functions/privacy/abstract-geodir-privacy.php

Spacing +17 added lines, -17 removed lines

@@ -6,7 +6,7 @@ 
  * @package GeoDirectory
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Abstract class that is intended to be extended by specific privacy class. 
@@ -43,7 +43,7 @@ 
 	 *
 	 * @param string $name Plugin identifier.
 	 */
-	public function __construct( $name = '' ) {
+	public function __construct($name = '') {
 		$this->name = $name;
 		$this->init();
 	}
@@ -52,11 +52,11 @@ 
 	 * Hook in events.
 	 */
 	protected function init() {
-		add_action( 'admin_init', array( $this, 'add_privacy_message' ) );
+		add_action('admin_init', array($this, 'add_privacy_message'));
 		// Register data exporters
-		add_filter( 'wp_privacy_personal_data_exporters', array( $this, 'register_exporters' ), 5 );
+		add_filter('wp_privacy_personal_data_exporters', array($this, 'register_exporters'), 5);
 		// Register data erasers
-		add_filter( 'wp_privacy_personal_data_erasers', array( $this, 'register_erasers' ) );
+		add_filter('wp_privacy_personal_data_erasers', array($this, 'register_erasers'));
 	}
 
 	/**
@@ -65,8 +65,8 @@ 
 	public function add_privacy_message() {
 		$content = $this->get_privacy_message();
 
-		if ( function_exists( 'wp_add_privacy_policy_content' ) && $content ) {
-			wp_add_privacy_policy_content( $this->name, $this->get_privacy_message() );
+		if (function_exists('wp_add_privacy_policy_content') && $content) {
+			wp_add_privacy_policy_content($this->name, $this->get_privacy_message());
 		}
 	}
 
@@ -86,9 +86,9 @@ 
 	 * @param array $exporters List of exporter callbacks.
 	 * @return array
 	 */
-	public function register_exporters( $exporters = array() ) {
-		foreach ( $this->exporters as $id => $exporter ) {
-			$exporters[ $id ] = $exporter;
+	public function register_exporters($exporters = array()) {
+		foreach ($this->exporters as $id => $exporter) {
+			$exporters[$id] = $exporter;
 		}
 		return $exporters;
 	}
@@ -99,9 +99,9 @@ 
 	 * @param array $erasers List of eraser callbacks.
 	 * @return array
 	 */
-	public function register_erasers( $erasers = array() ) {
-		foreach ( $this->erasers as $id => $eraser ) {
-			$erasers[ $id ] = $eraser;
+	public function register_erasers($erasers = array()) {
+		foreach ($this->erasers as $id => $eraser) {
+			$erasers[$id] = $eraser;
 		}
 		return $erasers;
 	}
@@ -113,8 +113,8 @@ 
 	 * @param string $name     Exporter name.
 	 * @param string $callback Exporter callback.
 	 */
-	public function add_exporter( $id, $name, $callback ) {
-		$this->exporters[ $id ] = array(
+	public function add_exporter($id, $name, $callback) {
+		$this->exporters[$id] = array(
 			'exporter_friendly_name' => $name,
 			'callback'               => $callback,
 		);
@@ -128,8 +128,8 @@ 
 	 * @param string $name     Exporter name.
 	 * @param string $callback Exporter callback.
 	 */
-	public function add_eraser( $id, $name, $callback ) {
-		$this->erasers[ $id ] = array(
+	public function add_eraser($id, $name, $callback) {
+		$this->erasers[$id] = array(
 			'eraser_friendly_name' => $name,
 			'callback'             => $callback,
 		);

geodirectory_functions.php

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@
 
 global $wp_version;
 // If curent WP Version >= 4.9.6.
-if ( version_compare( $wp_version, '4.9.6', '>=' ) ) {
-	include_once( 'geodirectory-functions/privacy/abstract-geodir-privacy.php' );
-	include_once( 'geodirectory-functions/privacy/class-geodir-privacy.php' );
+if (version_compare($wp_version, '4.9.6', '>=')) {
+	include_once('geodirectory-functions/privacy/abstract-geodir-privacy.php');
+	include_once('geodirectory-functions/privacy/class-geodir-privacy.php');
 }
\ No newline at end of file