GeoDirectory / geodirectory

geodirectory-functions/comments_functions.php

Indentation +471 added lines, -471 removed lines

@@ -31,13 +31,13 @@ 
  */

 function geodir_comment_meta_row_action($a)

 {

-    global $comment;

+	global $comment;

 

-    $rating = geodir_get_commentoverall($comment->comment_ID);

-    if ($rating != 0) {

-        echo geodir_get_rating_stars($rating, $comment->comment_ID);

-    }

-    return $a;

+	$rating = geodir_get_commentoverall($comment->comment_ID);

+	if ($rating != 0) {

+		echo geodir_get_rating_stars($rating, $comment->comment_ID);

+	}

+	return $a;

 }

 

 add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

@@ -52,7 +52,7 @@ 
  */

 function geodir_comment_add_meta_box($comment)

 {

-    add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

+	add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

 }

 

 /**

@@ -66,7 +66,7 @@ 
  * @param object $comment The comment object.

  */

 function geodir_comment_rating_meta($comment) {

-    $post_type = get_post_type($comment->comment_post_ID);

+	$post_type = get_post_type($comment->comment_post_ID);

 	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

@@ -106,24 +106,24 @@ 
  * @global object $post The post object.

  */

 function geodir_comment_rating_fields() {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {

-        $star_texts = array();

-        $star_texts[] = __('Terrible', 'geodirectory');

-        $star_texts[] = __('Poor', 'geodirectory');

-        $star_texts[] = __('Average', 'geodirectory');

-        $star_texts[] = __('Very Good', 'geodirectory');

-        $star_texts[] = __('Excellent', 'geodirectory');

+	if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {

+		$star_texts = array();

+		$star_texts[] = __('Terrible', 'geodirectory');

+		$star_texts[] = __('Poor', 'geodirectory');

+		$star_texts[] = __('Average', 'geodirectory');

+		$star_texts[] = __('Very Good', 'geodirectory');

+		$star_texts[] = __('Excellent', 'geodirectory');

         

-        $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

-        echo $gd_rating_html;

-        ?>

+		$gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

+		echo $gd_rating_html;

+		?>

         <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/>

         <?php

-    }

+	}

 }

 

 add_filter('comment_reply_link', 'geodir_comment_replaylink');

@@ -139,12 +139,12 @@ 
 function geodir_comment_replaylink($link)

 {

 

-    if (strpos($link, 'wp-login.php?') !== false) {

-        $link = str_replace(wp_login_url(),geodir_login_url(),$link);

-    }

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+	if (strpos($link, 'wp-login.php?') !== false) {

+		$link = str_replace(wp_login_url(),geodir_login_url(),$link);

+	}

+	$link = '<div class="gd_comment_replaylink">' . $link . '</div>';

 

-    return $link;

+	return $link;

 }

 

 add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');

@@ -159,9 +159,9 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+	$link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

 

-    return $link;

+	return $link;

 }

 

 add_action('comment_post', 'geodir_save_rating');

@@ -177,32 +177,32 @@ 
  */

 function geodir_save_rating($comment = 0)

 {

-    global $wpdb, $user_ID, $plugin_prefix;

+	global $wpdb, $user_ID, $plugin_prefix;

 

-    $comment_info = get_comment($comment);

+	$comment_info = get_comment($comment);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $rating_ip = getenv("REMOTE_ADDR");

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$rating_ip = getenv("REMOTE_ADDR");

 	

-    $post = geodir_get_post_info($post_id);

-    if (empty($post)) {

-        return;

-    }

-

-    if ($post->post_status == 'publish') {

-        $post_status = '1';

-    } else {

-        $post_status = '0';

-    }

+	$post = geodir_get_post_info($post_id);

+	if (empty($post)) {

+		return;

+	}

+

+	if ($post->post_status == 'publish') {

+		$post_status = '1';

+	} else {

+		$post_status = '0';

+	}

 	

-    if (isset($_REQUEST['geodir_overallrating'])) {

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+	if (isset($_REQUEST['geodir_overallrating'])) {

+		$overall_rating = $_REQUEST['geodir_overallrating'];

         

 		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -220,35 +220,35 @@ 
 					post_latitude	= %s,

 					comment_content	= %s 

 					",

-                array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

-            );

-

-            $wpdb->query($sqlqry);

-

-            /**

-             * Called after saving the comment.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $_REQUEST {

-             *    Attributes of the $_REQUEST variable.

-             *

-             *    @type string $geodir_overallrating Overall rating.

-             *    @type string $comment Comment text.

-             *    @type string $submit Submit button text.

-             *    @type string $comment_post_ID Comment post ID.

-             *    @type string $comment_parent Comment Parent ID.

-             *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

-             *

-             * }

-             */

-            do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

-

-            if ($status) {

-                geodir_update_postrating($post_id);

-            }

-        }

-    }

+				array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

+			);

+

+			$wpdb->query($sqlqry);

+

+			/**

+			 * Called after saving the comment.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $_REQUEST {

+			 *    Attributes of the $_REQUEST variable.

+			 *

+			 *    @type string $geodir_overallrating Overall rating.

+			 *    @type string $comment Comment text.

+			 *    @type string $submit Submit button text.

+			 *    @type string $comment_post_ID Comment post ID.

+			 *    @type string $comment_parent Comment Parent ID.

+			 *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

+			 *

+			 * }

+			 */

+			do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

+

+			if ($status) {

+				geodir_update_postrating($post_id);

+			}

+		}

+	}

 }

 

 

@@ -266,51 +266,51 @@ 
  */

 function geodir_update_rating_status_change($comment_id, $status)

 {

-    if ($status == 'delete') {

-        return;

-    }

-    global $wpdb, $plugin_prefix, $user_ID;

+	if ($status == 'delete') {

+		return;

+	}

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

+	$post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

 

-    if (!empty($comment_info))

-        $status = $comment_info->comment_approved;

+	if (!empty($comment_info))

+		$status = $comment_info->comment_approved;

 

-    if ($status == 'approve' || $status == 1) {

-        $status = 1;

-    } else {

-        $status = 0;

-    }

+	if ($status == 'approve' || $status == 1) {

+		$status = 1;

+	} else {

+		$status = 0;

+	}

 

-    $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

-    $old_rating = geodir_get_commentoverall($comment_info_ID);

+	$comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

+	$old_rating = geodir_get_commentoverall($comment_info_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if ($comment_id) {

+	if ($comment_id) {

 

-        $overall_rating = $old_rating;

+		$overall_rating = $old_rating;

 

-        if (isset($old_rating)) {

+		if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-            $wpdb->query($sqlqry);

+			$wpdb->query($sqlqry);

 

-            //update rating

-            geodir_update_postrating($post_id, $post_type);

+			//update rating

+			geodir_update_postrating($post_id, $post_type);

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -329,41 +329,41 @@ 
 function geodir_update_rating($comment_id = 0)

 {

 

-    global $wpdb, $plugin_prefix, $user_ID;

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $old_rating = geodir_get_commentoverall($comment_info->comment_ID);

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$old_rating = geodir_get_commentoverall($comment_info->comment_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if (isset($_REQUEST['geodir_overallrating'])) {

+	if (isset($_REQUEST['geodir_overallrating'])) {

 

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+		$overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            if (isset($old_rating)) {

+			if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+				$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-                $wpdb->query($sqlqry);

+				$wpdb->query($sqlqry);

 

-                //update rating

-                geodir_update_postrating($post_id, $post_type);

+				//update rating

+				geodir_update_postrating($post_id, $post_type);

 

-            }

-        }

-    }

+			}

+		}

+	}

 

 

 }

@@ -379,19 +379,19 @@ 
  */

 function geodir_comment_delete_comment($comment_id)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $review_info = geodir_get_review($comment_id);

-    if ($review_info) {

-        geodir_update_postrating($review_info->post_id);

-    }

+	$review_info = geodir_get_review($comment_id);

+	if ($review_info) {

+		geodir_update_postrating($review_info->post_id);

+	}

 

-    $wpdb->query(

-        $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

-            array($comment_id)

-        )

-    );

+	$wpdb->query(

+		$wpdb->prepare(

+			"DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+			array($comment_id)

+		)

+	);

 

 }

 

@@ -407,21 +407,21 @@ 
  * @return string The comment content.

  */

 function geodir_wrap_comment_text($content, $comment = '') {

-    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

-        if (!is_admin()) {

-            return '<div class="description">' . $content . '</div>';

-        } else {

-            return $content;

-        }

-    } else {

-        $rating = 0;

-        if (!empty($comment))

-            $rating = geodir_get_commentoverall($comment->comment_ID);

-        if ($rating != 0 && !is_admin()) {

-            return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

-        } else

-            return $content;

-    }

+	if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

+		if (!is_admin()) {

+			return '<div class="description">' . $content . '</div>';

+		} else {

+			return $content;

+		}

+	} else {

+		$rating = 0;

+		if (!empty($comment))

+			$rating = geodir_get_commentoverall($comment->comment_ID);

+		if ($rating != 0 && !is_admin()) {

+			return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+		} else

+			return $content;

+	}

 }

 

 

