GeoDirectory / geodirectory

geodirectory-functions/reviews.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
  * the visitor has not yet entered the password we will

  * return early without loading the comments.

  */

-if (post_password_required())

-    return;

+if (post_password_required()) {
+    return;
+}
 ?>

 

 <div id="comments" class="comments-area">

Indentation +53 added lines, -53 removed lines

@@ -17,7 +17,7 @@ 
  * return early without loading the comments.

  */

 if (post_password_required())

-    return;

+	return;

 ?>

 

 <div id="comments" class="comments-area">

@@ -25,35 +25,35 @@ 
     <?php // You can start editing here -- including this comment! ?>

 

     <?php

-    /**

-     * Called before displaying reviews.

-     *

-     * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.

-     *

-     * @since 1.5.7

-     */

-    do_action('geodir_before_review_list'); ?>

+	/**

+	 * Called before displaying reviews.

+	 *

+	 * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.

+	 *

+	 * @since 1.5.7

+	 */

+	do_action('geodir_before_review_list'); ?>

 

     <?php if (have_comments()) : ?>

         <h2 class="comments-title">

             <?php

-            printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),

-                number_format_i18n(get_comments_number()), get_the_title());

-            ?>

+			printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),

+				number_format_i18n(get_comments_number()), get_the_title());

+			?>

         </h2>

 

         <?php

-        /**

-         * Called after displaying review listing title.

-         *

-         * @since 1.5.7

-         */

-        do_action('geodir_after_review_list_title'); ?>

+		/**

+		 * Called after displaying review listing title.

+		 *

+		 * @since 1.5.7

+		 */

+		do_action('geodir_after_review_list_title'); ?>

 

         <ol class="commentlist">

             <?php $reverse_top_level = is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php') ? false : null; ?>

 			<?php wp_list_comments(array('callback' => 'geodir_comment', 'reverse_top_level' => $reverse_top_level, 'style' => 'ol'));

-            ?>

+			?>

         </ol><!-- .commentlist -->

 

         <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>

@@ -68,51 +68,51 @@ 
         <?php endif; // check for comment navigation ?>

 

         <?php

-        /* If there are no comments and comments are closed, let's leave a note.

+		/* If there are no comments and comments are closed, let's leave a note.

          * But we only want the note on posts and pages that had comments in the first place.

          */

-        if (!comments_open() && get_comments_number()) : ?>

+		if (!comments_open() && get_comments_number()) : ?>

             <p class="nocomments"><?php _e('Reviews are closed.', 'geodirectory'); ?></p>

         <?php endif; ?>

 

     <?php endif; // have_comments() ?>

 

     <?php

-    /**

-     * Called before displaying "Leave a review form".

-     *

-     * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.

-     * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.

-     *

-     * @since 1.5.7

-     */

-    do_action('geodir_before_review_form'); ?>

+	/**

+	 * Called before displaying "Leave a review form".

+	 *

+	 * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.

+	 * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.

+	 *

+	 * @since 1.5.7

+	 */

+	do_action('geodir_before_review_form'); ?>

 

     <?php

-    /**

-     * Filters comment form args

-     *

-     * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.

-     *

-     * @since 1.0.0

-     */

-    $args = apply_filters('geodir_review_form_args', array(

-        'title_reply' => __('Leave a Review', 'geodirectory'),

-        'label_submit' => __('Post Review', 'geodirectory'),

-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'

-    ));

-    comment_form($args);

-    ?>

+	/**

+	 * Filters comment form args

+	 *

+	 * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.

+	 *

+	 * @since 1.0.0

+	 */

+	$args = apply_filters('geodir_review_form_args', array(

+		'title_reply' => __('Leave a Review', 'geodirectory'),

+		'label_submit' => __('Post Review', 'geodirectory'),

+		'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

+		'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'

+	));

+	comment_form($args);

+	?>

 

     <?php

-    /**

-     * Called after displaying "Leave a review form".

-     *

-     * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.

-     *

-     * @since 1.5.7

-     */

-    do_action('geodir_after_review_form'); ?>

+	/**

+	 * Called after displaying "Leave a review form".

+	 *

+	 * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.

+	 *

+	 * @since 1.5.7

+	 */

+	do_action('geodir_after_review_form'); ?>

 

 </div><!-- #comments .comments-area -->
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -99,8 +99,8 @@
     $args = apply_filters('geodir_review_form_args', array(

         'title_reply' => __('Leave a Review', 'geodirectory'),

         'label_submit' => __('Post Review', 'geodirectory'),

-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'

+        'comment_field' => '<p class="comment-form-comment"><label for="comment">'.__('Review text', 'geodirectory').'</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

+        'must_log_in' => '<p class="must-log-in">'.sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()).'</p>'

     ));

     comment_form($args);

     ?>

geodirectory-functions/wp-session/wp-session.php

Spacing +27 added lines, -27 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Return the current cache expire setting.
@@ -36,10 +36,10 @@ 
  *
  * @param string $data
  */
