GeoDirectory / geodirectory

geodirectory-functions/compatibility/Multi_News.php

Braces +4 added lines, -2 removed lines

@@ -126,8 +126,10 @@
     $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
     if (preg_match_all("/$regexp/siU", $crums, $matches)) {
         return $matches[0];
-    } else return '';
-}
+    } else {
+    	return '';
+    }
+    }
 
 
 /**

Indentation +87 added lines, -87 removed lines

@@ -16,36 +16,36 @@ 
  */
 function multi_news_action_calls()
 {
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    //ADD BREADCRUMS
-    add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
-
-
-    // fix breadcrums
-    add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-
-    add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
-    add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	//ADD BREADCRUMS
+	add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	//add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
+
+
+	// fix breadcrums
+	add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	// remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+
+	add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
+	add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
 }
 
 /**
@@ -57,11 +57,11 @@ 
  */
 function gd_mn_extra_wrap($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '<div class="site-content page-wrap">';
-    } elseif ($page == 'signup-page') {
-        echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
-    }
+	if ($page == 'add-listing-page') {
+		echo '<div class="site-content page-wrap">';
+	} elseif ($page == 'signup-page') {
+		echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
+	}
 
 }
 
@@ -75,9 +75,9 @@ 
  */
 function gd_mn_extra_wrap_end($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '</div>';
-    }
+	if ($page == 'add-listing-page') {
+		echo '</div>';
+	}
 
 }
 