@@ -438,41 +438,41 @@ 
  */

 function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false)

 {

-    global $wpdb, $plugin_prefix, $comment;

-    if (!$post_type) {

-        $post_type = get_post_type($post_id);

-    }

-    $detail_table = $plugin_prefix . $post_type . '_detail';

-    $post_newrating = geodir_get_post_rating($post_id, 1);

-    $post_newrating_count = geodir_get_review_count_total($post_id);

+	global $wpdb, $plugin_prefix, $comment;

+	if (!$post_type) {

+		$post_type = get_post_type($post_id);

+	}

+	$detail_table = $plugin_prefix . $post_type . '_detail';

+	$post_newrating = geodir_get_post_rating($post_id, 1);

+	$post_newrating_count = geodir_get_review_count_total($post_id);

 

 

-    //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

+	//$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $detail_table . " SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

-                array($post_newrating, $post_newrating_count, $post_id)

-            )

-        );

-

-        update_post_meta($post_id, 'overall_rating', $post_newrating);

-        update_post_meta($post_id, 'rating_count', $post_newrating_count);

-    }

-    /**

-     * Called after Updating post overall rating and rating count.

-     *

-     * @since 1.0.0

-     * @since 1.4.3 Added `$post_id` param.

-     * @package GeoDirectory

-     * @param int $post_id The post ID.

-     */

-    do_action('geodir_update_postrating',$post_id);

+				array($post_newrating, $post_newrating_count, $post_id)

+			)

+		);

+

+		update_post_meta($post_id, 'overall_rating', $post_newrating);

+		update_post_meta($post_id, 'rating_count', $post_newrating_count);

+	}

+	/**

+	 * Called after Updating post overall rating and rating count.

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.3 Added `$post_id` param.

+	 * @package GeoDirectory

+	 * @param int $post_id The post ID.

+	 */

+	do_action('geodir_update_postrating',$post_id);

 

 }

 

@@ -490,29 +490,29 @@ 
  */

 function geodir_get_postoverall($post_id = 0)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$post_type = get_post_type($post_id);

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $post_ratings = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

-                array($post_id)

-            )

-        );

+		$post_ratings = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+				array($post_id)

+			)

+		);

 

 

-    } else {

-        $post_ratings = get_post_meta($post_id, 'overall_rating');

-    }

+	} else {

+		$post_ratings = get_post_meta($post_id, 'overall_rating');

+	}

 

-    if ($post_ratings)

-        return $post_ratings;

-    else

-        return false;

+	if ($post_ratings)

+		return $post_ratings;

+	else

+		return false;

 }

 

 

@@ -529,19 +529,19 @@ 
  */

 function geodir_get_review($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if (!empty($reatings))

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if (!empty($reatings))

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -557,19 +557,19 @@ 
  */

 function geodir_get_review_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -585,18 +585,18 @@ 
  */

 function geodir_get_review_count_by_user_id($user_id = 0)

 {

-    global $wpdb;

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

-            array($user_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+			array($user_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -614,27 +614,27 @@ 
  */

 function geodir_get_post_rating($post_id = 0, $force_query = 0)

 {

-    global $wpdb, $post;

-

-    if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

-        if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

-            return $post->overall_rating;

-        } else {

-            return 0;

-        }

-    }

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb, $post;

+

+	if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

+		if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

+			return $post->overall_rating;

+		} else {

+			return 0;

+		}

+	}

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -650,19 +650,19 @@ 
  */

 function geodir_get_review_count_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -679,20 +679,20 @@ 
  */

 function geodir_get_comments_number($post_id = 0)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

 

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -708,19 +708,19 @@ 
  */

 function geodir_get_commentoverall($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if ($reatings)

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if ($reatings)

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -734,7 +734,7 @@ 
  */

 function geodir_get_commentoverall_number($post_id = 0)

 {

-    return geodir_get_post_rating($post_id);

+	return geodir_get_post_rating($post_id);

 }

 

 

@@ -752,102 +752,102 @@ 
  */

 function geodir_comment_template($comment_template)

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

-        return;

-    }

-    if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

-        if (geodir_cpt_has_rating_disabled($post->post_type)) {

-            return $comment_template;

-        }

+	if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

+		return;

+	}

+	if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

+		if (geodir_cpt_has_rating_disabled($post->post_type)) {

+			return $comment_template;

+		}

         

-        $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

-        if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

-        }

-        return $template;

-    }

+		$template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

+		if (!$template) {

+			$template = dirname(__FILE__) . '/reviews.php';

+		}

+		return $template;

+	}

 }

 

 add_filter("comments_template", "geodir_comment_template");

 

 

 if (!function_exists('geodir_comment')) {

-    /**

-     * Comment HTML markup.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

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

-     * @param object $comment The comment object.

-     * @param string|array $args {

-     *     Optional. Formatting options.

-     *

-     *     @type object $walker            Instance of a Walker class to list comments. Default null.

-     *     @type int    $max_depth         The maximum comments depth. Default empty.

-     *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

-     *     @type string $callback          Callback function to use. Default null.

-     *     @type string $end-callback      Callback function to use at the end. Default null.

-     *     @type string $type              Type of comments to list.

-     *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

-     *     @type int    $page              Page ID to list comments for. Default empty.

-     *     @type int    $per_page          Number of comments to list per page. Default empty.

-     *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

-     *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

-     *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

-     *     @type string $format            How to format the comments list.

-     *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

-     *     @type bool   $short_ping        Whether to output short pings. Default false.

-     *     @type bool   $echo              Whether to echo the output or return it. Default true.

-     * }

-     * @param int $depth Depth of comment.

-     */

-    function geodir_comment($comment, $args, $depth)

-    {

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

-        switch ($comment->comment_type) :

-            case 'pingback' :

-            case 'trackback' :

-                // Display trackbacks differently than normal comments.

-                ?>

+	/**

+	 * Comment HTML markup.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

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

+	 * @param object $comment The comment object.

+	 * @param string|array $args {

+	 *     Optional. Formatting options.

+	 *

+	 *     @type object $walker            Instance of a Walker class to list comments. Default null.

+	 *     @type int    $max_depth         The maximum comments depth. Default empty.

+	 *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

+	 *     @type string $callback          Callback function to use. Default null.

+	 *     @type string $end-callback      Callback function to use at the end. Default null.

+	 *     @type string $type              Type of comments to list.

+	 *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

+	 *     @type int    $page              Page ID to list comments for. Default empty.

+	 *     @type int    $per_page          Number of comments to list per page. Default empty.

+	 *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

+	 *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

+	 *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

+	 *     @type string $format            How to format the comments list.

+	 *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

+	 *     @type bool   $short_ping        Whether to output short pings. Default false.

+	 *     @type bool   $echo              Whether to echo the output or return it. Default true.

+	 * }

+	 * @param int $depth Depth of comment.

+	 */

+	function geodir_comment($comment, $args, $depth)

+	{

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

+		switch ($comment->comment_type) :

+			case 'pingback' :

+			case 'trackback' :

+				// Display trackbacks differently than normal comments.

+				?>

                 <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">

                 <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>

                 <?php

-                break;

-            default :

-                // Proceed with normal comments.

-                global $post;

-                ?>

+				break;

+			default :

+				// Proceed with normal comments.

+				global $post;

+				?>

             <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">

                 <article id="comment-<?php comment_ID(); ?>" class="comment">

                     <header class="comment-meta comment-author vcard">

                         <?php

-                        /**

-                         * Filter to modify comment avatar size

-                         *

-                         * You can use this filter to change comment avatar size.

-                         *

-                         * @since 1.0.0

-                         * @package GeoDirectory

-                         */

-                        $avatar_size = apply_filters('geodir_comment_avatar_size', 44);

-                        echo get_avatar($comment, $avatar_size);

-                        printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

-                            get_comment_author_link(),

-                            // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

-                        );

-                        echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

-                        printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

-                            esc_url(get_comment_link($comment->comment_ID)),

-                            get_comment_time('c'),

-                            /* translators: 1: date, 2: time */

-                            sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

-                        );

-                        ?>

+						/**

+						 * Filter to modify comment avatar size

+						 *

+						 * You can use this filter to change comment avatar size.

+						 *

+						 * @since 1.0.0

+						 * @package GeoDirectory

+						 */

+						$avatar_size = apply_filters('geodir_comment_avatar_size', 44);

+						echo get_avatar($comment, $avatar_size);

+						printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

+							get_comment_author_link(),

+							// If current post author is also comment author, make it known visually.

+							($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+						);

+						echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

+						printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

+							esc_url(get_comment_link($comment->comment_ID)),

+							get_comment_time('c'),

+							/* translators: 1: date, 2: time */

+							sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

+						);