-function wp_session_decode( $data ) {
+function wp_session_decode($data) {
 	$wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+	return $wp_session->json_in($data);
 }
 
 /**
@@ -60,10 +60,10 @@ 
  *
  * @return bool
  */
-function wp_session_regenerate_id( $delete_old_session = false ) {
+function wp_session_regenerate_id($delete_old_session = false) {
 	$wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+	$wp_session->regenerate_id($delete_old_session);
 
 	return true;
 }
@@ -77,11 +77,11 @@ 
  */
 function wp_session_start() {
 	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+	do_action('wp_session_start');
 
 	return $wp_session->session_started();
 }
-add_action( 'plugins_loaded', 'wp_session_start' );
+add_action('plugins_loaded', 'wp_session_start');
 
 /**
  * Return the current session status.
@@ -91,7 +91,7 @@ 
 function wp_session_status() {
 	$wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
+	if ($wp_session->session_started()) {
 		return PHP_SESSION_ACTIVE;
 	}
 
@@ -114,9 +114,9 @@ 
 	$wp_session = WP_Session::get_instance();
 
 	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+	do_action('wp_session_commit');
 }
-add_action( 'shutdown', 'wp_session_write_close' );
+add_action('shutdown', 'wp_session_write_close');
 
 /**
  * Clean up expired sessions by removing data and their expiration entries from
@@ -128,51 +128,51 @@ 
 function wp_session_cleanup() {
 	global $wpdb;
 
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+	if (defined('WP_SETUP_CONFIG')) {
 		return;
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		$expiration_keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'" );
+	if (!defined('WP_INSTALLING')) {
+		$expiration_keys = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'");
 
-		$now = current_time( 'timestamp' );
+		$now = current_time('timestamp');
 		$expired_sessions = array();
 
-		foreach( $expiration_keys as $expiration ) {
+		foreach ($expiration_keys as $expiration) {
 
 			// If the session has expired
-			if ( $now > intval( $expiration->option_value ) ) {
+			if ($now > intval($expiration->option_value)) {
 
 				// Get the session ID by parsing the option_name
-				$session_id = substr( $expiration->option_name, 20 );
+				$session_id = substr($expiration->option_name, 20);
 
-				if( (int) -1 === (int) $session_id || ! preg_match( '/^[a-f0-9]{32}$/', $session_id ) ) {
+				if ((int) -1 === (int) $session_id || !preg_match('/^[a-f0-9]{32}$/', $session_id)) {
 					continue;
 				}
 
 				$expired_sessions[] = $expiration->option_name;
-				$expired_sessions[] = esc_sql( "_wp_session_$session_id" );
+				$expired_sessions[] = esc_sql("_wp_session_$session_id");
 			}
 		}
 
 		// Delete all expired sessions in a single query
-		if ( ! empty( $expired_sessions ) ) {
-			$option_names = implode( "','", $expired_sessions );
-			$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name IN ('$option_names')"  );
+		if (!empty($expired_sessions)) {
+			$option_names = implode("','", $expired_sessions);
+			$wpdb->query("DELETE FROM $wpdb->options WHERE option_name IN ('$option_names')");
 		}
 	}
 
 	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+	do_action('wp_session_cleanup');
 }
-add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
+add_action('wp_session_garbage_collection', 'wp_session_cleanup');
 
 /**
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wp_session_garbage_collection' );
+	if (!wp_next_scheduled('wp_session_garbage_collection')) {
+		wp_schedule_event(current_time('timestamp'), 'twicedaily', 'wp_session_garbage_collection');
 	}
 }
-add_action( 'wp', 'wp_session_register_garbage_collection' );
+add_action('wp', 'wp_session_register_garbage_collection');

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Return the current cache expire setting.

geodirectory-templates/login_frm.php

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
         echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

     }

 

-    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') {
+            echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';
+    }
 

     ?>

     <form name="cus_loginform" id="cus_loginform" action="<?php echo esc_url(geodir_curPageURL()); ?>"

Spacing +3 added lines, -3 removed lines

@@ -49,13 +49,13 @@
     </h4>

     <?php

     if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

+        echo "<p class=\"error_msg\"> ".INVALID_USER_FPW_MSG." </p>";

     } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

+        echo "<p class=\"error_msg\"> ".INVALID_USER_PW_MSG." </p>";

     }

 

     if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+        echo '<p class="sucess_msg">'.PW_SEND_CONFIRM_MSG.'</p>';

 

     ?>

     <form name="cus_loginform" id="cus_loginform" action="<?php echo esc_url(geodir_curPageURL()); ?>"

Indentation +40 added lines, -40 removed lines

@@ -10,13 +10,13 @@ 
  */

 

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 

 }

 

@@ -38,37 +38,37 @@ 
     <h4>

         <?php

 

-            /**

-             * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);

+			/**

+			 * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);

 

-        ?>

+		?>

     </h4>

     <?php

-    if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

-    } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

-    }

+	if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

+		echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

+	} elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

+		echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

+	}

 

-    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+	if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

+		echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

 

-    do_action('geodir_login_error_messages');

+	do_action('geodir_login_error_messages');

 

-    ?>

+	?>

     <form name="cus_loginform" id="cus_loginform" method="post">

 

         <div class="form_row clearfix">

             <input placeholder='<?php echo USERNAME_TEXT; ?>' type="text" name="log" id="user_login"

                    value="<?php global $user_login;

-                   if (!isset($user_login)) {

-                       $user_login = '';

-                   }

-                   echo esc_attr($user_login); ?>" size="20" class="textfield"/>

+				   if (!isset($user_login)) {

+					   $user_login = '';

+				   }

+				   echo esc_attr($user_login); ?>" size="20" class="textfield"/>

             <span class="user_loginInfo"></span>

         </div>

 

@@ -79,14 +79,14 @@ 
         </div>

 

         <?php

-        /**

-         * This is a default WordPress action that calls any additional elements needed for any login forms.

-         *

-         * We use this action before the remember me checkbox on the sigin form.

-         *

-         * @since 1.0.0

-         */

-        do_action('login_form'); ?>

+		/**

+		 * This is a default WordPress action that calls any additional elements needed for any login forms.

+		 *

+		 * We use this action before the remember me checkbox on the sigin form.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('login_form'); ?>

         <p class="rember">

             <input name="rememberme" type="checkbox" id="rememberme" value="forever" class="fl"/>

             <?php echo REMEMBER_ON_COMPUTER_TEXT; ?>

@@ -110,12 +110,12 @@ 
                 <input placeholder='<?php echo USERNAME_EMAIL_TEXT; ?>' type="text" name="user_login"

                        value="<?php echo esc_attr($user_login); ?>" size="20" class="user_login1 textfield"/>

                 <?php

-                /**

-                 * Called before the get new password button in the login box template.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('lostpassword_form'); ?>

+				/**

+				 * Called before the get new password button in the login box template.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('lostpassword_form'); ?>

             </div>

             <input type="submit" name="get_new_password" value="<?php echo GET_NEW_PW_TEXT; ?>" class="geodir_button"/>

         </form>

geodirectory-templates/preview-buttons.php

Braces +5 added lines, -4 removed lines

@@ -61,10 +61,11 @@
                 ob_start();
                 echo '<h5 class="geodir_information">';
 
-                if (!isset($_REQUEST['pid']))
-                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
-                else
-                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
+                if (!isset($_REQUEST['pid'])) {
+                                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
+                } else {
+                                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
+                }
 
                 echo '</h5>';
                 $publish_listing_form_message = ob_get_clean();

Indentation +76 added lines, -76 removed lines

@@ -15,9 +15,9 @@ 
 $post_type = $post->listing_type;
 
 if (isset($_REQUEST['preview']) && $_REQUEST['preview'] && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
+	$form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
 } elseif (isset($_REQUEST['preview']) && $_REQUEST['preview']) {
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
+	$form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
 }
 
 /**
@@ -45,48 +45,48 @@ 
         <form action="<?php echo $form_action_url; ?>" name="publish_listing" id="publish_listing" method="post">
             <div class="clearfix">
                 <input type="hidden" name="pid" value="<?php if (isset($post->pid)) {
-                    echo $post->pid;
-                } ?>">
+					echo $post->pid;
+				} ?>">
                 <?php
-                /**
-                 * Called on the add listing preview page inside the publish listings form, before the publish message.
-                 *
-                 * @since 1.0.0
-                 * @see 'geodir_publish_listing_form_after_msg'
-                 */
-                do_action('geodir_publish_listing_form_before_msg'); ?>
+				/**
+				 * Called on the add listing preview page inside the publish listings form, before the publish message.
+				 *
+				 * @since 1.0.0
+				 * @see 'geodir_publish_listing_form_after_msg'
+				 */
+				do_action('geodir_publish_listing_form_before_msg'); ?>
                 <?php
-                $alive_days = UNLIMITED;
-                $type_title = '';
-                ob_start();
-                echo '<h5 class="geodir_information">';
-
-                if (!isset($_REQUEST['pid']))
-                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
-                else
-                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
-
-                echo '</h5>';
-                $publish_listing_form_message = ob_get_clean();
-                /**
-                 * Filter the publish listing message on the preview page.
-                 *
-                 * @since 1.0.0
-                 * @param string $publish_listing_form_message The message to be filtered.
-                 */
-                $publish_listing_form_message = apply_filters('geodir_publish_listing_form_message', $publish_listing_form_message);
-                echo $publish_listing_form_message;
-
-                /**
-                 * Called on the add listing preview page inside the publish listings form, after the publish message.
-                 *
-                 * @since 1.0.0
-                 * @see 'geodir_publish_listing_form_before_msg'
-                 */
-                do_action('geodir_publish_listing_form_after_msg');
-
-                ob_start(); // start action button buffering
-                ?>
+				$alive_days = UNLIMITED;
+				$type_title = '';
+				ob_start();
+				echo '<h5 class="geodir_information">';
+
+				if (!isset($_REQUEST['pid']))
+					printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
+				else
+					printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
+
+				echo '</h5>';
+				$publish_listing_form_message = ob_get_clean();
+				/**
+				 * Filter the publish listing message on the preview page.
+				 *
+				 * @since 1.0.0
+				 * @param string $publish_listing_form_message The message to be filtered.
+				 */
+				$publish_listing_form_message = apply_filters('geodir_publish_listing_form_message', $publish_listing_form_message);
+				echo $publish_listing_form_message;
+
+				/**
+				 * Called on the add listing preview page inside the publish listings form, after the publish message.
+				 *
+				 * @since 1.0.0
+				 * @see 'geodir_publish_listing_form_before_msg'
+				 */
+				do_action('geodir_publish_listing_form_after_msg');
+
+				ob_start(); // start action button buffering
+				?>
                 <?php if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>
 
                     <input type="submit" name="Submit and Pay" value="<?php echo PRO_UPDATE_BUTTON; ?>"
@@ -95,46 +95,46 @@ 
                     <input type="submit" name="Submit and Pay" value="<?php echo PRO_SUBMIT_BUTTON; ?>"
                            class=" geodir_button geodir_publish_button"/>
                 <?php
-                }
-                $publish_listing_form_button = ob_get_clean();
-                /**
-                 * Filter the HTML button for publishing the listing on the preview page.
-                 *
-                 * @since 1.0.0
-                 * @param string $publish_listing_form_button The HTML for the submit button.
-                 */
-                $publish_listing_form_button = apply_filters('geodir_publish_listing_form_button', $publish_listing_form_button);
-                echo $publish_listing_form_button;
-
-                $post_id = '';
-                if (isset($post->pid)) {
-                    $post_id = $post->pid;
-                } else if (isset($_REQUEST['pid'])) {
-                    $post_id = (int)$_REQUEST['pid'];
-                }
-
-                $postlink = get_permalink(geodir_add_listing_page_id());
-                $postlink = geodir_getlink($postlink, array('pid' => $post_id, 'backandedit' => '1', 'listing_type' => $post_type), false);
-
-                ob_start(); // start go back and edit / cancel buffering
-                ?>
+				}
+				$publish_listing_form_button = ob_get_clean();
+				/**
+				 * Filter the HTML button for publishing the listing on the preview page.
+				 *
+				 * @since 1.0.0
+				 * @param string $publish_listing_form_button The HTML for the submit button.
+				 */
+				$publish_listing_form_button = apply_filters('geodir_publish_listing_form_button', $publish_listing_form_button);
+				echo $publish_listing_form_button;
+
+				$post_id = '';
+				if (isset($post->pid)) {
+					$post_id = $post->pid;
+				} else if (isset($_REQUEST['pid'])) {
+					$post_id = (int)$_REQUEST['pid'];
+				}
+
+				$postlink = get_permalink(geodir_add_listing_page_id());
+				$postlink = geodir_getlink($postlink, array('pid' => $post_id, 'backandedit' => '1', 'listing_type' => $post_type), false);
+
+				ob_start(); // start go back and edit / cancel buffering
+				?>
                 <a href="<?php echo esc_url($postlink); ?>" class="geodir_goback"><?php echo PRO_BACK_AND_EDIT_TEXT; ?></a>
                 <input type="button" name="Cancel" value="<?php echo(PRO_CANCEL_BUTTON); ?>"
                        class="geodir_button geodir_cancle_button"
                        onclick="window.location.href='<?php echo geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=cancel&pid=' . $post_id . '&listing_type=' . $post_type; ?>'"/>
                 <?php
 