@@ -91,13 +91,13 @@ 
 function gd_mn_replace_breadcrums()
 {
 
-    if (mom_option('breadcrumb') != 0) { ?>
+	if (mom_option('breadcrumb') != 0) { ?>
         <?php if (mom_option('cats_bread')) {
-            $cclass = '';
-            if (mom_option('cat_slider') == false) {
-                $cclass = 'post-crumbs ';
-            }
-            ?>
+			$cclass = '';
+			if (mom_option('cat_slider') == false) {
+				$cclass = 'post-crumbs ';
+			}
+			?>
             <div class="<?php echo $cclass; ?>entry-crumbs" xmlns:v="http://rdf.data-vocabulary.org/#">
 
                 <?php mom_breadcrumb(); ?>
@@ -119,14 +119,14 @@ 
  */
 function gd_get_breadcrum_links()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $crums = ob_get_contents();
-    ob_get_clean();
-    $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
-    if (preg_match_all("/$regexp/siU", $crums, $matches)) {
-        return $matches[0];
-    } else return '';
+	ob_start();
+	geodir_breadcrumb();
+	$crums = ob_get_contents();
+	ob_get_clean();
+	$regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
+	if (preg_match_all("/$regexp/siU", $crums, $matches)) {
+		return $matches[0];
+	} else return '';
 }
 
 
@@ -140,30 +140,30 @@ 
  */
 function gd_breadcrumbs_plus_items($items)
 {   //print_r($items);exit;
-    $bits = array();
-    $pieces = gd_get_breadcrum_links();
-    //unset($pieces[0]);
-    $bits = $pieces;
+	$bits = array();
+	$pieces = gd_get_breadcrum_links();
+	//unset($pieces[0]);
+	$bits = $pieces;
 
-    $title = $items['last'];
-    if (is_page_geodir_home() || geodir_is_page('location')) {
+	$title = $items['last'];
+	if (is_page_geodir_home() || geodir_is_page('location')) {
 
-    } elseif (geodir_is_page('listing')) {
+	} elseif (geodir_is_page('listing')) {
 
-    } elseif (geodir_is_page('detail')) {
-        ob_start();
-        geodir_action_page_title();
-        $title = ob_get_contents();
-        ob_end_clean();
-    } elseif (geodir_is_page('search')) {
-    } elseif (geodir_is_page('author')) {
-    }
+	} elseif (geodir_is_page('detail')) {
+		ob_start();
+		geodir_action_page_title();
+		$title = ob_get_contents();
+		ob_end_clean();
+	} elseif (geodir_is_page('search')) {
+	} elseif (geodir_is_page('author')) {
+	}
 
-    $title = strip_tags($title);
-    $items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
+	$title = strip_tags($title);
+	$items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
 
 
-    return $items;
+	return $items;
 }
 
 
@@ -179,28 +179,28 @@ 
  */
 function gd_breadcrumbs_plus_items_add($items, $bits, $last)
 {
-    //$pieces = explode("</div>", $items[0]);
-    if (is_array($bits)) {
-        $items = array();
-        $pieces = '';
-        foreach ($bits as $bit) {
-            $pieces .= $bit;
-        }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
-        if (isset($last) && $last) {
-            $items['last'] = $last;
-        }
-    }
-
-    //print_r($items);
-    return $items;
+	//$pieces = explode("</div>", $items[0]);
+	if (is_array($bits)) {
+		$items = array();
+		$pieces = '';
+		foreach ($bits as $bit) {
+			$pieces .= $bit;
+		}
+		$items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+		if (isset($last) && $last) {
+			$items['last'] = $last;
+		}
+	}
+
+	//print_r($items);
+	return $items;
 
 }
 
 add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 function gd_multinews_mobile_menu_caret($html){
-    $html .= '<i class="responsive-caret"></i>';
-    return $html;
+	$html .= '<i class="responsive-caret"></i>';
+	return $html;
 
 }

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         foreach ($bits as $bit) {
             $pieces .= $bit;
         }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">'.$pieces."</div>";
         if (isset($last) && $last) {
             $items['last'] = $last;
         }
@@ -197,9 +197,9 @@ 
 
 }
 
-add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
-add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
-function gd_multinews_mobile_menu_caret($html){
+add_filter('geodir_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1);
+add_filter('geodir_location_switcher_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1);
+function gd_multinews_mobile_menu_caret($html) {
     $html .= '<i class="responsive-caret"></i>';
     return $html;
 

geodirectory-functions/geodir-class-session.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Geodir_Session Class.

Spacing +66 added lines, -66 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Geodir_Session Class.
@@ -46,44 +46,44 @@ 
 	public function __construct() {
 		$this->use_php_sessions = $this->use_php_sessions();
 
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
-				$this->prefix = '_' . get_current_blog_id();
+		if ($this->use_php_sessions) {
+			if (is_multisite()) {
+				$this->prefix = '_'.get_current_blog_id();
 			}
 
 			// Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+			add_action('init', array($this, 'maybe_start_session'), -2);
 		} else {
 			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
+			if (!defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'geodir_wp_session');
 			}
 
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-recursive-arrayaccess.php';
+			if (!class_exists('Recursive_ArrayAccess')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-recursive-arrayaccess.php';
 			}
             
-			if ( !class_exists( 'WP_Session_Utils' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-wp-session-utils.php';
+			if (!class_exists('WP_Session_Utils')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-wp-session-utils.php';
 			}
             
-			if ( defined( 'WP_CLI' ) && WP_CLI && !class_exists( 'WP_Session_Command' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/wp-cli.php';
+			if (defined('WP_CLI') && WP_CLI && !class_exists('WP_Session_Command')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/wp-cli.php';
 			}
 
-			if ( !class_exists( 'WP_Session' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-wp-session.php';
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/wp-session.php';
+			if (!class_exists('WP_Session')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-wp-session.php';
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 		}
 
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+		if (empty($this->session) && !$this->use_php_sessions) {
+			add_action('plugins_loaded', array($this, 'init'), -1);
 		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
+			add_action('init', array($this, 'init'), -1);
 		}
 	}
 
@@ -95,8 +95,8 @@ 
 	 * @return void
 	 */
 	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['gd'.$this->prefix]) && is_array($_SESSION['gd'.$this->prefix]) ? $_SESSION['gd'.$this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -112,10 +112,10 @@ 
 	 * @return string Session ID
 	 */
 	public function get_id() {
-		if ( $this->use_php_sessions ) {
-			$session_id = !empty( $_SESSION ) && function_exists( 'session_id' ) ? session_id() : NULL;
+		if ($this->use_php_sessions) {
+			$session_id = !empty($_SESSION) && function_exists('session_id') ? session_id() : NULL;
 		} else {
-			$session_id = !empty( $this->session ) && isset( $this->session->session_id ) ? $this->session->session_id : NULL;
+			$session_id = !empty($this->session) && isset($this->session->session_id) ? $this->session->session_id : NULL;
 		}
 		return $session_id;
 	}
@@ -128,9 +128,9 @@ 
 	 * @param string $key Session key
 	 * @return string Session variable
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+	public function get($key) {
+		$key = sanitize_key($key);
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 	}
 
 	/**
@@ -142,20 +142,20 @@ 
 	 * @param integer $value Session variable
 	 * @return string Session variable
 	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
+	public function set($key, $value) {
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = maybe_serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd'.$this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 	
 	/**
@@ -167,29 +167,29 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
+	public function un_set($key) {
+		if (empty($key)) {
 			return false;
 		}
 		
-		if ( is_array( $key ) ) {
+		if (is_array($key)) {
 			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+				$index = sanitize_key($index);
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
+				if ($index && isset($this->session[$index])) {
+					unset($this->session[$index]);
 				}
 			}
 		} else {
-			$key = sanitize_key( $key );
+			$key = sanitize_key($key);
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
+			if (isset($this->session[$key])) {
+				unset($this->session[$key]);
 			}
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd'.$this->prefix] = $this->session;
 		}
 
 		return true;
@@ -204,14 +204,14 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+	public function is_set($key) {
+		$key = sanitize_key($key);
 		
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		if ( isset( $this->session[ $key ] ) ) {
+		if (isset($this->session[$key])) {
 			return true;
 		}
 
@@ -226,8 +226,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
+	public function set_expiration_variant_time($exp) {
+		return (30 * 60 * 23);
 	}
 
 	/**
@@ -238,8 +238,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
+	public function set_expiration_time($exp) {
+		return (30 * 60 * 24);
 	}
 
 	/**
@@ -257,18 +257,18 @@ 
 		$ret = false;
 
 		// If the database variable is already set, no need to run autodetection
-		$geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
+		$geodir_use_php_sessions = (bool) get_option('geodir_use_php_sessions');
 
-		if (!$geodir_use_php_sessions ) {
+		if (!$geodir_use_php_sessions) {
 			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'geodir_use_php_sessions', 1 );
+			if (function_exists('session_start') && !ini_get('safe_mode')) {
+				$this->set('geodir_use_php_sessions', 1);
 				
-				if ( $this->get( 'geodir_use_php_sessions' ) ) {
+				if ($this->get('geodir_use_php_sessions')) {
 					$ret = true;
 
 					// Set the database option
-					update_option( 'geodir_use_php_sessions', true );
+					update_option('geodir_use_php_sessions', true);
 				}
 			}
 		} else {
@@ -276,20 +276,20 @@ 
 		}
 
 		// Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
-		if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
+		if (defined('GEODIR_USE_PHP_SESSIONS') && GEODIR_USE_PHP_SESSIONS) {
 			$ret = true;
-		} else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
+		} else if (defined('GEODIR_USE_PHP_SESSIONS') && !GEODIR_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
+		return (bool) apply_filters('geodir_use_php_sessions', $ret);
 	}
 
 	/**
 	 * Starts a new session if one hasn't started yet.
 	 */
 	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
+		if (!session_id() && !headers_sent()) {
 			session_start();
 		}
 	}

geodirectory-functions/template_functions.php

Braces +58 added lines, -26 removed lines

@@ -47,16 +47,19 @@ 
 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             if (empty($post_type) && !isset($_REQUEST['pid'])) {

                 $pagename = $wp->query_vars['pagename'];

                 $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+                if (!empty($post_types)) {
+                                    $post_type = $post_types[0];
+                }
 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+				if($sc_post_type != '' ) {
+									$post_type = $sc_post_type;
+				}
 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

@@ -71,14 +74,16 @@ 
             $success_page_id = geodir_success_page_id();

             if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

             break;

         case 'detail':

         case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

+            if (in_array(get_post_type(), geodir_get_posttypes())) {
+                            $post_type = get_post_type();
+            }
             return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

             break;

         case 'listing':

@@ -184,7 +189,9 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        }
 

         /**

          * Filter the signup template path.

@@ -202,7 +209,9 @@ 
 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+            }
             /**

              * Filter the information template path.

              *

@@ -219,7 +228,9 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) {
+                	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+                }
                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +252,9 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';
+        }
         /**

          * Filter the add listing template path.

          *

@@ -258,7 +271,9 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the preview template path.

          *

@@ -274,7 +289,9 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';
+        }
         /**

          * Filter the success template path.

          *

@@ -289,7 +306,9 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the detail template path.

          *

@@ -304,7 +323,9 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';
+        }
         /**

          * Filter the listing template path.

          *

@@ -319,7 +340,9 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';
+        }
         /**

          * Filter the search template path.

          *

@@ -334,7 +357,9 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';
+        }
         /**

          * Filter the author template path.

          *

@@ -355,7 +380,9 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';
+            }
             /**

              * Filter the home page template path.

              *

@@ -368,7 +395,9 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';
+            }
             /**

              * Filter the location template path.

              *

@@ -377,8 +406,9 @@ 
              */

             return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+        } else {
+                    return $template;
+        }
 

     }

 

@@ -432,8 +462,10 @@ 
          * @since 1.0.0

          */

         include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+    else {
+    	:

+        locate_template(array("geodirectory/" . $template_name), true, false);
+    }
     endif;

 

 }

Indentation +349 added lines, -349 removed lines

@@ -19,18 +19,18 @@ 
  */

 function geodir_locate_template($template = '')

 {

-    global $post_type, $wp, $post;

-    $fields = array();

+	global $post_type, $wp, $post;

+	$fields = array();

 

-    switch ($template):

-        case 'signup':

-            return $template = locate_template(array("geodirectory/geodir-signup.php"));

-            break;

-        case 'add-listing':

+	switch ($template):

+		case 'signup':

+			return $template = locate_template(array("geodirectory/geodir-signup.php"));

+			break;

+		case 'add-listing':

 

-            $sc_post_type = '';

+			$sc_post_type = '';

 			if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

-                $listing_page_id = $post->ID;

+				$listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

 				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

@@ -39,100 +39,100 @@ 
 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

 					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

 				}

-            } else {

-                $listing_page_id = geodir_add_listing_page_id();

-            }

+			} else {

+				$listing_page_id = geodir_add_listing_page_id();

+			}

 			

 			$is_wpml = function_exists('icl_object_id') ? true : false;

 

-            if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            if (empty($post_type) && !isset($_REQUEST['pid'])) {

-                $pagename = $wp->query_vars['pagename'];

-                $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+			if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			if (empty($post_type) && !isset($_REQUEST['pid'])) {

+				$pagename = $wp->query_vars['pagename'];

+				$post_types = geodir_get_posttypes();

+				if (!empty($post_types))

+					$post_type = $post_types[0];

 					

 				if($sc_post_type != '' )

 					$post_type = $sc_post_type;

 				

-                if ($is_wpml && !empty($wp->query_vars['page_id'])) {

+				if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

 					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

 				}

-                gd_die();

-            }

-            return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

-            break;

-        case 'success':

-            $success_page_id = geodir_success_page_id();

-            if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

-            break;

-        case 'detail':

-        case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

-            return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

-            break;

-        case 'listing':

-            $templates = array();

-            if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

-                $post_type = get_post_type();

-                $templates[] = "geodirectory/archive-$post_type.php";

-            }

-

-

-            if (is_tax() && geodir_get_taxonomy_posttype()) {

-                $query_obj = get_queried_object();

-                $curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

-                $curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

-            }

-

-            $templates[] = "geodirectory/geodir-listing.php";

-

-            return $template = locate_template($templates);

-            break;

-        case 'information':

-            return $template = locate_template(array("geodirectory/geodir-information.php"));

-            break;

-        case 'author':

-            return $template = locate_template(array("geodirectory/geodir-author.php"));

-            break;

-        case 'search':

-            return $template = locate_template(array("geodirectory/geodir-search.php"));

-            break;

-        case 'location':

-            return $template = locate_template(array("geodirectory/geodir-location.php"));

-            break;

-        case 'geodir-home':

-            return $template = locate_template(array("geodirectory/geodir-home.php"));

-            break;

-        case 'listing-listview':

-            $template = locate_template(array("geodirectory/listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

-            }

-            return $template;

-            break;

-        case 'widget-listing-listview':

-            $template = locate_template(array("geodirectory/widget-listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

-            }

-            return $template;

-            break;

-    endswitch;

-

-    return false;

+				gd_die();

+			}

+			return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

+			break;

+		case 'success':

+			$success_page_id = geodir_success_page_id();

+			if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

+			break;

+		case 'detail':

+		case 'preview':

+			if (in_array(get_post_type(), geodir_get_posttypes()))

+				$post_type = get_post_type();

+			return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

+			break;

+		case 'listing':

+			$templates = array();

+			if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

+				$post_type = get_post_type();

+				$templates[] = "geodirectory/archive-$post_type.php";

+			}

+

+

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

+				$query_obj = get_queried_object();

+				$curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

+				$curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

+			}

+

+			$templates[] = "geodirectory/geodir-listing.php";

+

+			return $template = locate_template($templates);

+			break;

+		case 'information':

+			return $template = locate_template(array("geodirectory/geodir-information.php"));

+			break;

+		case 'author':

+			return $template = locate_template(array("geodirectory/geodir-author.php"));

+			break;

+		case 'search':

+			return $template = locate_template(array("geodirectory/geodir-search.php"));

+			break;

+		case 'location':

+			return $template = locate_template(array("geodirectory/geodir-location.php"));

+			break;

+		case 'geodir-home':

+			return $template = locate_template(array("geodirectory/geodir-home.php"));

+			break;

+		case 'listing-listview':

+			$template = locate_template(array("geodirectory/listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+			}

+			return $template;

+			break;

+		case 'widget-listing-listview':

+			$template = locate_template(array("geodirectory/widget-listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+			}

+			return $template;

+			break;

+	endswitch;

+

+	return false;

 

 }

 

@@ -151,255 +151,255 @@ 
 function geodir_template_loader($template)

 {

 

-    global $wp_query;

-

-    /**

-     * Filter the custom page list.

-     *

-     * @since 1.0.0

-     */

-    $geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

-        'geodir_signup_page' =>

-            apply_filters('geodir_set_custom_signup_page', false),

-        'geodir_add_listing_page' =>

-            apply_filters('geodir_set_custom_add_listing_page', false),

-        'geodir_preview_page' =>

-            apply_filters('geodir_set_custom_preview_page', false),

-        'geodir_listing_success_page' =>

-            apply_filters('geodir_set_custom_listing_success_page', false),

-        'geodir_listing_detail_page' =>

-            apply_filters('geodir_set_custom_listing_detail_page', false),

-        'geodir_listing_page' =>

-            apply_filters('geodir_set_custom_listing_page', false),

-        'geodir_search_page' =>

-            apply_filters('geodir_set_custom_search_page', false),

-        'geodir_author_page' =>

-            apply_filters('geodir_set_custom_author_page', false),

-        'geodir_home_map_page' =>

-            apply_filters('geodir_set_custom_home_map_page', false)

-    ));

-

-

-    if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

-

-        $template = geodir_locate_template('signup');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

-

-        /**

-         * Filter the signup template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_signup', $template);

-    }

-

-    if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

-        if (!geodir_is_default_location_set()) {

-            global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

-

-            $template = geodir_locate_template('information');

-

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-            /**

-             * Filter the information template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_information', $template);

-        }

-        // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

-            /// WPML

-            if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

-                global $sitepress;

+	global $wp_query;

+

+	/**

+	 * Filter the custom page list.

+	 *

+	 * @since 1.0.0

+	 */

+	$geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

+		'geodir_signup_page' =>

+			apply_filters('geodir_set_custom_signup_page', false),

+		'geodir_add_listing_page' =>

+			apply_filters('geodir_set_custom_add_listing_page', false),

+		'geodir_preview_page' =>

+			apply_filters('geodir_set_custom_preview_page', false),

+		'geodir_listing_success_page' =>

+			apply_filters('geodir_set_custom_listing_success_page', false),

+		'geodir_listing_detail_page' =>

+			apply_filters('geodir_set_custom_listing_detail_page', false),

+		'geodir_listing_page' =>

+			apply_filters('geodir_set_custom_listing_page', false),

+		'geodir_search_page' =>

+			apply_filters('geodir_set_custom_search_page', false),

+		'geodir_author_page' =>

+			apply_filters('geodir_set_custom_author_page', false),

+		'geodir_home_map_page' =>

+			apply_filters('geodir_set_custom_home_map_page', false)

+	));

+

+

+	if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

+

+		$template = geodir_locate_template('signup');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+

+		/**

+		 * Filter the signup template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_signup', $template);

+	}

+

+	if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

+		if (!geodir_is_default_location_set()) {

+			global $information;

+			$information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+

+			$template = geodir_locate_template('information');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+			/**

+			 * Filter the information template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_information', $template);

+		}

+		// check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

+			/// WPML

+			if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

+				global $sitepress;

                 

-                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

-                $sitepress->switch_lang($lang_of_duplicate, true);

+				$lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

+				$sitepress->switch_lang($lang_of_duplicate, true);

         

-                $redirect_to = get_permalink(geodir_add_listing_page_id());

-                $_GET['pid'] = $duplicate_of;

-                if (!empty($_GET)) {

-                    $redirect_to = add_query_arg($_GET, $redirect_to);

-                }

-                wp_redirect($redirect_to);

-                exit;

-            }

-            /// WPML

+				$redirect_to = get_permalink(geodir_add_listing_page_id());

+				$_GET['pid'] = $duplicate_of;

+				if (!empty($_GET)) {

+					$redirect_to = add_query_arg($_GET, $redirect_to);

+				}

+				wp_redirect($redirect_to);

+				exit;

+			}

+			/// WPML

             

-            global $information;

-            $information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

-            $is_current_user_owner = geodir_listing_belong_to_current_user();

-            if (!$is_current_user_owner) {

-                $template = geodir_locate_template('information');

-

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-                /**

-                 * Filter the information template path.

-                 *

-                 * @since 1.0.0

-                 * @param string $template The template path.

-                 */

-                return $template = apply_filters('geodir_template_information', $template);

-            }

+			global $information;

+			$information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

+			$is_current_user_owner = geodir_listing_belong_to_current_user();

+			if (!$is_current_user_owner) {

+				$template = geodir_locate_template('information');

+

+				if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+				/**

+				 * Filter the information template path.

+				 *

+				 * @since 1.0.0

+				 * @param string $template The template path.

+				 */

+				return $template = apply_filters('geodir_template_information', $template);

+			}

+

 

+		}

 

-        }

+		//geodir_is_login(true);

+		global $current_user;

+		if (!$current_user->ID) {

+			wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

+			exit;

+		}

 

-        //geodir_is_login(true);

-        global $current_user;

-        if (!$current_user->ID) {

-            wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

-            exit;

-        }

+		$template = geodir_locate_template('add-listing');

 

-        $template = geodir_locate_template('add-listing');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

-        /**

-         * Filter the add listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_add_listing', $template);

-    }

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+		/**

+		 * Filter the add listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_add_listing', $template);

+	}

 

 

-    if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

-        global $preview;

-        $preview = true;

+	if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

+		global $preview;

+		$preview = true;

 

-        $template = geodir_locate_template('preview');

+		$template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the preview template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_preview', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the preview template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_preview', $template);

 

-    }

+	}

 

 

-    if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

+	if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

 

-        $template = geodir_locate_template('success');

+		$template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

-        /**

-         * Filter the success template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_success', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+		/**

+		 * Filter the success template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_success', $template);

 

-    }

+	}

 

-    if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

+	if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

 

-        $template = geodir_locate_template('detail');

+		$template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the detail template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_detail', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the detail template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_detail', $template);

 

-    }

+	}

 

-    if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

+	if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

 

-        $template = geodir_locate_template('listing');

+		$template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

-        /**

-         * Filter the listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_listing', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+		/**

+		 * Filter the listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_listing', $template);

 

-    }

+	}

 

-    if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

+	if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

 

-        $template = geodir_locate_template('search');

+		$template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

-        /**

-         * Filter the search template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_search', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+		/**

+		 * Filter the search template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_search', $template);

 

-    }

+	}

 

-    if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+	if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

 

-        $template = geodir_locate_template('author');

+		$template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

-        /**

-         * Filter the author template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_author', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+		/**

+		 * Filter the author template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_author', $template);

 

-    }

+	}

 

-    if ( geodir_is_page('home') || geodir_is_page('location')) {

+	if ( geodir_is_page('home') || geodir_is_page('location')) {

 

-        global $post, $wp_query;

+		global $post, $wp_query;

 

-        if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

-            || (is_home() && !$wp_query->is_posts_page)

-        ) {

+		if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

+			|| (is_home() && !$wp_query->is_posts_page)

+		) {

 

-            $template = geodir_locate_template('geodir-home');

+			$template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

-            /**

-             * Filter the home page template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_homepage', $template);

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+			/**

+			 * Filter the home page template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_homepage', $template);

 

-        } elseif (geodir_is_page('location')) {

+		} elseif (geodir_is_page('location')) {

 

-            $template = geodir_locate_template('location');

+			$template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

-            /**

-             * Filter the location template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_location', $template);

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+			/**

+			 * Filter the location template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+		} else

+			return $template;

 

-    }

+	}

 

-    return $template;

+	return $template;

 }

 

 /**

@@ -414,44 +414,44 @@ 
  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

-    global $geodirectory, $post;

-    /**

-     * Called at the start for the geodir_get_template_part() function.

-     *

-     * Used dynamic hook name: geodir_get_template_part_{$slug}

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $slug The template slug.

-     * @param string $name The template name.

-     */

-    do_action("geodir_get_template_part_{$slug}", $slug, $name);

-    $templates = array();

-    $name = (string)$name;

-    if ('' !== $name) {

-        $template_name = "{$slug}-{$name}.php";

-

-    } else {

-        $template_name = "{$slug}.php";

-    }

-

-    if (!locate_template(array("geodirectory/" . $template_name))) :

-        /**

-         * Filter the template part with slug and name.

-         *

-         * @since 1.0.0

-         * @param string $template_name The template name.

-         */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

-        /**

-         * Includes the template part with slug and name.

-         *

-         * @since 1.0.0

-         */

-        include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

-    endif;

+	global $geodirectory, $post;

+	/**

+	 * Called at the start for the geodir_get_template_part() function.

+	 *

+	 * Used dynamic hook name: geodir_get_template_part_{$slug}

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $slug The template slug.

+	 * @param string $name The template name.

+	 */

+	do_action("geodir_get_template_part_{$slug}", $slug, $name);

+	$templates = array();

+	$name = (string)$name;

+	if ('' !== $name) {

+		$template_name = "{$slug}-{$name}.php";

+

+	} else {

+		$template_name = "{$slug}.php";

+	}

+

+	if (!locate_template(array("geodirectory/" . $template_name))) :

+		/**

+		 * Filter the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 * @param string $template_name The template name.

+		 */

+		$template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+		/**

+		 * Includes the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 */

+		include($template);

+	else:

+		locate_template(array("geodirectory/" . $template_name), true, false);

+	endif;

 

 }

 

@@ -467,23 +467,23 @@ 
  */

 function geodir_core_post_view_extra_class($class, $all_postypes = '')

 {

-    global $post;

+	global $post;

 

-    if (!$all_postypes) {

-        $all_postypes = geodir_get_posttypes();

-    }

+	if (!$all_postypes) {

+		$all_postypes = geodir_get_posttypes();

+	}

 

-    $gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

-    $gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

-    $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

+	$gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

+	$gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

+	$gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

-    if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

-        $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

-    }

+	if ($gdp_post_id && $gdp_post_type) {

+		$append_class = 'gd-post-' . $gdp_post_type;

+		$append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

+		$class = $class != '' ? $class . ' ' . $append_class : $append_class;

+	}

 

-    return $class;

+	return $class;

 }

 

 /**

@@ -497,7 +497,7 @@ 
  * @param bool $favorite Listing Optional. Are favorite listings results? Default: false.

  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

-    if ($favorite) {

+	if ($favorite) {

 		$message = __('No favorite listings found which match your selection.', 'geodirectory');

 	} else {

 		$message = __('No listings found which match your selection.', 'geodirectory');

Spacing +35 added lines, -35 removed lines

@@ -55,13 +55,13 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

+				if ($sc_post_type != '')

 					$post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

-					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+					wp_redirect(trailingslashit(get_site_url()).$pagename.'/?listing_type='.$post_type);

 				}

                 gd_die();

             }

@@ -119,14 +119,14 @@ 
         case 'listing-listview':

             $template = locate_template(array("geodirectory/listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/listing-listview.php';

             }

             return $template;

             break;

         case 'widget-listing-listview':

             $template = locate_template(array("geodirectory/widget-listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/widget-listing-listview.php';

             }

             return $template;

             break;

@@ -184,7 +184,7 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-signup.php';

 

         /**

          * Filter the signup template path.

@@ -198,11 +198,11 @@ 
     if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

         if (!geodir_is_default_location_set()) {

             global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>');

 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

             /**

              * Filter the information template path.

              *

@@ -214,10 +214,10 @@ 
         // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

             /// WPML

-            if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

+            if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int) $_GET['pid'])) {

                 global $sitepress;

                 

-                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

+                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_'.get_post_type($duplicate_of));

                 $sitepress->switch_lang($lang_of_duplicate, true);

         

                 $redirect_to = get_permalink(geodir_add_listing_page_id());

@@ -236,7 +236,7 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

                 /**

                  * Filter the information template path.

                  *

@@ -258,7 +258,7 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/add-listing.php';

         /**

          * Filter the add listing template path.

          *

@@ -275,7 +275,7 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the preview template path.

          *

@@ -291,7 +291,7 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-success.php';

         /**

          * Filter the success template path.

          *

@@ -306,7 +306,7 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the detail template path.

          *

@@ -321,7 +321,7 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-listing.php';

         /**

          * Filter the listing template path.

          *

@@ -336,7 +336,7 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-search.php';

         /**

          * Filter the search template path.

          *

@@ -351,7 +351,7 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-author.php';

         /**

          * Filter the author template path.

          *

@@ -362,7 +362,7 @@ 
 

     }

 

-    if ( geodir_is_page('home') || geodir_is_page('location')) {

+    if (geodir_is_page('home') || geodir_is_page('location')) {

 

         global $post, $wp_query;

 

@@ -372,7 +372,7 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-home.php';

             /**

              * Filter the home page template path.

              *

@@ -385,7 +385,7 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-location.php';

             /**

              * Filter the location template path.

              *

@@ -427,7 +427,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -435,14 +435,14 @@ 
         $template_name = "{$slug}.php";

     }

 

-    if (!locate_template(array("geodirectory/" . $template_name))) :

+    if (!locate_template(array("geodirectory/".$template_name))) :

         /**

          * Filter the template part with slug and name.

          *

          * @since 1.0.0

          * @param string $template_name The template name.

          */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path().'/geodirectory-templates/'.$template_name);

         /**

          * Includes the template part with slug and name.

          *

@@ -450,7 +450,7 @@ 
          */

         include($template);

     else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+        locate_template(array("geodirectory/".$template_name), true, false);

     endif;

 

 }