+						?>

                     </header>

                     <!-- .comment-meta -->

 

@@ -871,47 +871,47 @@ 
                 </article>

                 <!-- #comment-## -->

                 <?php

-                break;

-        endswitch; // end comment_type check

-    }

+				break;

+		endswitch; // end comment_type check

+	}

 }

 

 

 add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);

 if (!function_exists('geodir_fix_comment_count')) {

-    /**

-     * Fix comment count by not listing replies as reviews

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

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

-     * @param int $count The comment count.

-     * @param int $post_id The post ID.

-     * @todo $post is unreachable since the function return the count before that variable.

-     * @return bool|null|string The comment count.

-     */

-    function geodir_fix_comment_count($count, $post_id)

-    {

-        if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

-            global $post;

-            $post_types = geodir_get_posttypes();

-

-            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

-                $review_count = geodir_get_review_count_total($post_id);

-                return $review_count;

-

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

-                    return $post->rating_count;

-                } else {

-                    return geodir_get_comments_number($post_id);

-                }

-            } else {

-                return $count;

-            }

-        } else {

-            return $count;

-        }

-    }

+	/**

+	 * Fix comment count by not listing replies as reviews

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

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

+	 * @param int $count The comment count.

+	 * @param int $post_id The post ID.

+	 * @todo $post is unreachable since the function return the count before that variable.

+	 * @return bool|null|string The comment count.

+	 */

+	function geodir_fix_comment_count($count, $post_id)

+	{

+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

+			global $post;

+			$post_types = geodir_get_posttypes();

+

+			if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

+				$review_count = geodir_get_review_count_total($post_id);

+				return $review_count;

+

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

+					return $post->rating_count;

+				} else {

+					return geodir_get_comments_number($post_id);

+				}

+			} else {

+				return $count;

+			}

+		} else {

+			return $count;

+		}

+	}

 }

 

 /**

@@ -929,14 +929,14 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

-        return NULL;

-    }

-    $a_rating = $rating / 5 * 100;

-

-    if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

-    } else {

+	if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

+		return NULL;

+	}

+	$a_rating = $rating / 5 * 100;

+

+	if ($small) {

+		$r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+	} else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

@@ -953,8 +953,8 @@ 
 			}

 			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

 		}

-    }

-    return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

+	}

+	return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

 }

 

 /**

@@ -968,23 +968,23 @@ 
 function geodir_is_reviews_show($pageview = '')

 {

 

-    $active_tabs = get_option('geodir_detail_page_tabs_excluded');

-

-    $is_display = true;

-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))

-        $is_display = false;

-

-    /**

-     * Filter to change display value.

-     *

-     * You can use this filter to change the is_display value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $is_display Display ratings when set to true.

-     * @param string $pageview The view template. Ex: listview, gridview etc.

-     */

-    return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

+	$active_tabs = get_option('geodir_detail_page_tabs_excluded');

+

+	$is_display = true;

+	if (!empty($active_tabs) && in_array('reviews', $active_tabs))

+		$is_display = false;

+

+	/**

+	 * Filter to change display value.

+	 *

+	 * You can use this filter to change the is_display value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $is_display Display ratings when set to true.

+	 * @param string $pageview The view template. Ex: listview, gridview etc.

+	 */

+	return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

 }

 

 

@@ -992,9 +992,9 @@ 
  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

 if(function_exists('dsq_can_replace')) {

-    remove_filter('comments_template', 'dsq_comments_template');

-    add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+	remove_filter('comments_template', 'dsq_comments_template');

+	add_filter('comments_template', 'dsq_comments_template', 100);

+	add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

 }

 

 

@@ -1008,14 +1008,14 @@ 
  * @return string `1` if active `0` if disabled.

  */

 function geodir_option_disqus_active($disqus_active){

-    global $post;

-    $all_postypes = geodir_get_posttypes();

+	global $post;

+	$all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

-        $disqus_active = '0';

-    }

+	if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+		$disqus_active = '0';

+	}

 

-    return $disqus_active;

+	return $disqus_active;

 }

 

 /**

@@ -1029,23 +1029,23 @@ 
  * @return array Modified tabs array.

  */

 function geodir_detail_reviews_tab_title($tabs_arr) {

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {

-        $label_reviews = __('Comments', 'geodirectory');

+	if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {

+		$label_reviews = __('Comments', 'geodirectory');

         

-        if (defined('GEODIR_CP_VERSION')) {

-            $post_types = geodir_get_posttypes('array');

+		if (defined('GEODIR_CP_VERSION')) {

+			$post_types = geodir_get_posttypes('array');

             

-            if (!empty($post_types[$post_type]['labels']['label_reviews'])) {

-                $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory'));

-            }

-        }

+			if (!empty($post_types[$post_type]['labels']['label_reviews'])) {

+				$label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory'));

+			}

+		}

         

-        $tabs_arr['reviews']['heading_text'] = $label_reviews;

-    }

+		$tabs_arr['reviews']['heading_text'] = $label_reviews;

+	}

     

-    return $tabs_arr;

+	return $tabs_arr;

 }

 add_filter('geodir_detail_page_tab_list_extend', 'geodir_detail_reviews_tab_title', 1000, 1);

 

@@ -1056,13 +1056,13 @@ 
  * @since 1.6.21

  */

 function geodir_jetpack_disable_comments(){

-    //only run if jetpack installed

-    if(defined('JETPACK__VERSION')){

-        $post_types = geodir_get_posttypes();

-        foreach($post_types as $post_type){

-            add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false');

-        }

-    }

+	//only run if jetpack installed

+	if(defined('JETPACK__VERSION')){

+		$post_types = geodir_get_posttypes();

+		foreach($post_types as $post_type){

+			add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false');

+		}

+	}

 }

 

 add_action('plugins_loaded','geodir_jetpack_disable_comments');

@@ -1077,13 +1077,13 @@ 
  * @return bool True if allowed otherwise False.

  */

 function geodir_check_reviews_open( $open, $post_id ) {

-    if ( $open && $post_id && geodir_is_page( 'detail' ) ) {

-        if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) {

-            $open = false;

-        }

-    }

+	if ( $open && $post_id && geodir_is_page( 'detail' ) ) {

+		if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) {

+			$open = false;

+		}

+	}

     

-    return $open;

+	return $open;

 }

 add_filter( 'comments_open', 'geodir_check_reviews_open', 10, 2 );

 

@@ -1098,10 +1098,10 @@ 
  * @return string Filtered comment content.

  */

 function geodir_remove_img_tags_from_comment( $comment_text, $comment = array(), $args = array() ) {

-    if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) {

-        $comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text );

-        $comment_text = trim( $comment_text );

-    }

-    return $comment_text;

+	if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) {

+		$comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text );

+		$comment_text = trim( $comment_text );

+	}

+	return $comment_text;

 }

 add_filter( 'comment_text', 'geodir_remove_img_tags_from_comment', 10, 3 );
\ No newline at end of file

Spacing +58 added lines, -58 removed lines