-                $publish_listing_form_go_back = ob_get_clean();
-                /**
-                 * Filter the cancel and go back and edit HTML on the preview page.
-                 *
-                 * @since 1.0.0
-                 * @param string $publish_listing_form_go_back The HTML for the cancel and go back and edit button/link.
-                 */
-                $publish_listing_form_go_back = apply_filters('geodir_publish_listing_form_go_back', $publish_listing_form_go_back);
-                echo $publish_listing_form_go_back;
-
-                ?>
+				$publish_listing_form_go_back = ob_get_clean();
+				/**
+				 * Filter the cancel and go back and edit HTML on the preview page.
+				 *
+				 * @since 1.0.0
+				 * @param string $publish_listing_form_go_back The HTML for the cancel and go back and edit button/link.
+				 */
+				$publish_listing_form_go_back = apply_filters('geodir_publish_listing_form_go_back', $publish_listing_form_go_back);
+				echo $publish_listing_form_go_back;
+
+				?>
             </div>
         </form>
     </div>

Spacing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
 $post_type = $post->listing_type;
 
 if (isset($_REQUEST['preview']) && $_REQUEST['preview'] && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
+    $form_action_url = geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=update&listing_type='.$post_type;
 } elseif (isset($_REQUEST['preview']) && $_REQUEST['preview']) {
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
+    $form_action_url = geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=publish&listing_type='.$post_type;
 }
 
 /**
@@ -110,7 +110,7 @@ 
                 if (isset($post->pid)) {
                     $post_id = $post->pid;
                 } else if (isset($_REQUEST['pid'])) {
-                    $post_id = (int)$_REQUEST['pid'];
+                    $post_id = (int) $_REQUEST['pid'];
                 }
 
                 $postlink = get_permalink(geodir_add_listing_page_id());
@@ -121,7 +121,7 @@ 
                 <a href="<?php echo esc_url($postlink); ?>" class="geodir_goback"><?php echo PRO_BACK_AND_EDIT_TEXT; ?></a>
                 <input type="button" name="Cancel" value="<?php echo(PRO_CANCEL_BUTTON); ?>"
                        class="geodir_button geodir_cancle_button"
-                       onclick="window.location.href='<?php echo geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=cancel&pid=' . $post_id . '&listing_type=' . $post_type; ?>'"/>
+                       onclick="window.location.href='<?php echo geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=cancel&pid='.$post_id.'&listing_type='.$post_type; ?>'"/>
                 <?php
 
                 $publish_listing_form_go_back = ob_get_clean();

geodirectory-widgets/geodirectory_cpt_categories_widget.php

Braces +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
 
     if(!$cpt_left){
         $cpt_left = "gd-cpt-flat";
-    }else{
+    } else{
         $cpt_left = '';
     }
 

Indentation +424 added lines, -424 removed lines

@@ -13,241 +13,241 @@ 
  */
 class geodir_cpt_categories_widget extends WP_Widget {
 
-    /**
-     * Register the cpt categories with WordPress.
-     *
-     * @since 1.5.4
-     */
-    public function __construct() {
-        $widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
-        parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
-    }
-
-    /**
-     * Front-end display content for cpt categories widget.
-     *
-     * @since 1.5.4
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance Saved values from database.
-     */
-    public function widget($args, $instance) {
-        $params = array();
-        /**
-         * Filter the widget title.
-         *
-         * @since 1.5.4
-         *
-         * @param string $title The widget title. Default empty.
-         * @param array  $instance An array of the widget's settings.
-         * @param mixed  $id_base The widget ID.
-         */
-        $params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting post type.
-         *
-         * @since 1.5.4
-         *
-         * @param array $post_type The post types to display categories.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to hide empty categories.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $hide_empty If true then empty category will be not displayed.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to show/hide category count.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $show_count If true then category count will be displayed.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to show/hide category icon.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $hide_icon If true then category icon will be not displayed.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to show CPT inline or not.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $cpt_left If true then CPT will be displayed inline.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget categories sorting order settings.
-         *
-         * @since 1.5.4
-         *
-         * @param string $max_count Widget max no of sub-categories count. Default 'count'.
-         * @param array       $instance An array of the widget's settings.
-         * @param mixed       $id_base The widget ID.
-         */
-        $params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
-
-        /**
-         * Filter the widget max no of sub-categories count.
-         *
-         * @since 1.5.4
-         *
-         * @param bool|string $max_count Widget max no of sub-categories count.
-         * @param array       $instance An array of the widget's settings.
-         * @param mixed       $id_base The widget ID.
-         */
-        $params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
-
-        /**
-         * Filter the widget max sub-categories depth.
-         *
-         * @since 1.5.4
-         *
-         * @param bool|string $max_level Widget max sub-categories depth.
-         * @param array       $instance An array of the widget's settings.
-         * @param mixed       $id_base The widget ID.
-         */
-        $params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
+	/**
+	 * Register the cpt categories with WordPress.
+	 *
+	 * @since 1.5.4
+	 */
+	public function __construct() {
+		$widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
+		parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
+	}
+
+	/**
+	 * Front-end display content for cpt categories widget.
+	 *
+	 * @since 1.5.4
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance Saved values from database.
+	 */
+	public function widget($args, $instance) {
+		$params = array();
+		/**
+		 * Filter the widget title.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $title The widget title. Default empty.
+		 * @param array  $instance An array of the widget's settings.
+		 * @param mixed  $id_base The widget ID.
+		 */
+		$params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting post type.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param array $post_type The post types to display categories.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to hide empty categories.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $hide_empty If true then empty category will be not displayed.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to show/hide category count.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $show_count If true then category count will be displayed.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to show/hide category icon.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $hide_icon If true then category icon will be not displayed.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to show CPT inline or not.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $cpt_left If true then CPT will be displayed inline.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget categories sorting order settings.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $max_count Widget max no of sub-categories count. Default 'count'.
+		 * @param array       $instance An array of the widget's settings.
+		 * @param mixed       $id_base The widget ID.
+		 */
+		$params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
+
+		/**
+		 * Filter the widget max no of sub-categories count.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool|string $max_count Widget max no of sub-categories count.
+		 * @param array       $instance An array of the widget's settings.
+		 * @param mixed       $id_base The widget ID.
+		 */
+		$params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
+
+		/**
+		 * Filter the widget max sub-categories depth.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool|string $max_level Widget max sub-categories depth.
+		 * @param array       $instance An array of the widget's settings.
+		 * @param mixed       $id_base The widget ID.
+		 */
+		$params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
         
-        /**
-         * Filter the widget setting to disable filter current viewing post type.
-         *
-         * @since 1.6.6
-         *
-         * @param bool  $no_cpt_filter If true then it doesn't filter current viewing post type.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['no_cpt_filter'] = apply_filters('geodir_cpt_categories_widget_no_cpt_filter', empty($instance['no_cpt_filter']) ? 0 : 1, $instance, $this->id_base);
+		/**
+		 * Filter the widget setting to disable filter current viewing post type.
+		 *
+		 * @since 1.6.6
+		 *
+		 * @param bool  $no_cpt_filter If true then it doesn't filter current viewing post type.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['no_cpt_filter'] = apply_filters('geodir_cpt_categories_widget_no_cpt_filter', empty($instance['no_cpt_filter']) ? 0 : 1, $instance, $this->id_base);
         
-        /**
-         * Filter the widget setting to disable current viewing category.
-         *
-         * @since 1.6.6
-         *
-         * @param bool  $no_cat_filter If true then it doesn't filter current viewing category.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['no_cat_filter'] = apply_filters('geodir_cpt_categories_widget_no_cat_filter', empty($instance['no_cat_filter']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget parameters.
-         *
-         * @since 1.5.4
-         *
-         * @param array $params The widget parameters.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
-
-        $output = geodir_cpt_categories_output($params);
-
-        echo $args['before_widget'];
-        if ( $params['title'] ) {
-            echo '<div class="geodir_list_heading clearfix">';
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
-            echo '</div>';
-        }
-        echo '<div class="gd-cptcats-widget">';
-        echo $output;
-        echo '</div>';
-        echo $args['after_widget'];
-    }
-
-    /**
-     * Sanitize cpt categories widget values as they are saved.
-     *
-     * @since 1.5.4
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
-     *
-     * @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) {
-        $new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
-        $instance = $old_instance;
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
-        $instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
-        $instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
-        $instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
-        $instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
-        $instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
-        $instance['max_count'] = strip_tags($new_instance['max_count']);
-        $instance['max_level'] = strip_tags($new_instance['max_level']);
-        $instance['no_cpt_filter'] = !empty($new_instance['no_cpt_filter']) ? 1 : 0;
-        $instance['no_cat_filter'] = !empty($new_instance['no_cat_filter']) ? 1 : 0;
-
-        return $instance;
-    }
-
-    /**
-     * Back-end cpt categories settings form.
-     *
-     * @since 1.5.4
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
-     *
-     * @param array $instance Previously saved values from database.
-     */
-    public function form($instance) {
-        $instance = wp_parse_args( (array)$instance,
-            array(
-                'title' => '',
-                'post_type' => array(), // NULL for all
-                'hide_empty' => '',
-                'show_count' => '',
-                'hide_icon' => '',
-                'cpt_left' => '',
-                'sort_by' => 'count',
-                'max_count' => 'all',
-                'max_level' => '1',
-                'no_cpt_filter' => '',
-                'no_cat_filter' => '',
-            )
-        );
-
-        $title = strip_tags($instance['title']);
-        $post_type = $instance['post_type'];
-        $hide_empty = !empty($instance['hide_empty']) ? true : false;
-        $show_count = !empty($instance['show_count']) ? true : false;
-        $hide_icon = !empty($instance['hide_icon']) ? true : false;
-        $cpt_left = !empty($instance['cpt_left']) ? true : false;
-        $max_count = strip_tags($instance['max_count']);
-        $max_level = strip_tags($instance['max_level']);
-        $sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
-        $no_cpt_filter = !empty($instance['no_cpt_filter']) ? true : false;
-        $no_cat_filter = !empty($instance['no_cat_filter']) ? true : false;
-
-        $post_type_options = geodir_get_posttypes('options');
-        ?>
+		/**
+		 * Filter the widget setting to disable current viewing category.
+		 *
+		 * @since 1.6.6
+		 *
+		 * @param bool  $no_cat_filter If true then it doesn't filter current viewing category.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['no_cat_filter'] = apply_filters('geodir_cpt_categories_widget_no_cat_filter', empty($instance['no_cat_filter']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget parameters.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param array $params The widget parameters.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
+
+		$output = geodir_cpt_categories_output($params);
+
+		echo $args['before_widget'];
+		if ( $params['title'] ) {
+			echo '<div class="geodir_list_heading clearfix">';
+			echo $args['before_title'] . $params['title'] . $args['after_title'];
+			echo '</div>';
+		}
+		echo '<div class="gd-cptcats-widget">';
+		echo $output;
+		echo '</div>';
+		echo $args['after_widget'];
+	}
+
+	/**
+	 * Sanitize cpt categories widget values as they are saved.
+	 *
+	 * @since 1.5.4
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
+	 *
+	 * @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) {
+		$new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
+		$instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
+		$instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
+		$instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
+		$instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
+		$instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
+		$instance['max_count'] = strip_tags($new_instance['max_count']);
+		$instance['max_level'] = strip_tags($new_instance['max_level']);
+		$instance['no_cpt_filter'] = !empty($new_instance['no_cpt_filter']) ? 1 : 0;
+		$instance['no_cat_filter'] = !empty($new_instance['no_cat_filter']) ? 1 : 0;
+
+		return $instance;
+	}
+
+	/**
+	 * Back-end cpt categories settings form.
+	 *
+	 * @since 1.5.4
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
+	 *
+	 * @param array $instance Previously saved values from database.
+	 */
+	public function form($instance) {
+		$instance = wp_parse_args( (array)$instance,
+			array(
+				'title' => '',
+				'post_type' => array(), // NULL for all
+				'hide_empty' => '',
+				'show_count' => '',
+				'hide_icon' => '',
+				'cpt_left' => '',
+				'sort_by' => 'count',
+				'max_count' => 'all',
+				'max_level' => '1',
+				'no_cpt_filter' => '',
+				'no_cat_filter' => '',
+			)
+		);
+
+		$title = strip_tags($instance['title']);
+		$post_type = $instance['post_type'];
+		$hide_empty = !empty($instance['hide_empty']) ? true : false;
+		$show_count = !empty($instance['show_count']) ? true : false;
+		$hide_icon = !empty($instance['hide_icon']) ? true : false;
+		$cpt_left = !empty($instance['cpt_left']) ? true : false;
+		$max_count = strip_tags($instance['max_count']);
+		$max_level = strip_tags($instance['max_level']);
+		$sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
+		$no_cpt_filter = !empty($instance['no_cpt_filter']) ? true : false;
+		$no_cat_filter = !empty($instance['no_cat_filter']) ? true : false;
+
+		$post_type_options = geodir_get_posttypes('options');
+		?>
         <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
         <p>
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
@@ -298,7 +298,7 @@ 
             <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label>
         </p>
     <?php
-    }
+	}
 } // class geodir_cpt_categories_widget
 
 register_widget('geodir_cpt_categories_widget');
@@ -313,153 +313,153 @@ 
  * @return string CPT categories content.
  */
 function geodir_cpt_categories_output($params) {
-    $args = wp_parse_args((array)$params,
-        array(
-            'title' => '',
-            'post_type' => array(), // NULL for all
-            'hide_empty' => '',
-            'show_count' => '',
-            'hide_icon' => '',
-            'cpt_left' => '',
-            'sort_by' => 'count',
-            'max_count' => 'all',
-            'max_level' => '1',
-            'no_cpt_filter' => '',
-            'no_cat_filter' => '',
-        )
-    );
-
-    $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
-    $cpt_filter = empty($args['no_cpt_filter']) ? true : false;
-    $cat_filter = empty($args['no_cat_filter']) ? true : false;
-
-    $gd_post_types = geodir_get_posttypes('array');
-
-    $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
-    $current_posttype = geodir_get_current_posttype();
-
-    $is_listing = false;
-    $is_category = false;
-    if (geodir_is_page('listing')) {
-        $current_posttype = geodir_get_current_posttype();
-
-        if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
-            $is_listing = true;
-
-            if (is_tax()) { // category page
-                $current_term_id = get_queried_object_id();
-                $current_taxonomy = get_query_var('taxonomy');
-                $current_posttype = geodir_get_current_posttype();
-
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
-                    $is_category = true;
-                }
-            }
-        }
-    }
-
-    $parent_category = 0;
-    if ($is_listing && $cpt_filter) {
-        $post_type_arr = array($current_posttype);
-    }
-
-    $post_types = array();
-    if (!empty($post_type_arr)) {
-        if (in_array('0', $post_type_arr)) {
-            $post_types = $gd_post_types;
-        } else {
-            foreach ($post_type_arr as $cpt) {
-                if (isset($gd_post_types[$cpt])) {
-                    $post_types[$cpt] = $gd_post_types[$cpt];
-                }
-            }
-        }
-    }
-
-    if (empty($post_type_arr)) {
-        $post_types = $gd_post_types;
-    }
-
-    $hide_empty = !empty($args['hide_empty']) ? true : false;
-    $max_count = strip_tags($args['max_count']);
-    $all_childs = $max_count == 'all' ? true : false;
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
-    $max_level = strip_tags($args['max_level']);
-    $show_count = !empty($args['show_count']) ? true : false;
-    $hide_icon = !empty($args['hide_icon']) ? true : false;
-    $cpt_left = !empty($args['cpt_left']) ? true : false;
-
-    if(!$cpt_left){
-        $cpt_left = "gd-cpt-flat";
-    }else{
-        $cpt_left = '';
-    }
-
-    $orderby = 'count';
-    $order = 'DESC';
-    if ($sort_by == 'az') {
-        $orderby = 'name';
-        $order = 'ASC';
-    }
-
-    $output = '';
-    if (!empty($post_types)) {
-        foreach ($post_types as $cpt => $cpt_info) {
-            $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
-            $cat_taxonomy = $cpt . 'category';
-            $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
-            if ($hide_empty) {
-                $categories = geodir_filter_empty_terms($categories);
-            }
-            if ($sort_by == 'count') {
-                $categories = geodir_sort_terms($categories, 'count');
-            }
-
-            if (!empty($categories)) {
-                $term_icons = !$hide_icon ? geodir_get_term_icon() : array();
-                $row_class = '';
-
-                if ($is_listing) {
-                    $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
-                }
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
-
-                if ($is_category && $cat_filter && $cpt == $current_posttype) {
-                    $term_info = get_term($current_term_id, $cat_taxonomy);
-
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
-                } else {
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
-                }
-                foreach ($categories as $category) {
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-
-                    $term_link = get_term_link( $category, $category->taxonomy );
-                    /** Filter documented in geodirectory-functions/general_functions.php **/
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
-
-                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
-                    $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
-                        $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
-                    }
-                    $cpt_row .= '</li>';
-                    $cpt_row .= '</ul>';
-                }
-                $cpt_row .= '</ul></div>';
-
-                $output .= $cpt_row;
-            }
-        }
-    }
-    return $output;
+	$args = wp_parse_args((array)$params,
+		array(
+			'title' => '',
+			'post_type' => array(), // NULL for all
+			'hide_empty' => '',
+			'show_count' => '',
+			'hide_icon' => '',
+			'cpt_left' => '',
+			'sort_by' => 'count',
+			'max_count' => 'all',
+			'max_level' => '1',
+			'no_cpt_filter' => '',
+			'no_cat_filter' => '',
+		)
+	);
+
+	$sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
+	$cpt_filter = empty($args['no_cpt_filter']) ? true : false;
+	$cat_filter = empty($args['no_cat_filter']) ? true : false;
+
+	$gd_post_types = geodir_get_posttypes('array');
+
+	$post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
+	$current_posttype = geodir_get_current_posttype();
+
+	$is_listing = false;
+	$is_category = false;
+	if (geodir_is_page('listing')) {
+		$current_posttype = geodir_get_current_posttype();
+
+		if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
+			$is_listing = true;
+
+			if (is_tax()) { // category page
+				$current_term_id = get_queried_object_id();
+				$current_taxonomy = get_query_var('taxonomy');
+				$current_posttype = geodir_get_current_posttype();
+
+				if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
+					$is_category = true;
+				}
+			}
+		}
+	}
+
+	$parent_category = 0;
+	if ($is_listing && $cpt_filter) {
+		$post_type_arr = array($current_posttype);
+	}
+
+	$post_types = array();
+	if (!empty($post_type_arr)) {
+		if (in_array('0', $post_type_arr)) {
+			$post_types = $gd_post_types;
+		} else {
+			foreach ($post_type_arr as $cpt) {
+				if (isset($gd_post_types[$cpt])) {
+					$post_types[$cpt] = $gd_post_types[$cpt];
+				}
+			}
+		}
+	}
+
+	if (empty($post_type_arr)) {
+		$post_types = $gd_post_types;
+	}
+
+	$hide_empty = !empty($args['hide_empty']) ? true : false;
+	$max_count = strip_tags($args['max_count']);
+	$all_childs = $max_count == 'all' ? true : false;
+	$max_count = $max_count > 0 ? (int)$max_count : 0;
+	$max_level = strip_tags($args['max_level']);
+	$show_count = !empty($args['show_count']) ? true : false;
+	$hide_icon = !empty($args['hide_icon']) ? true : false;
+	$cpt_left = !empty($args['cpt_left']) ? true : false;
+
+	if(!$cpt_left){
+		$cpt_left = "gd-cpt-flat";
+	}else{
+		$cpt_left = '';
+	}
+
+	$orderby = 'count';
+	$order = 'DESC';
+	if ($sort_by == 'az') {
+		$orderby = 'name';
+		$order = 'ASC';
+	}
+
+	$output = '';
+	if (!empty($post_types)) {
+		foreach ($post_types as $cpt => $cpt_info) {
+			$parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
+			$cat_taxonomy = $cpt . 'category';
+			$categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
+			if ($hide_empty) {
+				$categories = geodir_filter_empty_terms($categories);
+			}
+			if ($sort_by == 'count') {
+				$categories = geodir_sort_terms($categories, 'count');
+			}
+
+			if (!empty($categories)) {
+				$term_icons = !$hide_icon ? geodir_get_term_icon() : array();
+				$row_class = '';
+
+				if ($is_listing) {
+					$row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
+				}
+				$cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
+
+				if ($is_category && $cat_filter && $cpt == $current_posttype) {
+					$term_info = get_term($current_term_id, $cat_taxonomy);
+
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
+				} else {
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
+				}
+				foreach ($categories as $category) {
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+
+					$term_link = get_term_link( $category, $category->taxonomy );
+					/** Filter documented in geodirectory-functions/general_functions.php **/
+					$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+
+					$cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
+					$cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
+					$cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
+					if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
+						$cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
+					}
+					$cpt_row .= '</li>';
+					$cpt_row .= '</ul>';
+				}
+				$cpt_row .= '</ul></div>';
+
+				$output .= $cpt_row;
+			}
+		}
+	}
+	return $output;
 }
 
 /**
@@ -479,48 +479,48 @@ 
  * @return string Html content.
  */
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
-    $cat_taxonomy = $cpt . 'category';
-
-    $orderby = 'count';
-    $order = 'DESC';
-    if ($sort_by == 'az') {
-        $orderby = 'name';
-        $order = 'ASC';
-    }
-
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
-        return '';
-    }
-
-    $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
-    if ($hide_empty) {
-        $child_cats = geodir_filter_empty_terms($child_cats);
-    }
-
-    if (empty($child_cats)) {
-        return '';
-    }
-
-    if ($sort_by == 'count') {
-        $child_cats = geodir_sort_terms($child_cats, 'count');
-    }
-
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
-    $depth++;
-    foreach ($child_cats as $category) {
-        $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-        $term_link = get_term_link( $category, $category->taxonomy );
-        /** Filter documented in geodirectory-functions/general_functions.php **/
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
-
-        $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
-        $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
-    }
-    $content .= '</li></ul>';
-
-    return $content;
+	$cat_taxonomy = $cpt . 'category';
+
+	$orderby = 'count';
+	$order = 'DESC';
+	if ($sort_by == 'az') {
+		$orderby = 'name';
+		$order = 'ASC';
+	}
+
+	if ($max_level != 'all' && $depth > (int)$max_level ) {
+		return '';
+	}
+
+	$child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
+	if ($hide_empty) {
+		$child_cats = geodir_filter_empty_terms($child_cats);
+	}
+
+	if (empty($child_cats)) {
+		return '';
+	}
+
+	if ($sort_by == 'count') {
+		$child_cats = geodir_sort_terms($child_cats, 'count');
+	}
+
+	$content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
+	$depth++;
+	foreach ($child_cats as $category) {
+		$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
+		$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+		$term_link = get_term_link( $category, $category->taxonomy );
+		/** Filter documented in geodirectory-functions/general_functions.php **/
+		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+		$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
+
+		$content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
+		$content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
+		$content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
+	}
+	$content .= '</li></ul>';
+
+	return $content;
 }
 ?>