@@ -478,9 +478,9 @@ 
     $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

     if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

+        $append_class = 'gd-post-'.$gdp_post_type;

         $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

+        $class = $class != '' ? $class.' '.$append_class : $append_class;

     }

 

     return $class;

@@ -512,7 +512,7 @@ 
 	 */

 	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+	echo '<li class="no-listing">'.$message.'</li>';

 }

 

 /**

@@ -541,7 +541,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -606,7 +606,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option '.selected((int) ($i + 1), (int) $default, false).' value="'.(int) ($i + 1).'">'.$text.'</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -635,14 +635,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fa fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

@@ -661,7 +661,7 @@ 
 		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

 		if ($full_color != '#757575') {

 			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

-			.gd-star-rating i.fa {color:' . stripslashes($full_color) . '!important;}</style>';

+			.gd-star-rating i.fa {color:' . stripslashes($full_color).'!important;}</style>';

 		}

 	}

 }
\ No newline at end of file

geodirectory-templates/preview-success.php

Indentation +31 added lines, -31 removed lines

@@ -15,29 +15,29 @@ 
     <?php

 

 

-    global $wpdb;

+	global $wpdb;

 

-    $post_id = $_REQUEST['pid'];

-    $post_info = get_post($post_id);

+	$post_id = $_REQUEST['pid'];

+	$post_info = get_post($post_id);

 

-    $posted_date = $post_info->post_date;

-    $productlink = get_permalink($post_id);

-    $siteName = get_bloginfo('name');

-    $siteurl = home_url();

-    $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+	$posted_date = $post_info->post_date;

+	$productlink = get_permalink($post_id);

+	$siteName = get_bloginfo('name');

+	$siteurl = home_url();

+	$siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

 

-    $loginurl = geodir_login_url();

-    $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+	$loginurl = geodir_login_url();

+	$loginurl_link = '<a href="' . $loginurl . '">login</a>';

 

-    $post_author = $post_info->post_author;

+	$post_author = $post_info->post_author;

 

-    $user_info = get_userdata($post_author);

-    $username = $user_info->user_login;

-    $user_email = $user_info->user_email;

+	$user_info = get_userdata($post_author);

+	$username = $user_info->user_login;

+	$user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+	$message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

 

-    /*

+	/*

      * Filter the success page message before variable replacements.

      *

      * @since 1.5.7

@@ -45,13 +45,13 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

 

-    $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

-    $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

-    $message = str_replace($search_array, $replace_array, $message);

+	$search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

+	$replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

+	$message = str_replace($search_array, $replace_array, $message);

 

-    /*

+	/*

      * Filter the success page message after variable replacements.

      *

      * @since 1.5.7

@@ -59,15 +59,15 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

 

 

 

-    ?>

+	?>

 

     <?php

 

-    /*

+	/*

      * Action called before the success page message wrapper.

      *

      * @since 1.5.7

@@ -75,11 +75,11 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

-    echo '<h5 class="geodir_information">';

-    echo $message;

-    echo '</h5>';

-    /*

+	do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+	echo '<h5 class="geodir_information">';

+	echo $message;

+	echo '</h5>';

+	/*

      * Action called after the success page message wrapper.

      *

      * @since 1.5.7

@@ -87,8 +87,8 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+	do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

 

-    ?>

+	?>

 

 </div>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -24,10 +24,10 @@ 
     $productlink = get_permalink($post_id);

     $siteName = get_bloginfo('name');

     $siteurl = home_url();

-    $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+    $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>';

 

     $loginurl = geodir_login_url();

-    $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+    $loginurl_link = '<a href="'.$loginurl.'">login</a>';

 

     $post_author = $post_info->post_author;

 

@@ -35,7 +35,7 @@ 
     $username = $user_info->user_login;

     $user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')), 'geodirectory'));

 

     /*

      * Filter the success page message before variable replacements.

@@ -45,7 +45,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message, $post_info, $user_info);

 

     $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

     $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

@@ -59,7 +59,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message, $post_info, $user_info);

 

 

 

@@ -75,7 +75,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+    do_action('geodir_before_success_page_msg_wrapper', $message, $post_info, $user_info);

     echo '<h5 class="geodir_information">';

     echo $message;

     echo '</h5>';

@@ -87,7 +87,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+    do_action('geodir_after_success_page_msg_wrapper', $message, $post_info, $user_info);

 

     ?>

 

geodirectory-widgets/geodirectory_bestof_widget.php

Braces +9 added lines, -5 removed lines

@@ -356,10 +356,11 @@ 
         $instance['character_count'] = $new_instance['character_count'];
         $instance['tab_layout'] = $new_instance['tab_layout'];
         $instance['excerpt_type'] = $new_instance['excerpt_type'];
-        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['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
         return $instance;
     }
@@ -510,7 +511,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>

Spacing +21 added lines, -21 removed lines

@@ -51,11 +51,11 @@ 
          * @param string $instance ['tab_layout'] Best of widget tab layout name.
          */
         $tab_layout = empty($instance['tab_layout']) ? 'bestof-tabs-on-top' : apply_filters('bestof_widget_tab_layout', $instance['tab_layout']);