@@ -67,10 +67,10 @@ 
  */

 function geodir_comment_rating_meta($comment) {

     $post_type = get_post_type($comment->comment_post_ID);

-	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

+	if (in_array($post_type, (array) geodir_get_posttypes()) && (int) $comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

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

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

 			$star_texts = array();

 			$star_texts[] = __('Terrible', 'geodirectory');

 			$star_texts[] = __('Poor', 'geodirectory');

@@ -81,13 +81,13 @@ 
 			echo geodir_font_awesome_rating_form_html('', $star_texts, $rating);

 		} else {			

 			if ($rating) {

-				echo '<div class="gd_rating" data-average="' . $rating . '" data-id="5">';

+				echo '<div class="gd_rating" data-average="'.$rating.'" data-id="5">';

 

 			} else {

 				echo '<div class="gd_rating" data-average="0" data-id="5"></div>';

 			}

 		}

-		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="' . $rating . '"  />';

+		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="'.$rating.'"  />';

 	}

 }

 

@@ -140,9 +140,9 @@ 
 {

 

     if (strpos($link, 'wp-login.php?') !== false) {

-        $link = str_replace(wp_login_url(),geodir_login_url(),$link);

+        $link = str_replace(wp_login_url(), geodir_login_url(), $link);

     }

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+    $link = '<div class="gd_comment_replaylink">'.$link.'</div>';

 

     return $link;

 }

@@ -159,7 +159,7 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+    $link = '<span class="gd-cancel-replaylink">'.$link.'</span>';

 

     return $link;

 }

@@ -199,10 +199,10 @@ 
     if (isset($_REQUEST['geodir_overallrating'])) {

         $overall_rating = $_REQUEST['geodir_overallrating'];

         

-		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+		if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("INSERT INTO ".GEODIR_REVIEW_TABLE." SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -289,7 +289,7 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

     if ($comment_id) {

 

@@ -297,7 +297,7 @@ 
 

         if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

@@ -339,18 +339,18 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

     if (isset($_REQUEST['geodir_overallrating'])) {

 

         $overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+        if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

             if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+                $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

@@ -388,7 +388,7 @@ 
 

     $wpdb->query(

         $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+            "DELETE FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d",

             array($comment_id)

         )

     );

@@ -407,9 +407,9 @@ 
  * @return string The comment content.

  */

 function geodir_wrap_comment_text($content, $comment = '') {

-    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

+    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int) $comment->comment_post_ID)) {

         if (!is_admin()) {

-            return '<div class="description">' . $content . '</div>';

+            return '<div class="description">'.$content.'</div>';

         } else {

             return $content;

         }

@@ -418,7 +418,7 @@ 
         if (!empty($comment))

             $rating = geodir_get_commentoverall($comment->comment_ID);

         if ($rating != 0 && !is_admin()) {

-            return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+            return '<div><div class="gd-rating-text">'.__('Overall Rating', 'geodirectory').': <div class="rating">'.$rating.'</div></div>'.geodir_get_rating_stars($rating, $comment->comment_ID).'</div><div class="description">'.$content.'</div>';

         } else

             return $content;

     }

@@ -442,18 +442,18 @@ 
     if (!$post_type) {

         $post_type = get_post_type($post_id);

     }

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

     $post_newrating = geodir_get_post_rating($post_id, 1);

     $post_newrating_count = geodir_get_review_count_total($post_id);

 

 

     //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+                "UPDATE ".$detail_table." SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

@@ -472,7 +472,7 @@ 
      * @package GeoDirectory

      * @param int $post_id The post ID.

      */

-    do_action('geodir_update_postrating',$post_id);

+    do_action('geodir_update_postrating', $post_id);

 

 }

 

@@ -493,13 +493,13 @@ 
     global $wpdb, $plugin_prefix;

 

     $post_type = get_post_type($post_id);

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $post_ratings = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+                "SELECT overall_rating FROM ".$detail_table." WHERE post_id = %d",

                 array($post_id)

             )

         );

@@ -533,7 +533,7 @@ 
 

     $reatings = $wpdb->get_row(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -561,7 +561,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT SUM(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -588,7 +588,7 @@ 
     global $wpdb;

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE user_id = %d AND status=1 AND overall_rating>0",

             array($user_id)

         )

     );

@@ -626,7 +626,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COALESCE(avg(overall_rating),0) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -654,7 +654,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -683,7 +683,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -712,7 +712,7 @@ 
 

     $reatings = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT overall_rating FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -766,7 +766,7 @@ 
         

         $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

         if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

+            $template = dirname(__FILE__).'/reviews.php';

         }

         return $template;

     }

@@ -838,7 +838,7 @@ 
                         printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

                             get_comment_author_link(),

                             // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+                            ($comment->user_id === $post->post_author) ? '<span>'.__('Post author', 'geodirectory').'</span>' : ''

                         );

                         echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

                         printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

@@ -896,7 +896,7 @@ 
             global $post;

             $post_types = geodir_get_posttypes();

 

-            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

+            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int) $post_id)) {

                 $review_count = geodir_get_review_count_total($post_id);

                 return $review_count;

 

@@ -929,29 +929,29 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

+    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int) $post_id)) {

         return NULL;

     }

     $a_rating = $rating / 5 * 100;

 

     if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: '.$a_rating.'%;"></div><div class="geodir_Star_small"></div></div></div>';

     } else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

 		} else {

-			$rating_img = '<img alt="rating icon" src="' . get_option('geodir_default_rating_star_icon') . '" />';

+			$rating_img = '<img alt="rating icon" src="'.get_option('geodir_default_rating_star_icon').'" />';

 			

 			/* fix rating star for safari */

 			$star_width = 23 * 5;

 			

 			if ($star_width > 0) {

-				$attach_style = 'max-width:' . $star_width . 'px';

+				$attach_style = 'max-width:'.$star_width.'px';

 			} else {

 				$attach_style = '';

 			}

-			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

+			$r_html = '<div class="geodir-rating" style="'.$attach_style.'"><div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingAverage" style="width: '.$a_rating.'%;"></div><div class="geodir_Star">'.$rating_img.$rating_img.$rating_img.$rating_img.$rating_img.'</div></div></div>';

 		}

     }

     return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

@@ -991,10 +991,10 @@ 
 /*

  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

-if(function_exists('dsq_can_replace')) {

+if (function_exists('dsq_can_replace')) {

     remove_filter('comments_template', 'dsq_comments_template');

     add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active', 10, 1);

 }

 

 

@@ -1007,11 +1007,11 @@ 
  * @param string $disqus_active Hook called before DB call for option so this is empty.

  * @return string `1` if active `0` if disabled.

  */