\ No newline at end of file

Spacing +48 added lines, -48 removed lines

@@ -169,9 +169,9 @@ 
         $output = geodir_cpt_categories_output($params);
 
         echo $args['before_widget'];
-        if ( $params['title'] ) {
+        if ($params['title']) {
             echo '<div class="geodir_list_heading clearfix">';
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
+            echo $args['before_title'].$params['title'].$args['after_title'];
             echo '</div>';
         }
         echo '<div class="gd-cptcats-widget">';
@@ -218,7 +218,7 @@ 
      * @param array $instance Previously saved values from database.
      */
     public function form($instance) {
-        $instance = wp_parse_args( (array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array(
                 'title' => '',
                 'post_type' => array(), // NULL for all
@@ -252,50 +252,50 @@ 
         <p>
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('post_type'); ?>[]" id="<?php echo $this->get_field_id('post_type'); ?>" class="widefat" multiple="multiple">
-                <option value="0" <?php selected( (empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true ); ?>><?php _e('All', 'geodirectory'); ?></option>
+                <option value="0" <?php selected((empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true); ?>><?php _e('All', 'geodirectory'); ?></option>
                 <?php foreach ($post_type_options as $name => $title) { ?>
-                    <option value="<?php echo $name;?>" <?php selected( is_array($post_type) && in_array($name, $post_type), true ); ?>><?php echo $title; ?></option>
+                    <option value="<?php echo $name; ?>" <?php selected(is_array($post_type) && in_array($name, $post_type), true); ?>><?php echo $title; ?></option>
                 <?php } ?>
             </select>
         </p>
-        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked( $hide_empty ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e( 'Hide empty categories', 'geodirectory' ); ?></label><br />
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked( $show_count ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e( 'Show category count' ); ?></label> <small><?php _e( '( Enabling will slow down page loading for big directories. )', 'geodirectory' ); ?></small><br />
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked( $hide_icon ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e( 'Hide category icon', 'geodirectory' ); ?></label><br />
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked( $cpt_left ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e( 'Show CPT on same line', 'geodirectory' ); ?></label>
+        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked($hide_empty); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e('Hide empty categories', 'geodirectory'); ?></label><br />
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked($show_count); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e('Show category count'); ?></label> <small><?php _e('( Enabling will slow down page loading for big directories. )', 'geodirectory'); ?></small><br />
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked($hide_icon); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e('Hide category icon', 'geodirectory'); ?></label><br />
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked($cpt_left); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e('Show CPT on same line', 'geodirectory'); ?></label>
         <p>
             <label for="<?php echo $this->get_field_id('sort_by'); ?>"><?php _e('Sort by:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('sort_by'); ?>" id="<?php echo $this->get_field_id('sort_by'); ?>" class="widefat">
-                <option value="az" <?php selected( $sort_by, 'az' ); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
-                <option value="count" <?php selected( $sort_by, 'count' ); ?>><?php _e('Count', 'geodirectory'); ?></option>
+                <option value="az" <?php selected($sort_by, 'az'); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
+                <option value="count" <?php selected($sort_by, 'count'); ?>><?php _e('Count', 'geodirectory'); ?></option>
             </select>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('max_count'); ?>"><?php _e('Max no of sub-categories:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('max_count'); ?>" id="<?php echo $this->get_field_id('max_count'); ?>" class="widefat">
-                <option value="all" <?php selected( $max_count, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
+                <option value="all" <?php selected($max_count, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
                 <?php for ($n = 10; $n >= 0; $n--) { ?>
-                    <option value="<?php echo $n;?>" <?php selected( $max_count, $n ); ?>><?php echo $n; ?></option>
+                    <option value="<?php echo $n; ?>" <?php selected($max_count, $n); ?>><?php echo $n; ?></option>
                 <?php } ?>
             </select>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('max_level'); ?>"><?php _e('Show max sub-categories depth:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('max_level'); ?>" id="<?php echo $this->get_field_id('max_level'); ?>" class="widefat">
-                <option value="all" <?php selected( $max_level, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
+                <option value="all" <?php selected($max_level, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
                 <?php for ($n = 0; $n <= 10; $n++) { ?>
-                    <option value="<?php echo $n;?>" <?php selected( $max_level, $n ); ?>><?php echo $n; ?></option>
+                    <option value="<?php echo $n; ?>" <?php selected($max_level, $n); ?>><?php echo $n; ?></option>
                 <?php } ?>
             </select>
         </p>
         <p>
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked( $no_cpt_filter ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e( 'Don\'t filter for current viewing post type', 'geodirectory' ); ?></label>
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked( $no_cat_filter ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label>
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked($no_cpt_filter); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e('Don\'t filter for current viewing post type', 'geodirectory'); ?></label>
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked($no_cat_filter); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e('Don\'t filter for current viewing category', 'geodirectory'); ?></label>
         </p>
     <?php
     }
@@ -313,7 +313,7 @@ 
  * @return string CPT categories content.
  */
 function geodir_cpt_categories_output($params) {
-    $args = wp_parse_args((array)$params,
+    $args = wp_parse_args((array) $params,
         array(
             'title' => '',
             'post_type' => array(), // NULL for all
@@ -351,7 +351,7 @@ 
                 $current_taxonomy = get_query_var('taxonomy');
                 $current_posttype = geodir_get_current_posttype();
 
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
+                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype.'category') {
                     $is_category = true;
                 }
             }
@@ -383,15 +383,15 @@ 
     $hide_empty = !empty($args['hide_empty']) ? true : false;
     $max_count = strip_tags($args['max_count']);
     $all_childs = $max_count == 'all' ? true : false;
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
+    $max_count = $max_count > 0 ? (int) $max_count : 0;
     $max_level = strip_tags($args['max_level']);
     $show_count = !empty($args['show_count']) ? true : false;
     $hide_icon = !empty($args['hide_icon']) ? true : false;
     $cpt_left = !empty($args['cpt_left']) ? true : false;
 
-    if(!$cpt_left){
+    if (!$cpt_left) {
         $cpt_left = "gd-cpt-flat";
-    }else{
+    } else {
         $cpt_left = '';
     }
 
@@ -406,7 +406,7 @@ 
     if (!empty($post_types)) {
         foreach ($post_types as $cpt => $cpt_info) {
             $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
-            $cat_taxonomy = $cpt . 'category';
+            $cat_taxonomy = $cpt.'category';
             $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
             if ($hide_empty) {
                 $categories = geodir_filter_empty_terms($categories);
@@ -422,32 +422,32 @@ 
                 if ($is_listing) {
                     $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
                 }
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
+                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-'.$cpt.$row_class.' '.$cpt_left.'">';
 
                 if ($is_category && $cat_filter && $cpt == $current_posttype) {
                     $term_info = get_term($current_term_id, $cat_taxonomy);
 
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($term_info->name).' icon" src="'.$term_icon_url.'" /> ' : '';
 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$term_info->count.')</span>' : '';
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.$term_icon_url.$term_info->name.$count.'</h2>';
                 } else {
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.__($cpt_info['labels']['name'], 'geodirectory').'</h2>';
                 }
                 foreach ($categories as $category) {
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
 
-                    $term_link = get_term_link( $category, $category->taxonomy );
+                    $term_link = get_term_link($category, $category->taxonomy);
                     /** Filter documented in geodirectory-functions/general_functions.php **/
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+                    $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
 
                     $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
                     $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
+                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></h3>';
+                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int) $max_level > 0)) {
                         $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
                     }
                     $cpt_row .= '</li>';
@@ -479,7 +479,7 @@ 
  * @return string Html content.
  */
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
-    $cat_taxonomy = $cpt . 'category';
+    $cat_taxonomy = $cpt.'category';
 
     $orderby = 'count';
     $order = 'DESC';
@@ -488,7 +488,7 @@ 
         $order = 'ASC';
     }
 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
+    if ($max_level != 'all' && $depth > (int) $max_level) {
         return '';
     }
 
@@ -505,18 +505,18 @@ 
         $child_cats = geodir_sort_terms($child_cats, 'count');
     }
 
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
+    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-'.$depth.'">';
     $depth++;
     foreach ($child_cats as $category) {
         $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-        $term_link = get_term_link( $category, $category->taxonomy );
+        $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
+        $term_link = get_term_link($category, $category->taxonomy);
         /** Filter documented in geodirectory-functions/general_functions.php **/
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
+        $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
+        $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
 
         $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
+        $content .= '<a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></li>';
         $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
     }
     $content .= '</li></ul>';

geodirectory-widgets/geodirectory_related_listing_widget.php

Spacing +10 added lines, -10 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"
@@ -178,7 +178,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
@@ -208,7 +208,7 @@ 
         </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"
@@ -217,7 +217,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') {
@@ -232,7 +232,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') {
@@ -260,7 +260,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"
@@ -269,7 +269,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); ?>"/>
@@ -277,9 +277,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>

Indentation +120 added lines, -120 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');?>
 
@@ -184,24 +184,24 @@ 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
 
                     <option <?php if ($list_sort == 'latest') {
-                        echo 'selected="selected"';
-                    } ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'featured') {
-                        echo 'selected="selected"';
-                    } ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'high_review') {
-                        echo 'selected="selected"';
-                    } ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'high_rating') {
-                        echo 'selected="selected"';
-                    } ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'random') {
-                        echo 'selected="selected"';
-                    } ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
 
                 </select>
             </label>
@@ -221,11 +221,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>
@@ -236,24 +236,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>
@@ -285,7 +285,7 @@ 
         </p>
 
     <?php
-    }
+	}
 } // class geodir_related_listing_postview
 
 register_widget('geodir_related_listing_postview');
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -118,10 +118,11 @@ 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);
         $instance['character_count'] = $new_instance['character_count'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 
         return $instance;
     }
@@ -279,7 +280,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>
                        value="1"/>
             </label>
         </p>

geodirectory-widgets/home_map_widget.php

Braces +3 added lines, -2 removed lines

@@ -192,8 +192,9 @@
 

                     foreach ($map_zoom_level as $level) {

                         $selected = '';

-                        if ($level == $zoom)

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

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

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

 

Indentation +104 added lines, -104 removed lines

@@ -16,126 +16,126 @@ 
  */

 class geodir_homepage_map extends WP_Widget

 {

-    /**

+	/**

 	 * Register the home page map widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));

-        parent::__construct(

-            'geodir_map_v3_home_map', // Base ID

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

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));

+		parent::__construct(

+			'geodir_map_v3_home_map', // Base ID

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

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for home page map 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)

-    {

-        extract($args, EXTR_SKIP);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+	public function widget($args, $instance)

+	{

+		extract($args, EXTR_SKIP);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

-        $map_args = array();

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

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

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

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

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

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

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

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

-        $map_args['enable_cat_filters'] = true;

-        $map_args['enable_text_search'] = true;

-        $map_args['enable_post_type_filters'] = true;

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

-        $map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);

-        $map_args['enable_jason_on_load'] = false;

-        $map_args['enable_marker_cluster'] = false;

-        $map_args['enable_map_resize_button'] = true;

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

+		$map_args = array();

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

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

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

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

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

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

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

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

+		$map_args['enable_cat_filters'] = true;

+		$map_args['enable_text_search'] = true;

+		$map_args['enable_post_type_filters'] = true;

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

+		$map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);

+		$map_args['enable_jason_on_load'] = false;

+		$map_args['enable_marker_cluster'] = false;

+		$map_args['enable_map_resize_button'] = true;

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

 

-        $is_geodir_home_map_widget = true;

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

+		$is_geodir_home_map_widget = true;

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

 

-        geodir_draw_map($map_args);

+		geodir_draw_map($map_args);

 

-        /* home map post type slider */

-        if ($is_geodir_home_map_widget) {

-            add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);

-        }

+		/* home map post type slider */

+		if ($is_geodir_home_map_widget) {

+			add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);

+		}

 

-    }

+	}

 

 	/**

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

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

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

 	 *

 	 * @return array Updated safe values to be saved.

 	 */

-    public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

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

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

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

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

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

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

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

+	public function update($new_instance, $old_instance)

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

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

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

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

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

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

 

-        return $instance;

-    }

+		return $instance;

+	}

 

 	/**

 	 * Back-end home page map widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

-    public function form($instance)

-    {

-        //widgetform in backend

+	public function form($instance)

+	{

+		//widgetform in backend

 

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

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

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

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

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

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

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

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

-        ?>

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

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

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

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

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

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

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

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

+		?>

 

         <p>

             <label

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

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

                 </select>

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

 

         <?php

-        $map_zoom_level = geodir_map_zoom_level();

-        ?>

+		$map_zoom_level = geodir_map_zoom_level();

+		?>

 

         <p>

             <label

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

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

 

-                    foreach ($map_zoom_level as $level) {

-                        $selected = '';

-                        if ($level == $zoom)

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

+					foreach ($map_zoom_level as $level) {

+						$selected = '';

+						if ($level == $zoom)

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

 

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

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

 

-                    } ?>

+					} ?>

 

                 </select>

             </label>

@@ -209,8 +209,8 @@ 
                 :

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

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

-                    echo 'checked="checked"';

-                } ?> /></label>

+					echo 'checked="checked"';

+				} ?> /></label>

         </p>

 

         <p>

@@ -234,17 +234,17 @@ 
         </p>

 

     <?php

-    }

+	}

 

-    /**

+	/**

 	 * Adds the javascript in the footer for home page map widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 */

-    public function geodir_home_map_add_script()

-    {

-        ?>

+	public function geodir_home_map_add_script()

+	{

+		?>

         <script type="text/javascript">

             jQuery(document).ready(function () {

                 geoDirMapSlide();

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

         </script>

     <?php

-    }

+	}

 } // class geodir_homepage_map

 

 register_widget('geodir_homepage_map');

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,7 @@ 
     {

         //widgetform in backend

 

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

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

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

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

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

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

                         echo 'selected="selected"';

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

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

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

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

                 </select>

             </label>

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

                             $selected = 'selected="selected"';

 

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

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

 

                     } ?>

 

@@ -219,7 +219,7 @@ 
                 :

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

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

-                       <?php if ($child_collapse){ ?>checked="checked" <?php } ?> />

+                       <?php if ($child_collapse) { ?>checked="checked" <?php } ?> />

             </label>

         </p>

 

@@ -229,7 +229,7 @@ 
                 :

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

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

-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> />

+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> />

             </label>

         </p>

 

geodirectory-functions/compatibility/Avada.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
  */
 function gd_strip_breadcrumb_wrappers($breadcrumb)
 {
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
+    $breadcrumb = str_replace(array("<li>", "</li>"), "", $breadcrumb);
     $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
     $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
     return $breadcrumb;
@@ -39,7 +39,7 @@ 
     return $separator;
 }
 
-add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
+add_action('avada_override_current_page_title_bar', 'gd_avada_current_page_title_bar_change');
 /**
  * new title bar functions for gd pages.
  *
@@ -51,8 +51,8 @@ 
 {
     if (geodir_is_geodir_page()) {
         gd_avada_current_page_title_bar();
-    }else{
-        avada_current_page_title_bar( $c_pageID );
+    } else {
+        avada_current_page_title_bar($c_pageID);
     }
 
 }
@@ -96,7 +96,7 @@ 
     
 
     if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
+        if ($title = get_post_meta(get_the_ID(), 'pyre_page_title_custom_text', true)) {}
         else {
             $title = get_the_title();
         }
@@ -242,12 +242,12 @@ 
 gd_compat_php_avada();
 
 // Avada sets the search page to use wither post or page, we need it to be 'any'
-function gd_avada_search_filter( $query ) {
-    if ( geodir_is_page('search') && is_search() && $query->is_search) {
+function gd_avada_search_filter($query) {
+    if (geodir_is_page('search') && is_search() && $query->is_search) {
             $query->set('post_type', 'any');
     }
     return $query;
 }
-if ( ! is_admin() ) {
-    add_filter( 'pre_get_posts', 'gd_avada_search_filter',11 );
+if (!is_admin()) {
+    add_filter('pre_get_posts', 'gd_avada_search_filter', 11);
 }
\ No newline at end of file

Braces +2 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 {
     if (geodir_is_geodir_page()) {
         gd_avada_current_page_title_bar();
-    }else{
+    } else{
         avada_current_page_title_bar( $c_pageID );
     }
 
@@ -96,8 +96,7 @@ 
     
 
     if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
-        else {
+        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {} else {
             $title = get_the_title();
         }
         avada_page_title_bar($title, $subtitle, $secondary_content);

Indentation +109 added lines, -109 removed lines

@@ -18,10 +18,10 @@ 
  */
 function gd_strip_breadcrumb_wrappers($breadcrumb)
 {
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
-    $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
-    $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
-    return $breadcrumb;
+	$breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
+	$breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
+	$breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
+	return $breadcrumb;
 }
 
 add_filter('geodir_breadcrumb_separator', 'gd_change_breadcrumb_separator');
@@ -35,8 +35,8 @@ 
  */
 function gd_change_breadcrumb_separator($separator)
 {
-    $separator = ' / ';
-    return $separator;
+	$separator = ' / ';
+	return $separator;
 }
 
 add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
@@ -49,11 +49,11 @@ 
  */
 function gd_avada_current_page_title_bar_change($c_pageID)
 {
-    if (geodir_is_geodir_page()) {
-        gd_avada_current_page_title_bar();
-    }else{
-        avada_current_page_title_bar( $c_pageID );
-    }
+	if (geodir_is_geodir_page()) {
+		gd_avada_current_page_title_bar();
+	}else{
+		avada_current_page_title_bar( $c_pageID );
+	}
 
 }
 
@@ -65,50 +65,50 @@ 
  */
 function gd_avada_current_page_title_bar()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $secondary_content = ob_get_contents();
-    ob_get_clean();
-
-    $title = '';
-    $subtitle = '';
-
-    if (geodir_is_page('listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('add-listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_add_listing_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('author')) {
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-
-    if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
-        else {
-            $title = get_the_title();
-        }
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('search')) {
-        ob_start(); // Start buffering;
-        geodir_action_search_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
+	ob_start();
+	geodir_breadcrumb();
+	$secondary_content = ob_get_contents();
+	ob_get_clean();
+
+	$title = '';
+	$subtitle = '';
+
+	if (geodir_is_page('listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('add-listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_add_listing_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('author')) {
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+
+	if (geodir_is_page('detail') || geodir_is_page('preview')) {
+		if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
+		else {
+			$title = get_the_title();
+		}
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('search')) {
+		ob_start(); // Start buffering;
+		geodir_action_search_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
 }
 
 /**
@@ -119,34 +119,34 @@ 
  */
 function gd_compat_php_avada()
 {
-    // change widget wrappers
-    //add_filter( 'geodir_before_widget', 'geodir_before_widget_compat',10,1 );
-    //add_filter( 'geodir_after_widget', 'geodir_after_widget_compat',10,1 );
-
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
-
-    //gd_compat_add_top_section_back();
+	// change widget wrappers
+	//add_filter( 'geodir_before_widget', 'geodir_before_widget_compat',10,1 );
+	//add_filter( 'geodir_after_widget', 'geodir_after_widget_compat',10,1 );
+
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+
+	//gd_compat_add_top_section_back();
 
 }
 
@@ -158,17 +158,17 @@ 
  * @package GeoDirectory
  */
 function gd_compat_add_top_section_back() {
-    if (geodir_is_page('home') || geodir_is_page('location')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (geodir_is_page('home') || geodir_is_page('location')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 }
 
 add_filter('body_class', 'gd_compat_body_class');
@@ -182,12 +182,12 @@ 
  */
 function gd_compat_body_class($classes)
 {
-    if (geodir_is_geodir_page()) {
-        $classes[] = 'wpgeo-avada';
-    } else {
-        $classes[] = '';
-    }
-    return $classes;
+	if (geodir_is_geodir_page()) {
+		$classes[] = 'wpgeo-avada';
+	} else {
+		$classes[] = '';
+	}
+	return $classes;
 }
 
 
@@ -201,7 +201,7 @@ 
  */
 function geodir_before_widget_compat($var)
 {
-    return '<div id="%1$s" class="geodir-widget %2$s">';
+	return '<div id="%1$s" class="geodir-widget %2$s">';
 }
 
 /**
@@ -214,7 +214,7 @@ 
  */
 function geodir_after_widget_compat($var)
 {
-    return '</div>';
+	return '</div>';
 }
 
 add_filter('geodir_search_form_class', 'geodir_search_form_class_avada');
@@ -228,8 +228,8 @@ 
  */
 function geodir_search_form_class_avada($class)
 {
-    $class .= ' search';
-    return $class;
+	$class .= ' search';
+	return $class;
 }
 
 
@@ -238,11 +238,11 @@ 
 
 // Avada sets the search page to use wither post or page, we need it to be 'any'
 function gd_avada_search_filter( $query ) {
-    if ( geodir_is_page('search') && is_search() && $query->is_search) {
-        $query->set('post_type', 'any');
-    }
-    return $query;
+	if ( geodir_is_page('search') && is_search() && $query->is_search) {
+		$query->set('post_type', 'any');
+	}
+	return $query;
 }
 if ( ! is_admin() ) {
-    add_filter( 'pre_get_posts', 'gd_avada_search_filter',11 );
+	add_filter( 'pre_get_posts', 'gd_avada_search_filter',11 );
 }
\ No newline at end of file

geodirectory-functions/compatibility/Enfold.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

Indentation +135 added lines, -135 removed lines

@@ -17,84 +17,84 @@ 
 function enfold_action_calls()
 {
 
-    /* ACTIONS
+	/* ACTIONS
     ****************************************************************************************/
 
-    // Add body class for styling purposes
-    add_filter('body_class', 'wpgeo_enfold_body_class');
+	// Add body class for styling purposes
+	add_filter('body_class', 'wpgeo_enfold_body_class');
 
-    // Pages using the page-builder shouldn't redirect on successful payment
-    if (isset($_REQUEST['pay_action'])) {
-        add_action('init', 'geodir_allow_payment_urls_enfold', 15);
-    }
+	// Pages using the page-builder shouldn't redirect on successful payment
+	if (isset($_REQUEST['pay_action'])) {
+		add_action('init', 'geodir_allow_payment_urls_enfold', 15);
+	}
 
-    // LOCATION MANAGER MENU ACTIONS - set the location menu item before the Enfold search
-    if (function_exists('geodir_location_menu_items')) {
-        remove_filter('wp_nav_menu_items', 'geodir_location_menu_items', 110);
-        add_filter('wp_nav_menu_items', 'geodir_location_menu_items', 8, 2);
-    }
-    // GEODIR MENU ACTIONS - set the GeoDir menu items before the Enfold search
-    remove_filter('wp_nav_menu_items', 'geodir_menu_items', 100);
-    add_filter('wp_nav_menu_items', 'geodir_menu_items', 7, 2);
+	// LOCATION MANAGER MENU ACTIONS - set the location menu item before the Enfold search
+	if (function_exists('geodir_location_menu_items')) {
+		remove_filter('wp_nav_menu_items', 'geodir_location_menu_items', 110);
+		add_filter('wp_nav_menu_items', 'geodir_location_menu_items', 8, 2);
+	}
+	// GEODIR MENU ACTIONS - set the GeoDir menu items before the Enfold search
+	remove_filter('wp_nav_menu_items', 'geodir_menu_items', 100);
+	add_filter('wp_nav_menu_items', 'geodir_menu_items', 7, 2);
 
-    // HOME TOP SIDEBAR
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    //add_action( 'ava_after_main_container', 'enfold_home_sidebar' );
+	// HOME TOP SIDEBAR
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	//add_action( 'ava_after_main_container', 'enfold_home_sidebar' );
 
 
-    // WRAPPER OPEN ACTIONS
-    remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
-    add_action('geodir_wrapper_open', 'enfold_action_wrapper_open', 9);
-    add_action('geodir_wrapper_open', 'enfold_detail_title', 8, 2); // ADD GEODIR TITLE
+	// WRAPPER OPEN ACTIONS
+	remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
+	add_action('geodir_wrapper_open', 'enfold_action_wrapper_open', 9);
+	add_action('geodir_wrapper_open', 'enfold_detail_title', 8, 2); // ADD GEODIR TITLE
 
 
-    // WRAPPER CONTENT OPEN ACTIONS
-    remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
-    add_action('geodir_wrapper_content_open', 'enfold_action_wrapper_content_open', 9, 3);
+	// WRAPPER CONTENT OPEN ACTIONS
+	remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
+	add_action('geodir_wrapper_content_open', 'enfold_action_wrapper_content_open', 9, 3);
 
 
-    // SIDEBAR RIGHT OPEN ACTIONS
-    remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
-    add_action('geodir_sidebar_right_open', 'enfold_action_sidebar_right_open', 10, 4);
+	// SIDEBAR RIGHT OPEN ACTIONS
+	remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
+	add_action('geodir_sidebar_right_open', 'enfold_action_sidebar_right_open', 10, 4);
 
-    // SIDEBAR LEFT OPEN ACTIONS
-    remove_action('geodir_sidebar_left_open', 'geodir_action_sidebar_left_open', 10);
-    add_action('geodir_sidebar_left_open', 'enfold_action_sidebar_left_open', 10, 4);
+	// SIDEBAR LEFT OPEN ACTIONS
+	remove_action('geodir_sidebar_left_open', 'geodir_action_sidebar_left_open', 10);
+	add_action('geodir_sidebar_left_open', 'enfold_action_sidebar_left_open', 10, 4);
 
 
-    // HOME PAGE BREADCRUMBS
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+	// HOME PAGE BREADCRUMBS
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
 
-    // LISTINGS PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	// LISTINGS PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
 
-    // DETAILS PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	// DETAILS PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
 
-    // SEARCH PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	// SEARCH PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
 
-    // AUTHOR PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+	// AUTHOR PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
 
-    // DISABLE ENFOLD MAPS CALL
-    add_filter('avf_load_google_map_api', 'gd_enfold_remove_maps_api', 10, 1);
+	// DISABLE ENFOLD MAPS CALL
+	add_filter('avf_load_google_map_api', 'gd_enfold_remove_maps_api', 10, 1);
 
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
-    add_action('geodir_wrapper_open', 'gd_enfold_compat_add_top_section_back', 5);
+	add_action('geodir_wrapper_open', 'gd_enfold_compat_add_top_section_back', 5);
 
 } // Close enfold_action_calls
 
@@ -108,17 +108,17 @@ 
 function gd_enfold_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8);
-    } elseif (geodir_is_page('listing')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8);
-    } elseif (geodir_is_page('detail')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8);
-    } elseif (geodir_is_page('search')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8);
-    } elseif (geodir_is_page('author')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8);
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8);
+	} elseif (geodir_is_page('listing')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8);
+	} elseif (geodir_is_page('detail')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8);
+	} elseif (geodir_is_page('search')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8);
+	} elseif (geodir_is_page('author')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8);
+	}
 
 
 }
@@ -137,8 +137,8 @@ 
  */
 function wpgeo_enfold_body_class($classes)
 {
-    $classes[] = 'wpgeo-enfold';
-    return $classes;
+	$classes[] = 'wpgeo-enfold';
+	return $classes;
 }
 
 /**
@@ -149,8 +149,8 @@ 
  */
 function geodir_allow_payment_urls_enfold()
 {
-    global $builder;
-    remove_action('template_redirect', array($builder, 'template_redirect'), 1000);
+	global $builder;
+	remove_action('template_redirect', array($builder, 'template_redirect'), 1000);
 }
 
 
@@ -162,8 +162,8 @@ 
  */
 function enfold_action_wrapper_open()
 {
-    echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>";
-    echo "<div class='container template-blog '>";
+	echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>";
+	echo "<div class='container template-blog '>";
 }
 
 /**
@@ -177,38 +177,38 @@ 
  */
 function enfold_detail_title($page, $class)
 {
-    //echo '###'.$page;
-    global $wp;
-    if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id() && !geodir_is_page('login')) {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    } elseif ($page == 'details-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    } elseif ($page == 'listings-page' || $page == 'search-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        //print_r($title_p);
-        echo avia_title(array('title' => $title));
-    } elseif ($page == 'author-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $gd_title = ob_get_clean();
-        $gd_title = str_replace('<h1>', "", $gd_title);
-        $gd_title = str_replace('</h1>', "", $gd_title);
-        echo avia_title(array('title' => $gd_title));
-    } elseif ($page == 'add-listing-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    } elseif ($page == 'add-listing-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    }
+	//echo '###'.$page;
+	global $wp;
+	if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id() && !geodir_is_page('login')) {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	} elseif ($page == 'details-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	} elseif ($page == 'listings-page' || $page == 'search-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		//print_r($title_p);
+		echo avia_title(array('title' => $title));
+	} elseif ($page == 'author-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$gd_title = ob_get_clean();
+		$gd_title = str_replace('<h1>', "", $gd_title);
+		$gd_title = str_replace('</h1>', "", $gd_title);
+		echo avia_title(array('title' => $gd_title));
+	} elseif ($page == 'add-listing-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	} elseif ($page == 'add-listing-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	}
 
 }
 