-        echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
+        echo '<div class="bestof-widget-tab-layout '.$tab_layout.'">';
         echo $before_widget;
         $loc_terms = geodir_get_current_location_terms();
         if (!empty($loc_terms)) {
-            $cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
+            $cur_location = ' : '.geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
         } else {
             $cur_location = '';
         }
@@ -76,7 +76,7 @@ 
          *
          * @param string $instance ['title'] The widget title.
          */
-        $title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name') . $cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
+        $title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name').$cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
 
         /**
          * Filter the post type.
@@ -202,7 +202,7 @@ 
         }
 
 
-        echo $before_title . __($title,'geodirectory') . $after_title;
+        echo $before_title.__($title, 'geodirectory').$after_title;
 
         //term navigation - start
         echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
@@ -213,7 +213,7 @@ 
             $is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
 
             if ($is_dropdown) {
-                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr(__('Select Category', 'geodirectory')) . '">';
+                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="'.esc_attr(__('Select Category', 'geodirectory')).'">';
             } else {
                 $nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
                 $nav_html .= '<dt></dt>';
@@ -230,7 +230,7 @@ 
                     }
                     if ($is_dropdown) {
                         $selected = ($cat_count == 1) ? 'selected="selected"' : '';
-                        $nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
+                        $nav_html .= '<option '.$selected.' value="'.$cat->term_id.'">'.geodir_ucwords($cat->name).'</option>';
                     } else {
                         if ($cat_count == 1) {
                             $nav_html .= '<dd class="geodir-tab-active">';
@@ -238,8 +238,8 @@ 
                             $nav_html .= '<dd class="">';
                         }
                         $term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
-                        $nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
-                        $nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
+                        $nav_html .= '<a data-termid="'.$cat->term_id.'" href="'.get_term_link($cat, $cat->taxonomy).'">';
+                        $nav_html .= '<img alt="'.$cat->name.' icon" class="bestof-cat-icon" src="'.$term_icon_url.'"/>';
                         $nav_html .= '<span>';
                         $nav_html .= geodir_ucwords($cat->name);
                         $nav_html .= '<small>';
@@ -248,7 +248,7 @@ 
                             if ($num_reviews == 0) {
                                 $reviews = __('No Reviews', 'geodirectory');
                             } elseif ($num_reviews > 1) {
-                                $reviews = $num_reviews . __(' Reviews', 'geodirectory');
+                                $reviews = $num_reviews.__(' Reviews', 'geodirectory');
                             } else {
                                 $reviews = __('1 Review', 'geodirectory');
                             }
@@ -321,7 +321,7 @@ 
                  */
                 $view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
 