-function geodir_option_disqus_active($disqus_active){

+function geodir_option_disqus_active($disqus_active) {

     global $post;

     $all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+    if (isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

         $disqus_active = '0';

     }

 

@@ -1055,17 +1055,17 @@ 
  *

  * @since 1.6.21

  */

-function geodir_jetpack_disable_comments(){

+function geodir_jetpack_disable_comments() {

     //only run if jetpack installed

-    if(defined('JETPACK__VERSION')){

+    if (defined('JETPACK__VERSION')) {

         $post_types = geodir_get_posttypes();

-        foreach($post_types as $post_type){

-            add_filter('jetpack_comment_form_enabled_for_' . $post_type, '__return_false');

+        foreach ($post_types as $post_type) {

+            add_filter('jetpack_comment_form_enabled_for_'.$post_type, '__return_false');

         }

     }

 }

 

-add_action('plugins_loaded','geodir_jetpack_disable_comments');

+add_action('plugins_loaded', 'geodir_jetpack_disable_comments');

 

 /**

  * Check whether the current post is open for reviews.

@@ -1076,16 +1076,16 @@ 
  * @param int  $post_id The post ID.

  * @return bool True if allowed otherwise False.

  */

-function geodir_check_reviews_open( $open, $post_id ) {

-    if ( $open && $post_id && geodir_is_page( 'detail' ) ) {

-        if ( in_array( get_post_status( $post_id ), array( 'draft', 'pending', 'auto-draft', 'trash' ) ) ) {

+function geodir_check_reviews_open($open, $post_id) {

+    if ($open && $post_id && geodir_is_page('detail')) {

+        if (in_array(get_post_status($post_id), array('draft', 'pending', 'auto-draft', 'trash'))) {

             $open = false;

         }

     }

     

     return $open;

 }

-add_filter( 'comments_open', 'geodir_check_reviews_open', 10, 2 );

+add_filter('comments_open', 'geodir_check_reviews_open', 10, 2);

 

 /**

  * Filter the [img] tags from comment.

@@ -1097,11 +1097,11 @@ 
  * @param array           $args         An array of arguments.

  * @return string Filtered comment content.

  */

-function geodir_remove_img_tags_from_comment( $comment_text, $comment = array(), $args = array() ) {

-    if ( !empty( $comment_text ) && !empty( $comment ) && strpos( $comment_text, '[img' ) !== false && strpos( get_post_type( $comment->comment_post_ID ), 'gd_' ) === 0 ) {

-        $comment_text = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text );

-        $comment_text = trim( $comment_text );

+function geodir_remove_img_tags_from_comment($comment_text, $comment = array(), $args = array()) {

+    if (!empty($comment_text) && !empty($comment) && strpos($comment_text, '[img') !== false && strpos(get_post_type($comment->comment_post_ID), 'gd_') === 0) {

+        $comment_text = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_text);

+        $comment_text = trim($comment_text);

     }

     return $comment_text;

 }

-add_filter( 'comment_text', 'geodir_remove_img_tags_from_comment', 10, 3 );
\ No newline at end of file
+add_filter('comment_text', 'geodir_remove_img_tags_from_comment', 10, 3);
\ No newline at end of file

geodirectory-widgets/geodirectory_related_listing_widget.php

Indentation +110 added lines, -110 removed lines

@@ -14,160 +14,160 @@ 
  */
 class geodir_related_listing_postview extends WP_Widget
 {
-    /**
+	/**
 	 * Register the related listing 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_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
-        parent::__construct(
-            'post_related_listing', // Base ID
-            __('GD > Related Listing', 'geodirectory'), // Name
-            $widget_ops// Args
-        );
-    }
+	public function __construct() {
+		$widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
+		parent::__construct(
+			'post_related_listing', // Base ID
+			__('GD > Related Listing', 'geodirectory'), // Name
+			$widget_ops// Args
+		);
+	}
 
 	/**
 	 * Front-end display content for related listing 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)
-    {
+	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']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
+		/** This filter is documented in geodirectory_widgets.php */
+		$title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 
-        /**
-         * Filter the relation type to get related listing.
-         *
-         * @since 1.0.0
-         * @param string $instance['relate_to'] Can be tags or category.
-         */
+		/**
+		 * Filter the relation type to get related listing.
+		 *
+		 * @since 1.0.0
+		 * @param string $instance['relate_to'] Can be tags or category.
+		 */
 		$relate_to = empty($instance['relate_to']) ? 'category' : apply_filters('widget_relate_to', $instance['relate_to']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
 
-        $arr = array(
-            'before_title' => $before_title,
-            'after_title' => $after_title,
-            'title' => $title,
-            'post_number' => $post_number,
-            'relate_to' => $relate_to,
-            'layout' => $layout,
-            'add_location_filter' => $add_location_filter,
-            'listing_width' => $listing_width,
-            'list_sort' => $list_sort,
-            'character_count' => $character_count,
-            'is_widget' => '1'
-        );
-
-        if ($widget_display = geodir_related_posts_display($arr)) {
-
-            echo $before_widget;
-            echo $widget_display;
-            echo $after_widget;
-        }
-    }
+		$arr = array(
+			'before_title' => $before_title,
+			'after_title' => $after_title,
+			'title' => $title,
+			'post_number' => $post_number,
+			'relate_to' => $relate_to,
+			'layout' => $layout,
+			'add_location_filter' => $add_location_filter,
+			'listing_width' => $listing_width,
+			'list_sort' => $list_sort,
+			'character_count' => $character_count,
+			'is_widget' => '1'
+		);
+
+		if ($widget_display = geodir_related_posts_display($arr)) {
+
+			echo $before_widget;
+			echo $widget_display;
+			echo $after_widget;
+		}
+	}
 
 	/**
 	 * Sanitize related listing widget form values as they are saved.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $new_instance Values just sent to be saved.
 	 * @param array $old_instance Previously saved values from database.
 	 *
 	 * @return array Updated safe values to be saved.
 	 */
-    public function update($new_instance, $old_instance)
-    {
-        //save the widget
-        $instance = $old_instance;
-
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
-        $instance['relate_to'] = strip_tags($new_instance['relate_to']);
-        $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';
-
-        return $instance;
-    }
+	public function update($new_instance, $old_instance)
+	{
+		//save the widget
+		$instance = $old_instance;
+
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
+		$instance['relate_to'] = strip_tags($new_instance['relate_to']);
+		$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';
+
+		return $instance;
+	}
 
 	/**
 	 * Back-end related listing 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' => '',
-                'list_sort' => '',
-                'list_order' => '',
-                'post_number' => '5',
-                'relate_to' => '',
-                'layout' => 'gridview_onehalf',
-                'listing_width' => '',
-                'add_location_filter' => '1',
-                'character_count' => '20')
-        );
+	public function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance,
+			array('title' => '',
+				'list_sort' => '',
+				'list_order' => '',
+				'post_number' => '5',
+				'relate_to' => '',
+				'layout' => 'gridview_onehalf',
+				'listing_width' => '',
+				'add_location_filter' => '1',
+				'character_count' => '20')
+		);
 
-        $title = strip_tags($instance['title']);
+		$title = strip_tags($instance['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']);
 
-        $relate_to = strip_tags($instance['relate_to']);
+		$relate_to = strip_tags($instance['relate_to']);
 
-        $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'];
 
-        ?>
+		?>
         <p>
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
 
@@ -203,11 +203,11 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
                     <option <?php if ($relate_to == 'category') {
-                        echo 'selected="selected"';
-                    } ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
                     <option <?php if ($relate_to == 'tags') {
-                        echo 'selected="selected"';
-                    } ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
@@ -218,24 +218,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>
@@ -267,7 +267,7 @@ 
         </p>
 
     <?php
-    }
+	}
 } // class geodir_related_listing_postview
 
 register_widget('geodir_related_listing_postview');
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -137,7 +137,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array('title' => '',
                 'list_sort' => '',
                 'list_order' => '',
@@ -169,7 +169,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"
@@ -177,20 +177,20 @@ 
             </label>
         </p>
         <p>
-            <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>
+            <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>" name="<?php echo $this->get_field_name('list_sort'); ?>">
-                    <option value="latest"<?php selected( $list_sort, 'latest' ); ?>><?php _e('Latest', 'geodirectory'); ?></option>
-                    <option value="featured"<?php selected( $list_sort, 'featured' ); ?>><?php _e('Featured', 'geodirectory'); ?></option>
-                    <option value="high_review"<?php selected( $list_sort, 'high_review' ); ?>><?php _e('Review', 'geodirectory'); ?></option>
-                    <option value="high_rating"<?php selected( $list_sort, 'high_rating' ); ?>><?php _e('Rating', 'geodirectory'); ?></option>
-                    <option value="random"<?php selected( $list_sort, 'random' ); ?>><?php _e('Random', 'geodirectory'); ?></option>
-                    <option value="nearest"<?php selected( $list_sort, 'nearest' ); ?>><?php _e('Nearest', 'geodirectory'); ?></option>
+                    <option value="latest"<?php selected($list_sort, 'latest'); ?>><?php _e('Latest', 'geodirectory'); ?></option>
+                    <option value="featured"<?php selected($list_sort, 'featured'); ?>><?php _e('Featured', 'geodirectory'); ?></option>
+                    <option value="high_review"<?php selected($list_sort, 'high_review'); ?>><?php _e('Review', 'geodirectory'); ?></option>
+                    <option value="high_rating"<?php selected($list_sort, 'high_rating'); ?>><?php _e('Rating', 'geodirectory'); ?></option>
+                    <option value="random"<?php selected($list_sort, 'random'); ?>><?php _e('Random', 'geodirectory'); ?></option>
+                    <option value="nearest"<?php selected($list_sort, 'nearest'); ?>><?php _e('Nearest', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
         <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"
@@ -199,7 +199,7 @@ 
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('relate_to'); ?>">
-                <?php _e('Relate to:', 'geodirectory');?>
+                <?php _e('Relate to:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
                     <option <?php if ($relate_to == 'category') {
@@ -214,7 +214,7 @@ 
         <p>
         <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') {
@@ -242,7 +242,7 @@ 
         </p>
         <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"
@@ -251,7 +251,7 @@ 
         </p>
         <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); ?>"/>
@@ -259,9 +259,9 @@ 
         </p>
         <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>

geodirectory-functions/map-functions/map_on_add_listing_page.php

Spacing +82 added lines, -82 removed lines

@@ -82,16 +82,16 @@ 
     window.gdMaps = window.gdMaps || gdMaps;

     

     user_address = false;

-    jQuery('#<?php echo $prefix.'address';?>').keypress(function () {

+    jQuery('#<?php echo $prefix.'address'; ?>').keypress(function () {

         user_address = true;

     });

 

     baseMarker = '';

     geocoder = '';

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat :  '39.952484'; ?>;

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng :  '-75.163786'; ?>;

-    <?php if($lat_lng_blank){$lat='';$lng='';}?>

-    var <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12;?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat : '39.952484'; ?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng : '-75.163786'; ?>;

+    <?php if ($lat_lng_blank) {$lat = ''; $lng = ''; }?>

+    var <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12; ?>;

     var minZoomLevel = <?php echo ($is_map_restrict) ? 5 : 0; ?>;

     var oldstr_address;

     var oldstr_zip;

@@ -295,7 +295,7 @@ 
              *

              * @since 1.6.16

              */

-            echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

+            echo apply_filters("geodir_geocode_region_level", '["GB","ES"]'); ?>;

             if (jQuery.inArray(rr, $country_arr) !== -1) {

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

@@ -404,9 +404,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 jQuery.goMap.map.setCenter(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setPosition(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPosition(baseMarker.getPosition());

@@ -415,11 +415,11 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     function centerMap(latlng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         if (window.gdMaps == 'google') {

             jQuery.goMap.map.panTo(baseMarker.getPosition());

         } else if (window.gdMaps == 'osm') {

@@ -428,7 +428,7 @@ 
         }

     }

     function centerMarker() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         var center = jQuery.goMap.map.getCenter();

         if (window.gdMaps == 'google') {

             baseMarker.setPosition(center);

@@ -437,48 +437,48 @@ 
         }

     }

     function updateMapZoom(zoom) {

-        jQuery('#<?php echo $prefix.'mapzoom';?>').val(zoom);

+        jQuery('#<?php echo $prefix.'mapzoom'; ?>').val(zoom);

     }

     function updateMarkerPosition(markerlatLng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat());

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng());

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat());

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng());

     }

     function updateMarkerPositionOSM(markerlatLng) {

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat);

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng);

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat);

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng);

     }

     function updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry) {

-        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields);?>';

-        <?php ob_start();?>

-        var old_country = jQuery("#<?php echo $prefix.'country';?>").val();

-        var old_region = jQuery("#<?php echo $prefix.'region';?>").val();

+        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields); ?>';