@@ -223,22 +223,22 @@ 
  */
 function enfold_detail_breadcrum($trail, $args)
 {
-    ob_start(); // Start buffering;
-    geodir_breadcrumb();
-    $gd_crums = ob_get_clean();
-    if ($gd_crums) {
-        $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
-        $gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
-        $gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
-        $gd_crums = str_replace('</li><li>', "", $gd_crums);
-        $gd_crums = explode(" > ", $gd_crums);
-        $trail_end = array_pop($gd_crums);
-        $gd_crums['trail_end'] = $trail_end;
-        //print_r($gd_crums);
-        //print_r($trail);
-        $trail = $gd_crums;
-    }
-    return $trail;
+	ob_start(); // Start buffering;
+	geodir_breadcrumb();
+	$gd_crums = ob_get_clean();
+	if ($gd_crums) {
+		$gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
+		$gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
+		$gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
+		$gd_crums = str_replace('</li><li>', "", $gd_crums);
+		$gd_crums = explode(" > ", $gd_crums);
+		$trail_end = array_pop($gd_crums);
+		$gd_crums['trail_end'] = $trail_end;
+		//print_r($gd_crums);
+		//print_r($trail);
+		$trail = $gd_crums;
+	}
+	return $trail;
 }
 
 
@@ -253,12 +253,12 @@ 
  */
 function enfold_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