-                echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+                echo '<h3 class="bestof-cat-title">'.wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name).'<a href="'.esc_url($view_all_link).'">'.__("View all", 'geodirectory').'</a></h3>';
             }
             if ($excerpt_type == 'show-reviews') {
                 add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
@@ -378,7 +378,7 @@ 
      */
     public function form($instance)
     {
-        $instance = wp_parse_args((array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array(
                 'title' => '',
                 'post_type' => '',
@@ -403,7 +403,7 @@ 
 
         ?>
         <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'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -413,7 +413,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();
                 /**
@@ -445,7 +445,7 @@ 
         <p>
 
             <label
-                for="<?php echo $this->get_field_id('post_limit'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_limit'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('post_limit'); ?>"
                        name="<?php echo $this->get_field_name('post_limit'); ?>" type="text"
@@ -456,7 +456,7 @@ 
         <p>
 
             <label
-                for="<?php echo $this->get_field_id('categ_limit'); ?>"><?php _e('Number of categories:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('categ_limit'); ?>"><?php _e('Number of categories:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('categ_limit'); ?>"
                        name="<?php echo $this->get_field_name('categ_limit'); ?>" type="text"
@@ -466,7 +466,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); ?>"/>
@@ -474,7 +474,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('tab_layout'); ?>"><?php _e('Tab Layout:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('tab_layout'); ?>"><?php _e('Tab Layout:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('tab_layout'); ?>"
                         name="<?php echo $this->get_field_name('tab_layout'); ?>">
@@ -495,7 +495,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('excerpt_type'); ?>"><?php _e('Excerpt Type:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('excerpt_type'); ?>"><?php _e('Excerpt Type:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('excerpt_type'); ?>"
                         name="<?php echo $this->get_field_name('excerpt_type'); ?>">
@@ -512,9 +512,9 @@ 
 
         <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>
@@ -662,7 +662,7 @@ 
         /** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
         $view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
 
-        echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+        echo '<h3 class="bestof-cat-title">'.wp_sprintf(__('Best of %s', 'geodirectory'), $term->name).'<a href="'.esc_url($view_all_link).'">'.__("View all", 'geodirectory').'</a></h3>';
     }
     if ($excerpt_type == 'show-reviews') {
         add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');

Indentation +519 added lines, -519 removed lines

@@ -14,282 +14,282 @@ 
  */
 class geodir_bestof_widget extends WP_Widget
 {
-    /**
-     * Register the best of widget with WordPress.
-     *
-     * @since 1.3.9
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
-     */
-    public function __construct()
-    {
-        $widget_ops = array('classname' => 'geodir_bestof_widget', 'description' => __('GD > Best of widget', 'geodirectory'));
-        parent::__construct(
-            'bestof_widget', // Base ID
-            __('GD > Best of widget', 'geodirectory'), // Name
-            $widget_ops// Args
-        );
-    }
-
-    /**
-     * Front-end display content for best of widget.
-     *
-     * @since 1.3.9
-     * @since 1.5.1 Added filter to view all link.
-     * @since 1.5.1 Declare function public.
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance Saved values from database.
-     */
-    public function widget($args, $instance)
-    {
-        extract($args);
-        /**
-         * Filter the best of widget tab layout.
-         *
-         * @since 1.3.9
-         *
-         * @param string $instance ['tab_layout'] Best of widget tab layout name.
-         */
-        $tab_layout = empty($instance['tab_layout']) ? 'bestof-tabs-on-top' : apply_filters('bestof_widget_tab_layout', $instance['tab_layout']);
-        echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
-        echo $before_widget;
-        $loc_terms = geodir_get_current_location_terms();
-        if (!empty($loc_terms)) {
-            $cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
-        } else {
-            $cur_location = '';
-        }
-
-        /**
-         * Filter the current location name.
-         *
-         * @since 1.3.9
-         *
-         * @param string $cur_location Current location name.
-         */
-        $cur_location = apply_filters('bestof_widget_cur_location', $cur_location);
-
-        /**
-         * Filter the widget title.
-         *
-         * @since 1.3.9
-         *
-         * @param string $instance ['title'] The widget title.
-         */
-        $title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name') . $cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
-
-        /**
-         * Filter the post type.
-         *
-         * @since 1.3.9
-         *
-         * @param string $instance ['post_type'] The post type.
-         */
-        $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('bestof_widget_post_type', $instance['post_type']);
-
-        /**
-         * Filter the excerpt type.
-         *
-         * @since 1.5.4
-         *
-         * @param string $instance ['excerpt_type'] The excerpt type.
-         */
-        $excerpt_type = empty($instance['excerpt_type']) ? 'show-desc' : apply_filters('bestof_widget_excerpt_type', $instance['excerpt_type']);
-
-
-        /**
-         * Filter the listing limit.
-         *
-         * @since 1.3.9
-         *
-         * @param int $instance ['post_limit'] No. of posts to display.
-         */
-        $post_limit = empty($instance['post_limit']) ? '5' : apply_filters('bestof_widget_post_limit', $instance['post_limit']);
-
-        /**
-         * Filter the category limit.
-         *
-         * @since 1.3.9
-         *
-         * @param int $instance ['categ_limit'] No. of categories to display.
-         */
-        $categ_limit = empty($instance['categ_limit']) ? '3' : apply_filters('bestof_widget_categ_limit', $instance['categ_limit']);
-        $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;
-
-        /**
-         * Filter the use of location filter.
-         *
-         * @since 1.3.9
-         *
-         * @param int|bool $instance ['add_location_filter'] Filter listings using current location.
-         */
-        $add_location_filter = empty($instance['add_location_filter']) ? '1' : apply_filters('bestof_widget_location_filter', $instance['add_location_filter']);
-
-        // set post type to current viewing post type
-        if ($use_viewing_post_type) {
-            $current_post_type = geodir_get_current_posttype();
-            if ($current_post_type != '' && $current_post_type != $post_type) {
-                $post_type = $current_post_type;
-            }
-        }
-
-        if (isset($instance['character_count'])) {
-            /**
-             * Filter the widget's excerpt character count.
-             *
-             * @since 1.3.9
-             *
-             * @param int $instance ['character_count'] Excerpt character count.
-             */
-            $character_count = apply_filters('bestof_widget_list_character_count', $instance['character_count']);
-        } else {
-            $character_count = '';
-        }
-
-        $category_taxonomy = geodir_get_taxonomies($post_type);
-
-        $term_args = array(
-            'hide_empty' => true,
-            'parent' => 0
-        );
-
-        $term_args = apply_filters('bestof_widget_term_args', $term_args);
-
-        if (is_tax()) {
-            $taxonomy = get_query_var('taxonomy');
-            $cur_term = get_query_var('term');
-            $term_data = get_term_by('name', $cur_term, $taxonomy);
-            $term_args['parent'] = $term_data->term_id;
-        }
-
-        $terms = get_terms($category_taxonomy[0], $term_args);
-
-        $term_reviews = geodir_count_reviews_by_terms();
-        $a_terms = array();
-        foreach ($terms as $term) {
-
-
-            if ($term->count > 0) {
-                if (isset($term_reviews[$term->term_id])) {
-                    $term->review_count = $term_reviews[$term->term_id];
-                } else {
-                    $term->review_count = '0';
-                }
-
-                $a_terms[] = $term;
-            }
-
-        }
-
-
-        $terms = apply_filters('bestof_widget_sort_terms', geodir_sort_terms($a_terms, 'review_count'), $a_terms);
-
-        $query_args = array(
-            'posts_per_page' => $post_limit,
-            'is_geodir_loop' => true,
-            'post_type' => $post_type,
-            'gd_location' => $add_location_filter ? true : false,
-            'order_by' => 'high_review'
-        );
-        if ($character_count >= 0) {
-            $query_args['excerpt_length'] = $character_count;
-        }
-
-        $layout = array();
-        if ($tab_layout == 'bestof-tabs-as-dropdown') {
-            $layout[] = $tab_layout;
-        } else {
-            $layout[] = 'bestof-tabs-as-dropdown';
-            $layout[] = $tab_layout;
-        }
-
-
-        echo $before_title . __($title,'geodirectory') . $after_title;
-
-        //term navigation - start
-        echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
-
-        $final_html = '';
-        foreach ($layout as $tab_layout) {
-            $nav_html = '';
-            $is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
-
-            if ($is_dropdown) {
-                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr(__('Select Category', 'geodirectory')) . '">';
-            } else {
-                $nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
-                $nav_html .= '<dt></dt>';
-            }
-
-
-            $term_icon = geodir_get_term_icon();
-            $cat_count = 0;
-            if (!empty($terms)) {
-                foreach ($terms as $cat) {
-                    $cat_count++;
-                    if ($cat_count > $categ_limit) {
-                        break;
-                    }
-                    if ($is_dropdown) {
-                        $selected = ($cat_count == 1) ? 'selected="selected"' : '';
-                        $nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
-                    } else {
-                        if ($cat_count == 1) {
-                            $nav_html .= '<dd class="geodir-tab-active">';
-                        } else {
-                            $nav_html .= '<dd class="">';
-                        }
-                        $term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
-                        $nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
-                        $nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
-                        $nav_html .= '<span>';
-                        $nav_html .= geodir_ucwords($cat->name);
-                        $nav_html .= '<small>';
-                        if (isset($cat->review_count)) {
-                            $num_reviews = $cat->review_count;
-                            if ($num_reviews == 0) {
-                                $reviews = __('No Reviews', 'geodirectory');
-                            } elseif ($num_reviews > 1) {
-                                $reviews = $num_reviews . __(' Reviews', 'geodirectory');
-                            } else {
-                                $reviews = __('1 Review', 'geodirectory');
-                            }
-                            $nav_html .= $reviews;
-                        }
-                        $nav_html .= '</small>';
-                        $nav_html .= '</span>';
-                        $nav_html .= '</a>';
-                        $nav_html .= '</dd>';
-                    }
-                }
-            }
-
-            if ($is_dropdown) {
-                $nav_html .= '</select>';
-            } else {
-                $nav_html .= '</dl>';
-            }
-            $final_html .= $nav_html;
-        }
-        if ($terms) {
-            echo $final_html;
-        }
-        echo '</div>';
-        //term navigation - end
-
-        //first term listings by default - start
-        $first_term = '';
-        if ($terms) {
-            $first_term = $terms[0];
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field' => 'id',
-                'terms' => $first_term->term_id
-            );
-            $query_args['tax_query'] = array($tax_query);
-        }
-
-        ?>
+	/**
+	 * Register the best of widget with WordPress.
+	 *
+	 * @since 1.3.9
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
+	 */
+	public function __construct()
+	{
+		$widget_ops = array('classname' => 'geodir_bestof_widget', 'description' => __('GD > Best of widget', 'geodirectory'));
+		parent::__construct(
+			'bestof_widget', // Base ID
+			__('GD > Best of widget', 'geodirectory'), // Name
+			$widget_ops// Args
+		);
+	}
+
+	/**
+	 * Front-end display content for best of widget.
+	 *
+	 * @since 1.3.9
+	 * @since 1.5.1 Added filter to view all link.
+	 * @since 1.5.1 Declare function public.
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance Saved values from database.
+	 */
+	public function widget($args, $instance)
+	{
+		extract($args);
+		/**
+		 * Filter the best of widget tab layout.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $instance ['tab_layout'] Best of widget tab layout name.
+		 */
+		$tab_layout = empty($instance['tab_layout']) ? 'bestof-tabs-on-top' : apply_filters('bestof_widget_tab_layout', $instance['tab_layout']);
+		echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
+		echo $before_widget;
+		$loc_terms = geodir_get_current_location_terms();
+		if (!empty($loc_terms)) {
+			$cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
+		} else {
+			$cur_location = '';
+		}
+
+		/**
+		 * Filter the current location name.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $cur_location Current location name.
+		 */
+		$cur_location = apply_filters('bestof_widget_cur_location', $cur_location);
+
+		/**
+		 * Filter the widget title.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $instance ['title'] The widget title.
+		 */
+		$title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name') . $cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
+
+		/**
+		 * Filter the post type.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $instance ['post_type'] The post type.
+		 */
+		$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('bestof_widget_post_type', $instance['post_type']);
+
+		/**
+		 * Filter the excerpt type.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $instance ['excerpt_type'] The excerpt type.
+		 */
+		$excerpt_type = empty($instance['excerpt_type']) ? 'show-desc' : apply_filters('bestof_widget_excerpt_type', $instance['excerpt_type']);
+
+
+		/**
+		 * Filter the listing limit.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param int $instance ['post_limit'] No. of posts to display.
+		 */
+		$post_limit = empty($instance['post_limit']) ? '5' : apply_filters('bestof_widget_post_limit', $instance['post_limit']);
+
+		/**
+		 * Filter the category limit.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param int $instance ['categ_limit'] No. of categories to display.
+		 */
+		$categ_limit = empty($instance['categ_limit']) ? '3' : apply_filters('bestof_widget_categ_limit', $instance['categ_limit']);
+		$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;
+
+		/**
+		 * Filter the use of location filter.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param int|bool $instance ['add_location_filter'] Filter listings using current location.
+		 */
+		$add_location_filter = empty($instance['add_location_filter']) ? '1' : apply_filters('bestof_widget_location_filter', $instance['add_location_filter']);
+
+		// set post type to current viewing post type
+		if ($use_viewing_post_type) {
+			$current_post_type = geodir_get_current_posttype();
+			if ($current_post_type != '' && $current_post_type != $post_type) {
+				$post_type = $current_post_type;
+			}
+		}
+
+		if (isset($instance['character_count'])) {
+			/**
+			 * Filter the widget's excerpt character count.
+			 *
+			 * @since 1.3.9
+			 *
+			 * @param int $instance ['character_count'] Excerpt character count.
+			 */
+			$character_count = apply_filters('bestof_widget_list_character_count', $instance['character_count']);
+		} else {
+			$character_count = '';
+		}
+
+		$category_taxonomy = geodir_get_taxonomies($post_type);
+
+		$term_args = array(
+			'hide_empty' => true,
+			'parent' => 0
+		);
+
+		$term_args = apply_filters('bestof_widget_term_args', $term_args);
+
+		if (is_tax()) {
+			$taxonomy = get_query_var('taxonomy');
+			$cur_term = get_query_var('term');
+			$term_data = get_term_by('name', $cur_term, $taxonomy);
+			$term_args['parent'] = $term_data->term_id;
+		}
+
+		$terms = get_terms($category_taxonomy[0], $term_args);
+
+		$term_reviews = geodir_count_reviews_by_terms();
+		$a_terms = array();
+		foreach ($terms as $term) {
+
+
+			if ($term->count > 0) {
+				if (isset($term_reviews[$term->term_id])) {
+					$term->review_count = $term_reviews[$term->term_id];
+				} else {
+					$term->review_count = '0';
+				}
+
+				$a_terms[] = $term;
+			}
+
+		}
+
+
+		$terms = apply_filters('bestof_widget_sort_terms', geodir_sort_terms($a_terms, 'review_count'), $a_terms);
+
+		$query_args = array(
+			'posts_per_page' => $post_limit,
+			'is_geodir_loop' => true,
+			'post_type' => $post_type,
+			'gd_location' => $add_location_filter ? true : false,
+			'order_by' => 'high_review'
+		);
+		if ($character_count >= 0) {
+			$query_args['excerpt_length'] = $character_count;
+		}
+
+		$layout = array();
+		if ($tab_layout == 'bestof-tabs-as-dropdown') {
+			$layout[] = $tab_layout;
+		} else {
+			$layout[] = 'bestof-tabs-as-dropdown';
+			$layout[] = $tab_layout;
+		}
+
+
+		echo $before_title . __($title,'geodirectory') . $after_title;
+
+		//term navigation - start
+		echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
+
+		$final_html = '';
+		foreach ($layout as $tab_layout) {
+			$nav_html = '';
+			$is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
+
+			if ($is_dropdown) {
+				$nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr(__('Select Category', 'geodirectory')) . '">';
+			} else {
+				$nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
+				$nav_html .= '<dt></dt>';
+			}
+
+
+			$term_icon = geodir_get_term_icon();
+			$cat_count = 0;
+			if (!empty($terms)) {
+				foreach ($terms as $cat) {
+					$cat_count++;
+					if ($cat_count > $categ_limit) {
+						break;
+					}
+					if ($is_dropdown) {
+						$selected = ($cat_count == 1) ? 'selected="selected"' : '';
+						$nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
+					} else {
+						if ($cat_count == 1) {
+							$nav_html .= '<dd class="geodir-tab-active">';
+						} else {
+							$nav_html .= '<dd class="">';
+						}
+						$term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
+						$nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
+						$nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
+						$nav_html .= '<span>';
+						$nav_html .= geodir_ucwords($cat->name);
+						$nav_html .= '<small>';
+						if (isset($cat->review_count)) {
+							$num_reviews = $cat->review_count;
+							if ($num_reviews == 0) {
+								$reviews = __('No Reviews', 'geodirectory');
+							} elseif ($num_reviews > 1) {
+								$reviews = $num_reviews . __(' Reviews', 'geodirectory');
+							} else {
+								$reviews = __('1 Review', 'geodirectory');
+							}
+							$nav_html .= $reviews;
+						}
+						$nav_html .= '</small>';
+						$nav_html .= '</span>';
+						$nav_html .= '</a>';
+						$nav_html .= '</dd>';
+					}
+				}
+			}
+
+			if ($is_dropdown) {
+				$nav_html .= '</select>';
+			} else {
+				$nav_html .= '</dl>';
+			}
+			$final_html .= $nav_html;
+		}
+		if ($terms) {
+			echo $final_html;
+		}
+		echo '</div>';
+		//term navigation - end
+
+		//first term listings by default - start
+		$first_term = '';
+		if ($terms) {
+			$first_term = $terms[0];
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field' => 'id',
+				'terms' => $first_term->term_id
+			);
+			$query_args['tax_query'] = array($tax_query);
+		}
+
+		?>
         <input type="hidden" id="bestof_widget_post_type" name="bestof_widget_post_type"
                value="<?php echo $post_type; ?>">
         <input type="hidden" id="bestof_widget_excerpt_type" name="bestof_widget_excerpt_type"
@@ -300,110 +300,110 @@ 
                value="<?php echo $category_taxonomy[0]; ?>">
         <input type="hidden" id="bestof_widget_location_filter" name="bestof_widget_location_filter"
                value="<?php if ($add_location_filter) {
-                   echo 1;
-               } else {
-                   echo 0;
-               } ?>">
+				   echo 1;
+			   } else {
+				   echo 0;
+			   } ?>">
         <input type="hidden" id="bestof_widget_char_count" name="bestof_widget_char_count"
                value="<?php echo $character_count; ?>">
         <div class="geo-bestof-contentwrap geodir-tabs-content" style="position: relative; z-index: 0;">
             <p id="geodir-bestof-loading" class="geodir-bestof-loading"><i class="fa fa-cog fa-spin"></i></p>
             <?php
-            echo '<div id="geodir-bestof-places">';
-            if ($terms) {
-                $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($first_term, $first_term->taxonomy));
-                /**
-                 * Filter the page link to view all lisitngs.
-                 *
-                 * @since 1.5.1
-                 *
-                 * @param array $view_all_link View all listings page link.
-                 * @param array $post_type The Post type.
-                 * @param array $first_term The category term object.
-                 */
-                $view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
-
-                echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
-            }
-            if ($excerpt_type == 'show-reviews') {
-                add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-            }
-            geodir_bestof_places_by_term($query_args);
-            if ($excerpt_type == 'show-reviews') {
-                remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-            }
-            echo "</div>";
-            ?>
+			echo '<div id="geodir-bestof-places">';
+			if ($terms) {
+				$view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($first_term, $first_term->taxonomy));
+				/**
+				 * Filter the page link to view all lisitngs.
+				 *
+				 * @since 1.5.1
+				 *
+				 * @param array $view_all_link View all listings page link.
+				 * @param array $post_type The Post type.
+				 * @param array $first_term The category term object.
+				 */
+				$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
+
+				echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+			}
+			if ($excerpt_type == 'show-reviews') {
+				add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+			}
+			geodir_bestof_places_by_term($query_args);
+			if ($excerpt_type == 'show-reviews') {
+				remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+			}
+			echo "</div>";
+			?>
         </div>
         <?php //first term listings by default - end
-        ?>
+		?>
         <?php echo $after_widget;
-        echo "</div>";
-    }
-
-    /**
-     * Sanitize best of widget form values as they are saved.
-     *
-     * @since 1.3.9
-     * @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)
-    {
-        $instance = $old_instance;
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_type'] = strip_tags($new_instance['post_type']);
-        $instance['post_limit'] = strip_tags($new_instance['post_limit']);
-        $instance['categ_limit'] = strip_tags($new_instance['categ_limit']);
-        $instance['character_count'] = $new_instance['character_count'];
-        $instance['tab_layout'] = $new_instance['tab_layout'];
-        $instance['excerpt_type'] = $new_instance['excerpt_type'];
-        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['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
-        return $instance;
-    }
-
-    /**
-     * Back-end best of widget settings form.
-     *
-     * @since 1.3.9
-     * @since 1.5.1 Declare function public.
-     *
-     * @param array $instance Previously saved values from database.
-     */
-    public function form($instance)
-    {
-        $instance = wp_parse_args((array)$instance,
-            array(
-                'title' => '',
-                'post_type' => '',
-                'post_limit' => '5',
-                'categ_limit' => '3',
-                'character_count' => '20',
-                'add_location_filter' => '1',
-                'tab_layout' => 'bestof-tabs-on-top',
-                'excerpt_type' => 'show-desc',
-                'use_viewing_post_type' => ''
-            )
-        );
-        $title = strip_tags($instance['title']);
-        $post_type = strip_tags($instance['post_type']);
-        $post_limit = strip_tags($instance['post_limit']);
-        $categ_limit = strip_tags($instance['categ_limit']);
-        $character_count = strip_tags($instance['character_count']);
-        $tab_layout = strip_tags($instance['tab_layout']);
-        $excerpt_type = strip_tags($instance['excerpt_type']);
-        $add_location_filter = strip_tags($instance['add_location_filter']);
-        $use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;
-
-        ?>
+		echo "</div>";
+	}
+
+	/**
+	 * Sanitize best of widget form values as they are saved.
+	 *
+	 * @since 1.3.9
+	 * @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)
+	{
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_type'] = strip_tags($new_instance['post_type']);
+		$instance['post_limit'] = strip_tags($new_instance['post_limit']);
+		$instance['categ_limit'] = strip_tags($new_instance['categ_limit']);
+		$instance['character_count'] = $new_instance['character_count'];
+		$instance['tab_layout'] = $new_instance['tab_layout'];
+		$instance['excerpt_type'] = $new_instance['excerpt_type'];
+		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['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
+		return $instance;
+	}
+
+	/**
+	 * Back-end best of widget settings form.
+	 *
+	 * @since 1.3.9
+	 * @since 1.5.1 Declare function public.
+	 *
+	 * @param array $instance Previously saved values from database.
+	 */
+	public function form($instance)
+	{
+		$instance = wp_parse_args((array)$instance,
+			array(
+				'title' => '',
+				'post_type' => '',
+				'post_limit' => '5',
+				'categ_limit' => '3',
+				'character_count' => '20',
+				'add_location_filter' => '1',
+				'tab_layout' => 'bestof-tabs-on-top',
+				'excerpt_type' => 'show-desc',
+				'use_viewing_post_type' => ''
+			)
+		);
+		$title = strip_tags($instance['title']);
+		$post_type = strip_tags($instance['post_type']);
+		$post_limit = strip_tags($instance['post_limit']);
+		$categ_limit = strip_tags($instance['categ_limit']);
+		$character_count = strip_tags($instance['character_count']);
+		$tab_layout = strip_tags($instance['tab_layout']);
+		$excerpt_type = strip_tags($instance['excerpt_type']);
+		$add_location_filter = strip_tags($instance['add_location_filter']);
+		$use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;
+
+		?>
         <p>
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
 
@@ -418,14 +418,14 @@ 
                 for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>
 
                 <?php $postypes = geodir_get_posttypes();
-                /**
-                 * Filter the post types to display in widget.
-                 *
-                 * @since 1.3.9
-                 *
-                 * @param array $postypes Post types array.
-                 */
-                $postypes = apply_filters('geodir_post_type_list_in_p_widget', $postypes); ?>
+				/**
+				 * Filter the post types to display in widget.
+				 *
+				 * @since 1.3.9
+				 *
+				 * @param array $postypes Post types array.
+				 */
+				$postypes = apply_filters('geodir_post_type_list_in_p_widget', $postypes); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('post_type'); ?>"
                         name="<?php echo $this->get_field_name('post_type'); ?>"
@@ -434,9 +434,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 } ?>
 
@@ -482,14 +482,14 @@ 
                         name="<?php echo $this->get_field_name('tab_layout'); ?>">
 
                     <option <?php if ($tab_layout == 'bestof-tabs-on-top') {
-                        echo 'selected="selected"';
-                    } ?> value="bestof-tabs-on-top"><?php _e('Tabs on Top', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="bestof-tabs-on-top"><?php _e('Tabs on Top', 'geodirectory'); ?></option>
                     <option <?php if ($tab_layout == 'bestof-tabs-on-left') {
-                        echo 'selected="selected"';
-                    } ?> value="bestof-tabs-on-left"><?php _e('Tabs on Left', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="bestof-tabs-on-left"><?php _e('Tabs on Left', 'geodirectory'); ?></option>
                     <option <?php if ($tab_layout == 'bestof-tabs-as-dropdown') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="bestof-tabs-as-dropdown"><?php _e('Tabs as Dropdown', 'geodirectory'); ?></option>
                 </select>
             </label>
@@ -503,11 +503,11 @@ 
                         name="<?php echo $this->get_field_name('excerpt_type'); ?>">
 
                     <option <?php if ($excerpt_type == 'show-desc') {
-                        echo 'selected="selected"';
-                    } ?> value="show-desc"><?php _e('Show Description', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="show-desc"><?php _e('Show Description', 'geodirectory'); ?></option>
                     <option <?php if ($excerpt_type == 'show-reviews') {
-                        echo 'selected="selected"';
-                    } ?> value="show-reviews"><?php _e('Show Reviews if Available', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="show-reviews"><?php _e('Show Reviews if Available', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
@@ -526,12 +526,12 @@ 
                 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>
     <?php
-    }
+	}
 } // class geodir_bestof_widget
 
 register_widget('geodir_bestof_widget');
@@ -551,68 +551,68 @@ 
  */
 function geodir_bestof_places_by_term($query_args)
 {
-    global $gd_session;
-
-    /**
-     * This action called before querying widget listings.
-     *
-     * @since 1.0.0
-     */
-    do_action('geodir_bestof_get_widget_listings_before');
-
-    $widget_listings = geodir_get_widget_listings($query_args);
-
-    /**
-     * This action called after querying widget listings.
-     *
-     * @since 1.0.0
-     */
-    do_action('geodir_bestof_get_widget_listings_after');
-
-    $character_count = isset($query_args['excerpt_length']) ? $query_args['excerpt_length'] : '';
-
-    if (!isset($character_count)) {
-        /** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
-        $character_count = $character_count == '' ? 50 : apply_filters('bestof_widget_character_count', $character_count);
-    }
-
-    /** This filter is documented in geodirectory-functions/general_functions.php */
-    $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
-
-    global $post, $map_jason, $map_canvas_arr, $gridview_columns_widget, $geodir_is_widget_listing;
-    $current_post = $post;
-    $current_map_jason = $map_jason;
-    $current_map_canvas_arr = $map_canvas_arr;
-    $current_grid_view = $gridview_columns_widget;
-    $gridview_columns_widget = null;
-
-    $gd_listing_view_set = $gd_session->get('gd_listing_view') ? true : false;
-    $gd_listing_view_old = $gd_listing_view_set ? $gd_session->get('gd_listing_view') : '';
-
-    $gd_session->set('gd_listing_view', '1');
-    $geodir_is_widget_listing = true;
-
-    /**
-     * Includes the template for the listing listview.
-     *
-     * @since 1.3.9
-     */
-    include($template);
-
-    $geodir_is_widget_listing = false;
-
-    $GLOBALS['post'] = $current_post;
-    if (!empty($current_post)) {
-        setup_postdata($current_post);
-    }
-    if ($gd_listing_view_set) { // Set back previous value
-        $gd_session->set('gd_listing_view', $gd_listing_view_old);
-    } else {
-        $gd_session->un_set('gd_listing_view');
-    }
-    $map_jason = $current_map_jason;
-    $map_canvas_arr = $current_map_canvas_arr;
-    $gridview_columns_widget = $current_grid_view;
+	global $gd_session;
+
+	/**
+	 * This action called before querying widget listings.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('geodir_bestof_get_widget_listings_before');
+
+	$widget_listings = geodir_get_widget_listings($query_args);
+
+	/**
+	 * This action called after querying widget listings.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('geodir_bestof_get_widget_listings_after');
+
+	$character_count = isset($query_args['excerpt_length']) ? $query_args['excerpt_length'] : '';
+
+	if (!isset($character_count)) {
+		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
+		$character_count = $character_count == '' ? 50 : apply_filters('bestof_widget_character_count', $character_count);
+	}
+
+	/** This filter is documented in geodirectory-functions/general_functions.php */
+	$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+
+	global $post, $map_jason, $map_canvas_arr, $gridview_columns_widget, $geodir_is_widget_listing;
+	$current_post = $post;
+	$current_map_jason = $map_jason;
+	$current_map_canvas_arr = $map_canvas_arr;
+	$current_grid_view = $gridview_columns_widget;
+	$gridview_columns_widget = null;
+
+	$gd_listing_view_set = $gd_session->get('gd_listing_view') ? true : false;
+	$gd_listing_view_old = $gd_listing_view_set ? $gd_session->get('gd_listing_view') : '';
+
+	$gd_session->set('gd_listing_view', '1');
+	$geodir_is_widget_listing = true;
+
+	/**
+	 * Includes the template for the listing listview.
+	 *
+	 * @since 1.3.9
+	 */
+	include($template);
+
+	$geodir_is_widget_listing = false;
+
+	$GLOBALS['post'] = $current_post;
+	if (!empty($current_post)) {
+		setup_postdata($current_post);
+	}
+	if ($gd_listing_view_set) { // Set back previous value
+		$gd_session->set('gd_listing_view', $gd_listing_view_old);
+	} else {
+		$gd_session->un_set('gd_listing_view');
+	}
+	$map_jason = $current_map_jason;
+	$map_canvas_arr = $current_map_canvas_arr;
+	$gridview_columns_widget = $current_grid_view;
 }
 
 //Ajax functions
@@ -629,51 +629,51 @@ 
  */
 function geodir_bestof_callback()
 {
-    check_ajax_referer('geodir-bestof-nonce', 'geodir_bestof_nonce');
-    //set variables
-    $post_type = strip_tags(esc_sql($_POST['post_type']));
-    $post_limit = strip_tags(esc_sql($_POST['post_limit']));
-    $character_count = strip_tags(esc_sql($_POST['char_count']));
-    $taxonomy = strip_tags(esc_sql($_POST['taxonomy']));
-    $add_location_filter = strip_tags(esc_sql($_POST['add_location_filter']));
-    $term_id = strip_tags(esc_sql($_POST['term_id']));
-    $excerpt_type = strip_tags(esc_sql($_POST['excerpt_type']));
-
-    $query_args = array(
-        'posts_per_page' => $post_limit,
-        'is_geodir_loop' => true,
-        'post_type' => $post_type,
-        'gd_location' => $add_location_filter ? true : false,
-        'order_by' => 'high_review'
-    );
-
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
-
-    $tax_query = array(
-        'taxonomy' => $taxonomy,
-        'field' => 'id',
-        'terms' => $term_id
-    );
-
-    $query_args['tax_query'] = array($tax_query);
-    if ($term_id && $taxonomy) {
-        $term = get_term_by('id', $term_id, $taxonomy);
-        $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term));
-        /** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
-        $view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
-
-        echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
-    }
-    if ($excerpt_type == 'show-reviews') {
-        add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-    }
-    geodir_bestof_places_by_term($query_args);
-    if ($excerpt_type == 'show-reviews') {
-        remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-    }
-    gd_die();
+	check_ajax_referer('geodir-bestof-nonce', 'geodir_bestof_nonce');
+	//set variables
+	$post_type = strip_tags(esc_sql($_POST['post_type']));
+	$post_limit = strip_tags(esc_sql($_POST['post_limit']));
+	$character_count = strip_tags(esc_sql($_POST['char_count']));
+	$taxonomy = strip_tags(esc_sql($_POST['taxonomy']));
+	$add_location_filter = strip_tags(esc_sql($_POST['add_location_filter']));
+	$term_id = strip_tags(esc_sql($_POST['term_id']));
+	$excerpt_type = strip_tags(esc_sql($_POST['excerpt_type']));
+
+	$query_args = array(
+		'posts_per_page' => $post_limit,
+		'is_geodir_loop' => true,
+		'post_type' => $post_type,
+		'gd_location' => $add_location_filter ? true : false,
+		'order_by' => 'high_review'
+	);
+
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
+
+	$tax_query = array(
+		'taxonomy' => $taxonomy,
+		'field' => 'id',
+		'terms' => $term_id
+	);
+
+	$query_args['tax_query'] = array($tax_query);
+	if ($term_id && $taxonomy) {
+		$term = get_term_by('id', $term_id, $taxonomy);
+		$view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term));
+		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
+		$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
+
+		echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+	}
+	if ($excerpt_type == 'show-reviews') {
+		add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+	}
+	geodir_bestof_places_by_term($query_args);
+	if ($excerpt_type == 'show-reviews') {
+		remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+	}
+	gd_die();
 }
 
 //Javascript
@@ -686,8 +686,8 @@ 
  */
 function geodir_bestof_js()
 {
-    $ajax_nonce = wp_create_nonce("geodir-bestof-nonce");
-    ?>
+	$ajax_nonce = wp_create_nonce("geodir-bestof-nonce");
+	?>
     <script type="text/javascript">
         jQuery(document).ready(function () {
             jQuery('.geodir-bestof-cat-list a, #geodir_bestof_tab_dd').on("click change", function (e) {
@@ -766,18 +766,18 @@ 
 
 function best_of_show_review_in_excerpt($excerpt)
 {
-    global $wpdb, $post;
-    $review_table = GEODIR_REVIEW_TABLE;
-    $request = "SELECT comment_ID FROM $review_table WHERE post_id = $post->ID ORDER BY post_date DESC, id DESC LIMIT 1";
-    $comments = $wpdb->get_results($request);
-
-    if ($comments) {
-        foreach ($comments as $comment) {
-            // Set the extra comment info needed.
-            $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
-            $comment_content = $comment_extra->comment_content;
-            $excerpt = strip_tags($comment_content);
-        }
-    }
-    return $excerpt;
+	global $wpdb, $post;
+	$review_table = GEODIR_REVIEW_TABLE;
+	$request = "SELECT comment_ID FROM $review_table WHERE post_id = $post->ID ORDER BY post_date DESC, id DESC LIMIT 1";
+	$comments = $wpdb->get_results($request);
+
+	if ($comments) {
+		foreach ($comments as $comment) {
+			// Set the extra comment info needed.
+			$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
+			$comment_content = $comment_extra->comment_content;
+			$excerpt = strip_tags($comment_content);
+		}
+	}
+	return $excerpt;
 }
\ No newline at end of file

geodirectory-widgets/geodirectory_popular_widget.php

Braces +37 added lines, -14 removed lines

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

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

         $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;

@@ -319,8 +320,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'));

@@ -335,8 +337,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"';
+                        }
 

                         ?>

 

@@ -350,7 +353,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>

@@ -453,7 +461,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>

@@ -461,7 +472,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>

@@ -469,7 +483,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>

@@ -477,7 +494,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>

@@ -485,7 +505,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>

Spacing +31 added lines, -31 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,13 +81,13 @@ 
     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;

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

         

         $post_type_options = geodir_get_posttypes('options');

         ?>

@@ -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

     }

@@ -215,7 +215,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(),

@@ -266,9 +266,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'); ?>"

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

 				/**

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

 

@@ -350,14 +350,14 @@ 
 

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

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

 

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

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

@@ -393,7 +393,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"

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

@@ -432,7 +432,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"

@@ -442,7 +442,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); ?>"/>

@@ -451,41 +451,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>

@@ -531,7 +531,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 } ?>

Indentation +204 added lines, -204 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,99 +171,99 @@ 
 	 * @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['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;

-

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

+

+		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' => '',

-                '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' => ''

-            )

-        );

+	{

+		//widgetform in backend

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

+			array('title' => '',

+				'post_type' => '',

+				'category' => array(),

+				'category_title' => '',

+				'list_sort' => '',

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

+			)

+		);

 

-        $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']);

 

-        $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;

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

 

-        ?>

+		?>

 

         <p>

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

@@ -298,9 +298,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 } ?>

 

@@ -315,30 +315,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>

@@ -363,28 +363,28 @@ 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">

 

                     <option <?php if ($list_sort == 'az') {

-                        echo 'selected="selected"';

-                    } ?> value="az"><?php _e('A-Z', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="az"><?php _e('A-Z', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'latest') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'featured') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'high_review') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'high_rating') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'random') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                 </select>

             </label>

@@ -407,24 +407,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>

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

 

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

 

     <?php

-    }

+	}

 } // class geodir_popular_postview

 

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

geodirectory-widgets/geodirectory_reviews_widget.php

Indentation +49 added lines, -49 removed lines

@@ -14,37 +14,37 @@ 
  */

 class geodir_recent_reviews_widget extends WP_Widget

 {

-    /**

+	/**

 	 * Register the recent reviews 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_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

-        parent::__construct(

-            'geodir_recent_reviews', // Base ID

-            __('GD > Recent Reviews', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

+		parent::__construct(

+			'geodir_recent_reviews', // Base ID

+			__('GD > Recent Reviews', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for recent reviews 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)

-    {

-        // prints the widget

-        extract($args, EXTR_SKIP);

+	{

+		// prints the widget

+		extract($args, EXTR_SKIP);

 

-        /** This filter is documented in geodirectory_widgets.php */

-        $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+		/** This filter is documented in geodirectory_widgets.php */

+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 		

 		/**

 		 * Filter the number of reviews to display.

@@ -63,35 +63,35 @@ 
 		 * @param int $g_size Height and width of the avatar image in pixels. Default 30.

 		 */

 		$g_size = apply_filters('geodir_recent_reviews_g_size', 30);

-        /**

-         * Filter the excerpt length

-         *

-         * @since 1.0.0

-         *

-         * @param int $excerpt_length Excerpt length. Default 100.

-         */

-        $excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

-        $comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

+		/**

+		 * Filter the excerpt length

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param int $excerpt_length Excerpt length. Default 100.

+		 */

+		$excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

+		$comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

 

-        if ($comments_li) {

-            echo $before_widget;

-            ?>

+		if ($comments_li) {

+			echo $before_widget;

+			?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

-                } ?>

+					echo $before_title . $title . $after_title;

+				} ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

             <?php

-            echo $after_widget;

-        }

-    }

+			echo $after_widget;

+		}

+	}

 

 	/**

 	 * Sanitize recent reviews 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.

@@ -99,29 +99,29 @@ 
 	 * @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']);

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

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

+		return $instance;

+	}

     

 	/**

 	 * Back-end recent reviews 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' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

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

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

-        ?>

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

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

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

+		?>

         <p><label for="<?php echo $this->get_field_id('title'); ?>">Widget Title: <input class="widefat"

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

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

@@ -135,7 +135,7 @@ 
                                                                                              value="<?php echo esc_attr($count); ?>"/></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_recent_reviews_widget

 

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

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
             ?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

+                    echo $before_title.$title.$after_title;

                 } ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

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

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

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

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

         ?>

geodirectory-admin/admin_install.php

Indentation +160 added lines, -160 removed lines

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

 {

 

-    geodir_install();

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

+	geodir_install();

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

 }

 

 /**

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

 function geodir_flush_activation()

 {

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

-    // flush late so everything is loaded

-    flush_rewrite_rules();

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

+	// flush late so everything is loaded

+	flush_rewrite_rules();

 }

 

 /**

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

 function geodir_install()

 {

-    global $geodir_settings;

-

-    /**

-     * Called before the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_end'

-     */

-    do_action('geodir_installation_start');

-

-    // Do install

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

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

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

-        geodir_create_default_fields();

-        //geodir_default_taxonomies();

-        geodir_set_default_options();

-        geodir_create_pages();

-        geodir_set_default_widgets();

-        gd_install_theme_compat();

-

-        update_option('geodir_default_data_installed', 1);

-

-    }

-

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

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

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

-    }

-

-    geodir_installation_end();

-    /**

-     * Called after the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_start'

-     */

-    do_action('geodir_installation_end');

+	global $geodir_settings;

+

+	/**

+	 * Called before the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_end'

+	 */

+	do_action('geodir_installation_start');

+

+	// Do install

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

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

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

+		geodir_create_default_fields();

+		//geodir_default_taxonomies();

+		geodir_set_default_options();

+		geodir_create_pages();

+		geodir_set_default_widgets();

+		gd_install_theme_compat();

+

+		update_option('geodir_default_data_installed', 1);

+

+	}

+

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

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

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

+	}