+        <?php ob_start(); ?>

+        var old_country = jQuery("#<?php echo $prefix.'country'; ?>").val();

+        var old_region = jQuery("#<?php echo $prefix.'region'; ?>").val();

         

-        if (user_address == false || jQuery('#<?php echo $prefix.'address';?>').val() == '') {

-            jQuery("#<?php echo $prefix.'address';?>").val(getAddress).trigger("blur");

+        if (user_address == false || jQuery('#<?php echo $prefix.'address'; ?>').val() == '') {

+            jQuery("#<?php echo $prefix.'address'; ?>").val(getAddress).trigger("blur");

         }

         if (getAddress) {

             oldstr_address = getAddress;

         }

 

-        jQuery("#<?php echo $prefix.'zip';?>").val(getZip);

+        jQuery("#<?php echo $prefix.'zip'; ?>").val(getZip);

         if (getZip) {

             oldstr_zip = getZip;

         }

         if (set_map_val_in_fields) {

             if (getCountry) {

-                jQuery('#<?php echo $prefix .'country'; ?> option[value=""]').attr("selected",false);

-                jQuery('#<?php echo $prefix.'country';?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

-                jQuery("#<?php echo $prefix.'country';?>").trigger("chosen:updated");

+                jQuery('#<?php echo $prefix.'country'; ?> option[value=""]').attr("selected",false);

+                jQuery('#<?php echo $prefix.'country'; ?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

+                jQuery("#<?php echo $prefix.'country'; ?>").trigger("chosen:updated");

             }

             if (getState) {

-                if (jQuery('input[id="<?php echo $prefix.'region';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'region';?>").val(getState);

+                if (jQuery('input[id="<?php echo $prefix.'region'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'region'; ?>").val(getState);

                 }

             }

             if (getCity) {

-                if (jQuery('input[id="<?php echo $prefix.'city';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'city';?>").val(getCity);

+                if (jQuery('input[id="<?php echo $prefix.'city'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'city'; ?>").val(getCity);

                 }

             }

         }

@@ -494,23 +494,23 @@ 
         ?>

     }

     function geodir_codeAddress(set_on_map) {

-        var address = jQuery('#<?php echo $prefix.'address';?>').val();

-        var zip = jQuery('#<?php echo $prefix.'zip';?>').val();

-        var city = jQuery('#<?php echo $prefix.'city';?>').val();

-        var region = jQuery('#<?php echo $prefix.'region';?>').val();

-        var country = jQuery('#<?php echo $prefix.'country';?>').val();

-        var country_selected = jQuery('#<?php echo $prefix.'country';?>').find('option:selected');

+        var address = jQuery('#<?php echo $prefix.'address'; ?>').val();

+        var zip = jQuery('#<?php echo $prefix.'zip'; ?>').val();

+        var city = jQuery('#<?php echo $prefix.'city'; ?>').val();

+        var region = jQuery('#<?php echo $prefix.'region'; ?>').val();

+        var country = jQuery('#<?php echo $prefix.'country'; ?>').val();

+        var country_selected = jQuery('#<?php echo $prefix.'country'; ?>').find('option:selected');

         var ISO2 = country_selected.data('country_code');

-        if (!ISO2 && jQuery('#<?php echo $prefix.'country';?>').data('country_code')) {

-            ISO2 = jQuery('#<?php echo $prefix.'country';?>').data('country_code');

+        if (!ISO2 && jQuery('#<?php echo $prefix.'country'; ?>').data('country_code')) {

+            ISO2 = jQuery('#<?php echo $prefix.'country'; ?>').data('country_code');

         }

         if(!ISO2){

             <?php

-            if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

+            if (!defined('GEODIRLOCATION_TEXTDOMAIN')) {

                 global $wpdb;

                 $location_result = geodir_get_default_location();

-                if(!empty($location_result)){

-                    $ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s",$location_result->country));

+                if (!empty($location_result)) {

+                    $ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country=%s", $location_result->country));

                     echo "ISO2 = '$ISO2';";

                 }

             }

@@ -526,13 +526,13 @@ 
             zip = '';

         }

         if (typeof city == "undefined") {

-            city = '<?php echo addslashes_gpc($city);?>';

+            city = '<?php echo addslashes_gpc($city); ?>';

         }

         if (typeof region == "undefined") {

-            region = '<?php echo addslashes_gpc($region);?>';

+            region = '<?php echo addslashes_gpc($region); ?>';

         }

         if (typeof country == "undefined") {

-            country = '<?php echo addslashes_gpc($country);?>';

+            country = '<?php echo addslashes_gpc($country); ?>';

         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

@@ -550,7 +550,7 @@ 
             if( address == city || address == region || address == country || address == zip )

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+            if (is_admin() && isset($_REQUEST['tab'])) {?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

@@ -597,7 +597,7 @@ 
             geocoder.geocode({'address': address, 'country': ISO2},

                 function (results, status) {

                     console.log(status);

-                    jQuery("#<?php echo $prefix.'map';?>").goMap();

+                    jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         baseMarker.setPosition(results[0].geometry.location);

                         jQuery.goMap.map.setCenter(results[0].geometry.location);

@@ -614,21 +614,21 @@ 
                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

-                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:','geodirectory'));?> ' + status);

+                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:', 'geodirectory')); ?> ' + status);

                     }

                 });

         }

     }

     function gdMaxMap() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

 

-        jQuery('#<?php echo $prefix.'map';?>').toggleClass('map-fullscreen');

+        jQuery('#<?php echo $prefix.'map'; ?>').toggleClass('map-fullscreen');

         jQuery('.map_category').toggleClass('map_category_fullscreen');

-        jQuery('#<?php echo $prefix;?>trigger').toggleClass('map_category_fullscreen');

+        jQuery('#<?php echo $prefix; ?>trigger').toggleClass('map_category_fullscreen');

         jQuery('body').toggleClass('body_fullscreen');

-        jQuery('#<?php echo $prefix;?>loading_div').toggleClass('loading_div_fullscreen');

-        jQuery('#<?php echo $prefix;?>advmap_nofound').toggleClass('nofound_fullscreen');

-        jQuery('#<?php echo $prefix;?>triggermap').toggleClass('triggermap_fullscreen');

+        jQuery('#<?php echo $prefix; ?>loading_div').toggleClass('loading_div_fullscreen');

+        jQuery('#<?php echo $prefix; ?>advmap_nofound').toggleClass('nofound_fullscreen');

+        jQuery('#<?php echo $prefix; ?>triggermap').toggleClass('triggermap_fullscreen');

         jQuery('.TopLeft').toggleClass('TopLeft_fullscreen');

         window.setTimeout(function () {

             if (window.gdMaps == 'google') {

@@ -664,9 +664,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 centerMap(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setLatLng(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPositionOSM(baseMarker.getLatLng());

@@ -675,39 +675,39 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     

     jQuery(function ($) {

-        $("#<?php echo $prefix.'map';?>").goMap({

-            latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-            longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

-            zoom: <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT,

+        $("#<?php echo $prefix.'map'; ?>").goMap({

+            latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+            longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

+            zoom: <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT,

             maptype: 'ROADMAP', // Map type - HYBRID, ROADMAP, SATELLITE, TERRAIN

             streetViewControl: true,

-            <?php if(get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,';}?>

+            <?php if (get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,'; }?>

         });

 

         if (window.gdMaps) {

             geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : [];

 

             baseMarker = $.goMap.createMarker({

-                latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-                longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

+                latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+                longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

                 id: 'baseMarker',

-                icon: '<?php echo $marker_icon;?>',

+                icon: '<?php echo $marker_icon; ?>',

                 draggable: true,

                 addToMap: true, // For OSM

-                w: parseFloat('<?php echo $icon_size['w'];?>'),

-                h: parseFloat('<?php echo $icon_size['h'];?>'),

+                w: parseFloat('<?php echo $icon_size['w']; ?>'),

+                h: parseFloat('<?php echo $icon_size['h']; ?>'),

             });

         } else {

-            jQuery('#<?php echo $prefix.'advmap_nofound';?>').hide();

-            jQuery('#<?php echo $prefix.'advmap_notloaded';?>').show();

+            jQuery('#<?php echo $prefix.'advmap_nofound'; ?>').hide();

+            jQuery('#<?php echo $prefix.'advmap_notloaded'; ?>').show();

         }

         

-        $("#<?php echo $prefix;?>set_address_button").click(function () {

+        $("#<?php echo $prefix; ?>set_address_button").click(function () {

             var set_on_map = true;

             geodir_codeAddress(set_on_map);

         });

@@ -742,14 +742,14 @@ 
                 updateMapZoom($.goMap.map.zoom);

             });

 

-            var maxMap = document.getElementById('<?php echo $prefix;?>triggermap');

+            var maxMap = document.getElementById('<?php echo $prefix; ?>triggermap');

             google.maps.event.addDomListener(maxMap, 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country); ?>';

             geocoder.geocode({'address': CITY_ADDRESS},

                 function (results, status) {

-                    $("#<?php echo $prefix.'map';?>").goMap();

+                    $("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         // Bounds for North America

                         var bound_lat_lng = String(results[0].geometry.bounds);

@@ -760,13 +760,13 @@ 
                             new google.maps.LatLng(bound_lat_lng[2], bound_lat_lng[3])

                         );

                     } else {

-                        alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                        alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                     }

                 });

             <?php } ?>

             // Limit the zoom level

             google.maps.event.addListener($.goMap.map, 'zoom_changed', function () {

-                $("#<?php echo $prefix.'map';?>").goMap();

+                $("#<?php echo $prefix.'map'; ?>").goMap();

                 if ($.goMap.map.getZoom() < minZoomLevel) $.goMap.map.setZoom(minZoomLevel);

             });

         } else if (window.gdMaps == 'osm') {

@@ -792,10 +792,10 @@ 
                 updateMapZoom($.goMap.map.getZoom());

             });

 

-            L.DomEvent.addListener($('<?php echo $prefix;?>triggermap'), 'click', gdMaxMap);

+            L.DomEvent.addListener($('<?php echo $prefix; ?>triggermap'), 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country); ?>';

             geocodePositionOSM('', CITY_ADDRESS);

             <?php } ?>

             // Limit the zoom level

@@ -818,14 +818,14 @@ 
 <div class="top_banner_section_inn geodir_map_container clearfix" style="margin-top:10px;">

     <div class="TopLeft"><span id="<?php echo $prefix; ?>triggermap" style="margin-top:-11px;margin-left:-12px;"></span></div>

     <div class="TopRight"></div>

-    <div id="<?php echo $prefix . 'map'; ?>" class="geodir_map" style="height:300px">

+    <div id="<?php echo $prefix.'map'; ?>" class="geodir_map" style="height:300px">

         <!-- new map start -->

         <div class="iprelative">

-            <div id="<?php echo $prefix . 'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

+            <div id="<?php echo $prefix.'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

             <div id="<?php echo $prefix; ?>loading_div" style="height:300px"></div>

             <div id="<?php echo $prefix; ?>advmap_counter"></div>

             <div id="<?php echo $prefix; ?>advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-            <div id="<?php echo $prefix;?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

+            <div id="<?php echo $prefix; ?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

         </div>

         <!-- new map end -->

     </div>

geodirectory-functions/template_functions.php

Doc Comments +4 added lines, -1 removed lines

@@ -417,7 +417,7 @@ 
  * @global object $post The current post object.

  * @global object $geodirectory Not yet implemented.

  * @param string $slug The template slug.

- * @param null $name The template name.

+ * @param string $name The template name.

  */

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

 {

@@ -673,6 +673,9 @@ 
 	}

 }

 

+/**
+ * @param string $shortcode
+ */
 function geodir_parse_shortcodes( $content, $shortcode, $first = true ) {

     if ( empty( $content ) || empty( $shortcode ) ) {

         return array();

Indentation +404 added lines, -404 removed lines

@@ -19,127 +19,127 @@ 
  */

 function geodir_locate_template($template = '')

 {

-    global $post_type, $wp, $post;

-    $fields = array();

-

-    switch ($template):

-        case 'signup':

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

-            break;

-        case 'add-listing':

-            $gd_post_types = geodir_get_posttypes();

+	global $post_type, $wp, $post;

+	$fields = array();

+

+	switch ($template):

+		case 'signup':

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

+			break;

+		case 'add-listing':

+			$gd_post_types = geodir_get_posttypes();

             

-            if (!(!empty($post_type) && in_array($post_type, $gd_post_types))) {

-                $post_type = '';

-            }

+			if (!(!empty($post_type) && in_array($post_type, $gd_post_types))) {

+				$post_type = '';

+			}

             

-            $sc_post_type = '';

-            if (is_page() && !empty($post->post_content) && ($shortcode = geodir_parse_shortcodes($post->post_content, 'gd_add_listing'))) {

-                $listing_page_id = $post->ID;

-                if (!empty($shortcode['listing_type'])) {

-                    $sc_post_type = $shortcode['listing_type'];

-                }

-            } else {

-                $listing_page_id = geodir_add_listing_page_id();

-            }

+			$sc_post_type = '';

+			if (is_page() && !empty($post->post_content) && ($shortcode = geodir_parse_shortcodes($post->post_content, 'gd_add_listing'))) {

+				$listing_page_id = $post->ID;

+				if (!empty($shortcode['listing_type'])) {

+					$sc_post_type = $shortcode['listing_type'];

+				}

+			} else {

+				$listing_page_id = geodir_add_listing_page_id();

+			}

             

-            $is_wpml = geodir_is_wpml() ? true : false;

+			$is_wpml = geodir_is_wpml() ? 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'], $gd_post_types)) {

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

-            }

+			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'], $gd_post_types)) {

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

+			}

             

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

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

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

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

                 

-                if (!empty($gd_post_types)) {

-                    $post_type = $gd_post_types[0];

-                }

+				if (!empty($gd_post_types)) {

+					$post_type = $gd_post_types[0];

+				}

                 

-                if ($sc_post_type != '') {

-                    $post_type = $sc_post_type;

-                }

+				if ($sc_post_type != '') {

+					$post_type = $sc_post_type;

+				}

                 

-                if (empty($post_type) && !empty($gd_post_types)) {

-                    $post_type = $gd_post_types[0];

-                }

+				if (empty($post_type) && !empty($gd_post_types)) {

+					$post_type = $gd_post_types[0];

+				}

                 

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

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

 

 }

 

@@ -158,255 +158,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_wpml_is_post_type_translated(get_post_type((int)$_GET['pid'])) && $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_wpml_is_post_type_translated(get_post_type((int)$_GET['pid'])) && $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');

-

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

-    }

+		$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 (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

-        global $preview;

-        $preview = true;

 

-        $template = geodir_locate_template('preview');

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

+		global $preview;

+		$preview = true;

 

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

+		$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 (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

 

-        $template = geodir_locate_template('success');

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

 

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

+		$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 (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

+	}

 

-        $template = geodir_locate_template('detail');

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

 

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

+		$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 (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

+	}

 

-        $template = geodir_locate_template('listing');

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

 

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

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

+	}

 

-        $template = geodir_locate_template('search');

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

 

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

+		$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 (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+	}

 

-        $template = geodir_locate_template('author');

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

 

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

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

+	}

 

-        global $post, $wp_query;

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

 

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

-        ) {

+		global $post, $wp_query;

 

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

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

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

 

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

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

 

-            $template = geodir_locate_template('location');

+		} elseif (geodir_is_page('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);

+			$template = geodir_locate_template('location');

 

-        } else

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

 

-    return $template;

+	}

+

+	return $template;

 }

 

 /**

@@ -421,44 +421,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;

 

 }

 

@@ -474,23 +474,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;

 }

 

 /**

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

@@ -674,40 +674,40 @@ 
 }

 

 function geodir_parse_shortcodes( $content, $shortcode, $first = true ) {

-    if ( empty( $content ) || empty( $shortcode ) ) {

-        return array();

-    }

+	if ( empty( $content ) || empty( $shortcode ) ) {

+		return array();

+	}

     

-    if ( false === strpos( $content, '[' ) ) {

-        return array();

-    }

-

-    if ( ! has_shortcode( $content, $shortcode ) ) {

-        return array();

-    }

-

-    $shortcodes = array();

-    if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) ) {

-        foreach ( $matches as $match ) {

-            if ( $shortcode === $match[2] ) {

-                $shortcode_attrs = shortcode_parse_atts( $match[3] );

-                if ( ! is_array( $shortcode_attrs ) ) {

-                    $shortcode_attrs = array();

-                }

-                $shortcode_attrs['shortcode_tag'] = $shortcode;

-                if ( !empty( $match[5] ) ) {

-                    $shortcode_attrs['shortcode_content'] = $match[5];

-                }

-                $shortcodes[] = $shortcode_attrs;

-                if ( $first === true ) {

-                    break;

-                }

-            }

-        }

-        if ( $first === true && !empty( $shortcodes ) ) {

-            $shortcodes = $shortcodes[0];

-        }

-    }

-

-    return apply_filters( 'geodir_parse_shortcodes', $shortcodes, $content, $shortcode, $first );

+	if ( false === strpos( $content, '[' ) ) {

+		return array();

+	}

+

+	if ( ! has_shortcode( $content, $shortcode ) ) {

+		return array();

+	}

+

+	$shortcodes = array();

+	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) ) {

+		foreach ( $matches as $match ) {

+			if ( $shortcode === $match[2] ) {

+				$shortcode_attrs = shortcode_parse_atts( $match[3] );

+				if ( ! is_array( $shortcode_attrs ) ) {

+					$shortcode_attrs = array();

+				}

+				$shortcode_attrs['shortcode_tag'] = $shortcode;

+				if ( !empty( $match[5] ) ) {

+					$shortcode_attrs['shortcode_content'] = $match[5];

+				}

+				$shortcodes[] = $shortcode_attrs;

+				if ( $first === true ) {

+					break;

+				}

+			}

+		}

+		if ( $first === true && !empty( $shortcodes ) ) {

+			$shortcodes = $shortcodes[0];

+		}

+	}

+

+	return apply_filters( 'geodir_parse_shortcodes', $shortcodes, $content, $shortcode, $first );

 }
\ No newline at end of file

Spacing +47 added lines, -47 removed lines

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

             }

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

@@ -191,7 +191,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.

@@ -205,11 +205,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.

              *

@@ -221,10 +221,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_wpml_is_post_type_translated(get_post_type((int)$_GET['pid'])) && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

+            if (geodir_wpml_is_post_type_translated(get_post_type((int) $_GET['pid'])) && $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());

@@ -243,7 +243,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.

                  *

@@ -265,7 +265,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.

          *

@@ -282,7 +282,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.

          *

@@ -298,7 +298,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.

          *

@@ -313,7 +313,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.

          *

@@ -328,7 +328,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.

          *

@@ -343,7 +343,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.

          *

@@ -358,7 +358,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.

          *

@@ -369,7 +369,7 @@ 
 

     }

 

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

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

 

         global $post, $wp_query;

 

@@ -379,7 +379,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.

              *

@@ -392,7 +392,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.

              *

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

 

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

          *

@@ -457,7 +457,7 @@ 
          */

         include($template);

     else:

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

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

     endif;

 

 }

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

@@ -519,7 +519,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>';

 }

 

 /**

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

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -613,7 +613,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>';

@@ -642,14 +642,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>';

 	}

 

@@ -668,46 +668,46 @@ 
 		$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>';

 		}

 	}

 }

 

-function geodir_parse_shortcodes( $content, $shortcode, $first = true ) {

-    if ( empty( $content ) || empty( $shortcode ) ) {

+function geodir_parse_shortcodes($content, $shortcode, $first = true) {

+    if (empty($content) || empty($shortcode)) {

         return array();

     }

     

-    if ( false === strpos( $content, '[' ) ) {

+    if (false === strpos($content, '[')) {

         return array();

     }

 

-    if ( ! has_shortcode( $content, $shortcode ) ) {

+    if (!has_shortcode($content, $shortcode)) {

         return array();

     }

 

     $shortcodes = array();

-    if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) ) {

-        foreach ( $matches as $match ) {

-            if ( $shortcode === $match[2] ) {

-                $shortcode_attrs = shortcode_parse_atts( $match[3] );

-                if ( ! is_array( $shortcode_attrs ) ) {

+    if (preg_match_all('/'.get_shortcode_regex().'/s', $content, $matches, PREG_SET_ORDER)) {

+        foreach ($matches as $match) {

+            if ($shortcode === $match[2]) {

+                $shortcode_attrs = shortcode_parse_atts($match[3]);

+                if (!is_array($shortcode_attrs)) {

                     $shortcode_attrs = array();

                 }

                 $shortcode_attrs['shortcode_tag'] = $shortcode;

-                if ( !empty( $match[5] ) ) {

+                if (!empty($match[5])) {

                     $shortcode_attrs['shortcode_content'] = $match[5];

                 }

                 $shortcodes[] = $shortcode_attrs;

-                if ( $first === true ) {

+                if ($first === true) {

                     break;

                 }

             }

         }

-        if ( $first === true && !empty( $shortcodes ) ) {

+        if ($first === true && !empty($shortcodes)) {

             $shortcodes = $shortcodes[0];

         }

     }

 

-    return apply_filters( 'geodir_parse_shortcodes', $shortcodes, $content, $shortcode, $first );

+    return apply_filters('geodir_parse_shortcodes', $shortcodes, $content, $shortcode, $first);

 }
\ No newline at end of file