-    if (geodir_is_page('login')) {
-        echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
-    } else {
-        echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
-    }
-    echo '<div class="entry-content-wrapper">';
+	if (geodir_is_page('login')) {
+		echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+	} else {
+		echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+	}
+	echo '<div class="entry-content-wrapper">';
 }
 
 
@@ -274,9 +274,9 @@ 
  */
 function enfold_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
-    echo "<div class='inner_sidebar extralight-border'>";
+	$sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
+	echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+	echo "<div class='inner_sidebar extralight-border'>";
 }
 
 /**
@@ -291,9 +291,9 @@ 
  */
 function enfold_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
-    echo "<div class='inner_sidebar extralight-border'>";
+	$sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
+	echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+	echo "<div class='inner_sidebar extralight-border'>";
 }
 
 
@@ -307,7 +307,7 @@ 
  */
 function gd_enfold_remove_maps_api($call)
 {
-    return false;
+	return false;
 }
 
 

Spacing +5 added lines, -5 removed lines

@@ -162,7 +162,7 @@ 
  */
 function enfold_action_wrapper_open()
 {
-    echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>";
+    echo "<div class='container_wrap container_wrap_first main_color ".avia_layout_class('main', false)."'>";
     echo "<div class='container template-blog '>";
 }
 
@@ -254,9 +254,9 @@ 
 function enfold_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
     if (geodir_is_page('login')) {
-        echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+        echo "<main class='template-page content twelve alpha units ".$class."' ".avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)).">";
     } else {
-        echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+        echo "<main class='template-page content ".avia_layout_class('content', false)." units ".$class."' ".avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)).">";
     }
     echo '<div class="entry-content-wrapper">';
 }
@@ -275,7 +275,7 @@ 
 function enfold_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
     $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+    echo "<aside class='sidebar sidebar_right ".$sidebar_smartphone." ".avia_layout_class('sidebar', false)." units' ".avia_markup_helper(array('context' => 'sidebar', 'echo' => false)).">";
     echo "<div class='inner_sidebar extralight-border'>";
 }
 
@@ -292,7 +292,7 @@ 
 function enfold_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')
 {
     $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+    echo "<aside class='sidebar sidebar_left ".$sidebar_smartphone." ".avia_layout_class('sidebar', false)." units' ".avia_markup_helper(array('context' => 'sidebar', 'echo' => false)).">";
     echo "<div class='inner_sidebar extralight-border'>";
 }