+

+	geodir_installation_end();

+	/**

+	 * Called after the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_start'

+	 */

+	do_action('geodir_installation_end');

 

 

 }

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

 {

 

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

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

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

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

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

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

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

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

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

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

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

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

 

-    //New since 1.5.3

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

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

+	//New since 1.5.3

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

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

 

 

 }

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

 function geodir_installation_end()

 {

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

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

 

-    update_option("geodir_installed", 1);

-    update_option("geodir_installation_redirect", 1);

-    update_option('skip_install_geodir_pages', 0);

+	update_option("geodir_installed", 1);

+	update_option("geodir_installation_redirect", 1);

+	update_option('skip_install_geodir_pages', 0);

 }

 

 /**

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

 function geodir_set_default_options()

 {

-    global $geodir_settings;

-    /**

-     * Contains settings array for general tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

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

-    /**

-     * Contains settings array for design tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

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

-    /**

-     * Contains settings array for notifications tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

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

-    /**

-     * Contains settings array for permalink tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

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

-    /**

-     * Contains settings array for title / meta tab.

-     *

-     * @since 1.5.4

-     * @package GeoDirectory

-     */

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

-    foreach ($geodir_settings as $value) {

-        geodir_update_options($value, true);

-    }

+	global $geodir_settings;

+	/**

+	 * Contains settings array for general tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

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

+	/**

+	 * Contains settings array for design tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

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

+	/**

+	 * Contains settings array for notifications tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

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

+	/**

+	 * Contains settings array for permalink tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

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

+	/**

+	 * Contains settings array for title / meta tab.

+	 *

+	 * @since 1.5.4

+	 * @package GeoDirectory

+	 */

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

+	foreach ($geodir_settings as $value) {

+		geodir_update_options($value, true);

+	}

 

 }

 

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

 {

 

-    $widget_option_list = array();

-    $widgetinfo = array();

-    $sidebarvalue_array = array();

-    $sidebars_widgets = array();

+	$widget_option_list = array();

+	$widgetinfo = array();

+	$sidebarvalue_array = array();

+	$sidebars_widgets = array();

 

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

-    /*  Widgets ON HOME PAGE     */

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

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

+	/*  Widgets ON HOME PAGE     */

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

 

-    $widget_option_list['geodir_home_top'] =

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

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

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_home_top'] =

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

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

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_home_content'] =

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

+	$widget_option_list['geodir_home_content'] =

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

 

-    $widget_option_list['geodir_home_right'] =

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

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

+	$widget_option_list['geodir_home_right'] =

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

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

 

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

-    /*  Widgets ON LISTING PAGE     */

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

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

+	/*  Widgets ON LISTING PAGE     */

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

 

-    $widget_option_list['geodir_listing_top'] =

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

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_listing_top'] =

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

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_listing_right_sidebar'] =

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

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

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

+	$widget_option_list['geodir_listing_right_sidebar'] =

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

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

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

 

 

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

-    /*  Widgets ON SEARCH PAGE     */

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

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

+	/*  Widgets ON SEARCH PAGE     */

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

 

-    $widget_option_list['geodir_search_top'] =

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

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_search_top'] =

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

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_search_right_sidebar'] =

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

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

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

+	$widget_option_list['geodir_search_right_sidebar'] =

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

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

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

 

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

-    /*  Widgets ON DETAIL/SINGLE PAGE     */

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

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

+	/*  Widgets ON DETAIL/SINGLE PAGE     */

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

 

-    $widget_option_list['geodir_detail_sidebar'] =

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

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

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

+	$widget_option_list['geodir_detail_sidebar'] =

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

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

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

 

 

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

-    /*  Widgets ON AUTHOR PAGE     */

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

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

+	/*  Widgets ON AUTHOR PAGE     */

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

 

 

-    $widget_option_list['geodir_author_right_sidebar'] =

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

+	$widget_option_list['geodir_author_right_sidebar'] =

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

 

 

-    $sidebars_widgets = get_option('sidebars_widgets');

+	$sidebars_widgets = get_option('sidebars_widgets');

 

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

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

 

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

-            $widgetid = 'widget_' . $key2;

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

+			$widgetid = 'widget_' . $key2;

 

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

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

 

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

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

 

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

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

 

-        }

+		}

 

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

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

 

-            $sidebars_widgets = get_option('sidebars_widgets');

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

-            update_option('sidebars_widgets', $sidebars_widgets);

+			$sidebars_widgets = get_option('sidebars_widgets');

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

+			update_option('sidebars_widgets', $sidebars_widgets);

 

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

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

 

-                update_option($key, $value);

+				update_option($key, $value);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 

 }

Spacing +2 added lines, -2 removed lines

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

 

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

-            $widgetid = 'widget_' . $key2;

+            $widgetid = 'widget_'.$key2;

 

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

 

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

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

 

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

 

geodirectory-functions/compatibility/Jupiter.php

Indentation +141 added lines, -141 removed lines

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

Spacing +3 added lines, -3 removed lines

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