GeoDirectory / geodirectory

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

Spacing +44 added lines, -44 removed lines

@@ -146,9 +146,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">';
@@ -191,7 +191,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
@@ -221,42 +221,42 @@ 
         <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>
@@ -275,7 +275,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
@@ -309,7 +309,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;
                 }
             }
@@ -345,15 +345,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 = '';
     }
 
@@ -367,7 +367,7 @@ 
     $output = '';
     if (!empty($post_types)) {
         foreach ($post_types as $cpt => $cpt_info) {
-            $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);
@@ -383,32 +383,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) {
                     $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>';
@@ -440,7 +440,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';
@@ -449,7 +449,7 @@ 
         $order = 'ASC';
     }
 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
+    if ($max_level != 'all' && $depth > (int) $max_level) {
         return '';
     }
 
@@ -466,18 +466,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>';

Indentation +394 added lines, -394 removed lines

@@ -13,210 +13,210 @@ 
  */
 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
-     *
-     * @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 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
-     *
-     * @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']);
-
-        return $instance;
-    }
-
-    /**
-     * Back-end cpt categories settings form.
-     *
-     * @since 1.5.4
-     *
-     * @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'
-            )
-        );
-
-        $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';
-
-        $post_type_options = geodir_get_posttypes('options');
-        ?>
+	/**
+	 * 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
+	 *
+	 * @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 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
+	 *
+	 * @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']);
+
+		return $instance;
+	}
+
+	/**
+	 * Back-end cpt categories settings form.
+	 *
+	 * @since 1.5.4
+	 *
+	 * @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'
+			)
+		);
+
+		$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';
+
+		$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>
@@ -261,7 +261,7 @@ 
             </select>
         </p>
     <?php
-    }
+	}
 } // class geodir_cpt_categories_widget
 
 register_widget('geodir_cpt_categories_widget');
@@ -275,152 +275,152 @@ 
  * @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',
-        )
-    );
-
-    $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
-
-    $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) {
-        $post_type_arr = array($current_posttype);
-
-        if ($is_category) {
-            $parent_category = $current_term_id;
-        }
-    }
-
-    $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) {
-            $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) {
-                    $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',
+		)
+	);
+
+	$sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
+
+	$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) {
+		$post_type_arr = array($current_posttype);
+
+		if ($is_category) {
+			$parent_category = $current_term_id;
+		}
+	}
+
+	$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) {
+			$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) {
+					$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;
 }
 
 /**
@@ -440,48 +440,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

geodirectory-widgets/geodirectory_listing_slider_widget.php

Spacing +16 added lines, -16 removed lines

@@ -90,7 +90,7 @@ 
     {

 

         //widgetform in backend

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

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

             array('title' => '',

                 'post_type' => '',

                 'category' => '',

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

@@ -156,7 +156,7 @@ 
 

         <p>

             <label

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

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

 

                 <?php $postypes = geodir_get_posttypes(); ?>

 

@@ -180,7 +180,7 @@ 
 

         <p>

             <label

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

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

 

                 <?php

                 $category_taxonomy = geodir_get_taxonomies('gd_place');

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

         <p>

             <label

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

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

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

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

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

@@ -226,7 +226,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory'); ?>

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

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

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

@@ -235,7 +235,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory'); ?>

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

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

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

@@ -244,7 +244,7 @@ 
 

         <p>

             <label

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

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

 

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

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

@@ -262,7 +262,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory'); ?>

 

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

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

@@ -272,7 +272,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory'); ?>

 

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

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

@@ -282,7 +282,7 @@ 
 

         <p>

             <label

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

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

 

                 <input type="checkbox" <?php if ($slideshow) {

                     echo 'checked="checked"';

@@ -294,7 +294,7 @@ 
 

         <p>

             <label

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

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

 

                 <input type="checkbox" <?php if ($animationLoop) {

                     echo 'checked="checked"';

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

         <p>

             <label

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

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

 

                 <input type="checkbox" <?php if ($directionNav) {

                     echo 'checked="checked"';

@@ -319,7 +319,7 @@ 
 

         <p>

             <label

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

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

 

                 <input type="checkbox" <?php if ($show_title) {

                     echo 'checked="checked"';

@@ -353,10 +353,10 @@ 
 

             }

 

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

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

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

 

-            geodir_change_category_list(post_type, '<?php echo $category;?>');

+            geodir_change_category_list(post_type, '<?php echo $category; ?>');

             <?php } ?>

 

         </script>

Braces +4 added lines, -1 removed lines

@@ -332,7 +332,10 @@
             <label

                 for="<?php echo $this->get_field_id('show_featured_only'); ?>"><?php _e('Show only featured listings:', 'geodirectory'); ?>

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

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

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

                        value="1"/>

             </label>

         </p>

Indentation +103 added lines, -103 removed lines

@@ -15,40 +15,40 @@ 
 class geodir_listing_slider_widget extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the listing slider 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_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

-        parent::__construct(

-            'listing_slider_view', // Base ID

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

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

+		parent::__construct(

+			'listing_slider_view', // Base ID

+			__('GD > Listing Slider', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 	

 	/**

 	 * Front-end display content for listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-        geodir_listing_slider_widget_output($args, $instance);

-    }

+	public function widget($args, $instance)

+	{

+		geodir_listing_slider_widget_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize listing slider 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.

@@ -56,94 +56,94 @@ 
 	 * @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_type'] = strip_tags($new_instance['post_type']);

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing slider widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

 	public function form($instance)

-    {

+	{

 

-        //widgetform in backend

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

-            array('title' => '',

-                'post_type' => '',

-                'category' => '',

-                'post_number' => '5',

-                'max_show' => '1',

-                'slide_width' => '',

-                'show_title' => '',

-                'slideshow' => '',

-                'animationLoop' => '',

-                'directionNav' => '',

-                'slideshowSpeed' => 5000,

-                'animationSpeed' => 600,

-                'animation' => '',

-                'list_sort' => 'latest',

-                'show_featured_only' => '',

-            )

-        );

+		//widgetform in backend

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

+			array('title' => '',

+				'post_type' => '',

+				'category' => '',

+				'post_number' => '5',

+				'max_show' => '1',

+				'slide_width' => '',

+				'show_title' => '',

+				'slideshow' => '',

+				'animationLoop' => '',

+				'directionNav' => '',

+				'slideshowSpeed' => 5000,

+				'animationSpeed' => 600,

+				'animation' => '',

+				'list_sort' => 'latest',

+				'show_featured_only' => '',

+			)

+		);

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

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

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

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

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

 

-        $sort_fields = array();

-        $sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

-        $sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

-        $sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

-        ?>

+		$sort_fields = array();

+		$sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

+		$sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

+		$sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

+		?>

 

         <p>

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

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

 

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

-                            echo 'selected="selected"';

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

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

+							echo 'selected="selected"';

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

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

 

                     <?php } ?>

 

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

 

                 <?php

-                $category_taxonomy = geodir_get_taxonomies('gd_place');

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

-                ?>

+				$category_taxonomy = geodir_get_taxonomies('gd_place');

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

+				?>

 

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

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

                     <option <?php if ($category == '0') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

 

                         <option <?php if ($category == $category_obj->term_id) {

-                            echo 'selected="selected"';

-                        } ?>

+							echo 'selected="selected"';

+						} ?>

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

 

                     <?php } ?>

@@ -249,12 +249,12 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

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

                     <option <?php if ($animation == 'slide') {

-                        echo 'selected="selected"';

-                    } ?> value="slide">Slide

+						echo 'selected="selected"';

+					} ?> value="slide">Slide

                     </option>

                     <option <?php if ($animation == 'fade') {

-                        echo 'selected="selected"';

-                    } ?> value="fade">Fade

+						echo 'selected="selected"';

+					} ?> value="fade">Fade

                     </option>

                 </select>

             </label>

@@ -285,8 +285,8 @@ 
                 for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($slideshow) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

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

 

             </label>

@@ -297,8 +297,8 @@ 
                 for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

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

 

             </label>

@@ -309,8 +309,8 @@ 
                 for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($directionNav) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

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

 

             </label>

@@ -322,8 +322,8 @@ 
                 for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($show_title) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

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

 

             </label>

@@ -363,7 +363,7 @@ 
 

 

     <?php

-    }

+	}

 } // class geodir_listing_slider_widget

 

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

geodirectory-widgets/geodirectory_popular_widget.php

Spacing +28 added lines, -28 removed lines

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

         $instance = $old_instance;

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

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

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

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

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

         return $instance;

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

     {

         //widgetform in backend

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

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

 

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

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

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

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

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

 		

@@ -96,10 +96,10 @@ 
         </p>

 		<p>

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

-		  <?php _e('Default post type to use (if not set by page)', 'geodirectory');?>

+		  <?php _e('Default post type to use (if not set by page)', 'geodirectory'); ?>

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

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

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

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

 			<?php } ?>

 		  </select>

 		  </label>

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

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

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

-                       value="<?php echo (int)esc_attr($category_limit); ?>"/>

+                       value="<?php echo (int) esc_attr($category_limit); ?>"/>

 

                 <p class="description"

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

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

     {

         //widgetform in backend

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

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

             array('title' => '',

                 'post_type' => '',

                 'category' => array(),

@@ -266,9 +266,9 @@ 
         ?>

 

         <p>

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

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

                 <small>(%posttype_singular_label% ,

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

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

                 </small>

 

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

@@ -279,7 +279,7 @@ 
 

         <p>

             <label

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

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

 

                 <?php $postypes = geodir_get_posttypes();

 				/**

@@ -311,7 +311,7 @@ 
 

         <p id="post_type_cats">

             <label

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

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

 

                 <?php

 

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

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

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

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

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

 

             </label>

         </p>

 

         <p>

             <label

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

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

 

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

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

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

 

             <label

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

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

 

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

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

@@ -403,7 +403,7 @@ 
 

         <p>

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

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

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

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

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

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

@@ -432,7 +432,7 @@ 
 

         <p>

             <label

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

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

 

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

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

@@ -442,7 +442,7 @@ 
 

         <p>

             <label

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

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

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

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

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

@@ -451,41 +451,41 @@ 
 

         <p>

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

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

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

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

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

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

                        value="1"/>

             </label>

         </p>

         <p>

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

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

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

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

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

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

                                                                                             value="1"/>

             </label>

         </p>

         <p>

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

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

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

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

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

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

                                                                                                        value="1"/>

             </label>

         </p>

         <p>

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

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

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

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

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

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

                                                                                              value="1"/>

             </label>

         </p>

         <p>

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

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

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

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

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

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

                                                                                                value="1"/>

             </label>

         </p>

@@ -531,7 +531,7 @@ 
 

             }

 

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

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

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

 

             <?php } ?>

Indentation +161 added lines, -161 removed lines

@@ -14,41 +14,41 @@ 
  */

 class geodir_popular_post_category extends WP_Widget

 {

-    /**

+	/**

 	 * Register the popular post category widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

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

-        parent::__construct(

-            'popular_post_category', // Base ID

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

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

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

+		parent::__construct(

+			'popular_post_category', // Base ID

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

+			$widget_ops// Args

+		);

+	}

 

 	/**

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

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        geodir_popular_post_category_output($args, $instance);

-    }

+	{

+		geodir_popular_post_category_output($args, $instance);

+	}

 

 	/**

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

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added default_post_type parameter.

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added default_post_type parameter.

 	 *

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

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

@@ -56,37 +56,37 @@ 
 	 * @return array Updated safe values to be saved.

 	 */ 

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

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

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

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

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

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

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

-        return $instance;

-    }

+		return $instance;

+	}

 

 	/**

 	 * Back-end popular post category widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

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

+	 * @since 1.5.1 Declare function public.

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

 	 *

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

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

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

+	{

+		//widgetform in backend

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

 

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

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

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

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

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

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

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

 		

 		$post_type_options = geodir_get_posttypes('options');

-        ?>

+		?>

         <p>

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

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

@@ -116,7 +116,7 @@ 
             </label>

         </p>

     <?php

-    }

+	}

 } // class geodir_popular_post_category

 

 register_widget('geodir_popular_post_category');

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

 {

 

-    /**

+	/**

 	 * Register the popular posts widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

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

-        parent::__construct(

-            'popular_post_view', // Base ID

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

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

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

+		parent::__construct(

+			'popular_post_view', // Base ID

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

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for popular posts widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        geodir_popular_postview_output($args, $instance);

-    }

+	{

+		geodir_popular_postview_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize popular posts widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

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

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

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-

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

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

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

-        }

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

-

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

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

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

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

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

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

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

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

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

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

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

-        else

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

-

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

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

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

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

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

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+

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

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

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

+		}

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

+

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

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

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

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

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

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

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

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

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

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

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

+		else

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

+

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

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

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

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

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

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end popular posts widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

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

-            array('title' => '',

-                'post_type' => '',

-                'category' => array(),

-                'category_title' => '',

-                'list_sort' => '',

-                'list_order' => '',

-                'post_number' => '5',

-                'layout' => 'gridview_onehalf',

-                'listing_width' => '',

-                'add_location_filter' => '1',

-                'character_count' => '20',

-                'show_featured_only' => '',

-                'show_special_only' => '',

-                'with_pics_only' => '',

-                'with_videos_only' => '',

-                'use_viewing_post_type' => ''

-            )

-        );

+	{

+		//widgetform in backend

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

+			array('title' => '',

+				'post_type' => '',

+				'category' => array(),

+				'category_title' => '',

+				'list_sort' => '',

+				'list_order' => '',

+				'post_number' => '5',

+				'layout' => 'gridview_onehalf',

+				'listing_width' => '',

+				'add_location_filter' => '1',

+				'character_count' => '20',

+				'show_featured_only' => '',

+				'show_special_only' => '',

+				'with_pics_only' => '',

+				'with_videos_only' => '',

+				'use_viewing_post_type' => ''

+			)

+		);

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

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

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

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

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

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

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

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

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

 

-        ?>

+		?>

 

         <p>

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

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

 

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

-                            echo 'selected="selected"';

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

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

+							echo 'selected="selected"';

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

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

 

                     <?php } ?>

 

@@ -315,30 +315,30 @@ 
 

                 <?php

 

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

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

 

-                $all_postypes = geodir_get_posttypes();

+				$all_postypes = geodir_get_posttypes();

 

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

-                    $post_type = 'gd_place';

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

+					$post_type = 'gd_place';

 

-                $category_taxonomy = geodir_get_taxonomies($post_type);

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

+				$category_taxonomy = geodir_get_taxonomies($post_type);

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

 

-                ?>

+				?>

 

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

                         onchange="geodir_popular_widget_cat_title(this)">

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

-                        $selected = '';

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

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

+						$selected = '';

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

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

 

-                        ?>

+						?>

 

                         <option <?php echo $selected; ?>

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

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                 </select>

             </label>

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

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

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

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

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

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

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

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

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

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

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

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

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

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

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                 </select>

             </label>

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

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

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

-                    echo 'checked="checked"';

-                } ?>  value="1"/>

+					echo 'checked="checked"';

+				} ?>  value="1"/>

             </label>

         </p>

 

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

 

     <?php

-    }

+	}

 } // class geodir_popular_postview

 

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

Braces +37 added lines, -14 removed lines

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

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

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

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

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

-        else

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

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

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

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

@@ -319,8 +320,9 @@ 
 

                 $all_postypes = geodir_get_posttypes();

 

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

-                    $post_type = 'gd_place';

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

                 $category_taxonomy = geodir_get_taxonomies($post_type);

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

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

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

                         $selected = '';

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

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

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

                         ?>

 

@@ -350,7 +353,12 @@ 
 

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

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

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

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

 

             </label>

         </p>

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

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

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

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

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

                        value="1"/>

             </label>

         </p>

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

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

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

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

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

                                                                                             value="1"/>

             </label>

         </p>

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

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

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

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

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

                                                                                                        value="1"/>

             </label>

         </p>

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

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

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

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

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

                                                                                              value="1"/>

             </label>

         </p>

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

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

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

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

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

                                                                                                value="1"/>

             </label>

         </p>

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

Indentation +107 added lines, -107 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);
-    }
+	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);
-    }
+	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();
 
 }
 
@@ -160,17 +160,17 @@ 
 function gd_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_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 (is_page_geodir_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();
+	}
 
 
 }
@@ -187,12 +187,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;
 }
 
 
@@ -206,7 +206,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">';
 }
 
 /**
@@ -219,7 +219,7 @@ 
  */
 function geodir_after_widget_compat($var)
 {
-    return '</div>';
+	return '</div>';
 }
 
 add_filter('geodir_search_form_class', 'geodir_search_form_class_avada');
@@ -233,8 +233,8 @@ 
  */
 function geodir_search_form_class_avada($class)
 {
-    $class .= ' search';
-    return $class;
+	$class .= ' search';
+	return $class;
 }
 
 
@@ -243,11 +243,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

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

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'>";
 }
 

geodirectory-functions/post_functions.php

Doc Comments +4 added lines, -4 removed lines

@@ -721,7 +721,7 @@ 
      * @param int $post_id The post ID.

      * @param string $postmeta Detail table column name.

      * @param string $meta_value Detail table column value.

-     * @return void|bool

+     * @return null|false

      */

     function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

     {

@@ -775,7 +775,7 @@ 
      * @param string $postmeta Detail table column name.

      * @todo check if this is depreciated

      * @todo Fix unknown variable mval

-     * @return bool

+     * @return boolean|null

      */

     function geodir_delete_post_meta($post_id, $postmeta)

     {

@@ -2124,7 +2124,7 @@ 
      * @global string $plugin_prefix Geodirectory plugin table prefix.

      * @param int $deleted_postid The post ID.

      * @param bool $force Optional. Do you want to force delete it? Default: false.

-     * @return bool|void

+     * @return null|false

      */

     function geodir_delete_listing_info($deleted_postid, $force = false)

     {

@@ -2693,7 +2693,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  * @global object $current_user Current user object.

- * @param int|string $listing_id The post ID.

+ * @param integer $listing_id The post ID.

  * @param bool $exclude_admin Optional. Do you want to exclude admin from the check?. Default true.

  * @return bool

  */

Braces +174 added lines, -123 removed lines

@@ -21,12 +21,13 @@ 
 {

 

     $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

-    if (!empty($post_cat_ids))

-        $post_cat_array = explode(",", trim($post_cat_ids, ","));

+    if (!empty($post_cat_ids)) {
+            $post_cat_array = explode(",", trim($post_cat_ids, ","));
+    }
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

+    } else{

         if(!is_int($default_cat)){

             $category = get_term_by('name', $default_cat, $taxonomy);

             if(isset($category->term_id)){

@@ -372,8 +373,9 @@ 
             } elseif (trim($type) == 'file') {

                 if (isset($request_info[$name])) {

                     $request_files = array();

-                    if ($request_info[$name] != '')

-                        $request_files = explode(",", $request_info[$name]);

+                    if ($request_info[$name] != '') {
+                                            $request_files = explode(",", $request_info[$name]);
+                    }
 

                     $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

                     geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

@@ -399,7 +401,7 @@ 
 

                         $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

+                    } else{

                         $post_htmlvar_value = $request_info[$name];

                     }

 

@@ -439,15 +441,17 @@ 
 

             foreach ($request_info['post_category'] as $taxonomy => $cat) {

 

-                if ($dummy)

-                    $post_category = $cat;

-                else {

+                if ($dummy) {
+                                    $post_category = $cat;
+                } else {

 

-                    if (!is_array($cat) && strstr($cat, ','))

-                        $cat = explode(',', $cat);

+                    if (!is_array($cat) && strstr($cat, ',')) {
+                                            $cat = explode(',', $cat);
+                    }
 

-                    if (!empty($cat) && is_array($cat))

-                        $post_category = array_map('intval', $cat);

+                    if (!empty($cat) && is_array($cat)) {
+                                            $post_category = array_map('intval', $cat);
+                    }
                 }

 

                 wp_set_object_terms($last_post_id, $post_category, $taxonomy);

@@ -465,11 +469,13 @@ 
         if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

             $post_tags = explode(",", $request_info['post_tags']);

         } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

-            if ($dummy)

-                $post_tags = $request_info['post_tags'];

+            if ($dummy) {
+                            $post_tags = $request_info['post_tags'];
+            }
         } else {

-            if ($dummy)

-                $post_tags = array($request_info['post_title']);

+            if ($dummy) {
+                            $post_tags = array($request_info['post_title']);
+            }
         }

 

         if (is_array($post_tags)) {

@@ -556,15 +562,17 @@ 
 

     global $wpdb, $plugin_prefix, $post, $post_info;

 

-    if ($post_id == '' && !empty($post))

-        $post_id = $post->ID;

+    if ($post_id == '' && !empty($post)) {
+            $post_id = $post->ID;
+    }
 

     $post_type = get_post_type($post_id);

 

     $all_postypes = geodir_get_posttypes();

 

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

-        return false;

+    if (!in_array($post_type, $all_postypes)) {
+            return false;
+    }
 

     $table = $plugin_prefix . $post_type . '_detail';

 

@@ -714,8 +722,9 @@ 
             do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

 

             return true;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -769,8 +778,9 @@ 
             }

 

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -801,8 +811,9 @@ 
             $post_meta_set_query = '';

 

             foreach ($postmeta as $mkey) {

-                if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

+                if ($mval != '') {
+                                    $post_meta_set_query .= $mkey . " = '', ";
+                }
             }

 

             $post_meta_set_query = trim($post_meta_set_query, ", ");

@@ -832,8 +843,9 @@ 
                 return true;

             }

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -863,8 +875,9 @@ 
 

         $post_type = get_post_type($post_id);

 

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

-            return false;

+        if (!in_array($post_type, $all_postypes)) {
+                    return false;
+        }
 

         $table = $plugin_prefix . $post_type . '_detail';

 

@@ -873,8 +886,9 @@ 
             

             if ($meta_value && $meta_value !== '') {

                 return maybe_serialize($meta_value);

-            } else

-                return $meta_value;

+            } else {
+                            return $meta_value;
+            }
         } else {

             return false;

         }

@@ -1008,7 +1022,7 @@ 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

+                            } else{

                                 print_r($uploaded);exit;

                             }

                             $external_img = false;

@@ -1033,8 +1047,9 @@ 
                                 $file_path = $curr_img_dir . '/' . $filename;

                             }

 

-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

-                                unlink($img_path);

+                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) {
+                                                            unlink($img_path);
+                            }
                         }

 

                         if (!empty($uploaded_file)) {

@@ -1063,8 +1078,9 @@ 
                             $attachment_set = '';

 

                             foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                if ($val != '') {
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                }
                             }

 

                             $attachment_set = trim($attachment_set, ", ");

@@ -1089,8 +1105,9 @@ 
                         )

                     );

 

-                    if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+                    if ($menu_order == 1) {
+                                            $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
+                    }
 

                 }

 

@@ -1131,8 +1148,9 @@ 
 

         $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
     }

 

 }

@@ -1185,16 +1203,19 @@ 
 function geodir_delete_directory($dirname)

 {

     $dir_handle = '';

-    if (is_dir($dirname))

-        $dir_handle = opendir($dirname);

-    if (!$dir_handle)

-        return false;

+    if (is_dir($dirname)) {
+            $dir_handle = opendir($dirname);
+    }
+    if (!$dir_handle) {
+            return false;
+    }
     while ($file = readdir($dir_handle)) {

         if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

-            else

-                geodir_delete_directory($dirname . '/' . $file);

+            if (!is_dir($dirname . "/" . $file)) {
+                            unlink($dirname . "/" . $file);
+            } else {
+                            geodir_delete_directory($dirname . '/' . $file);
+            }
         }

     }

     closedir($dir_handle);

@@ -1223,8 +1244,9 @@ 
             foreach ($postcurr_images as $postimg) {

                 $image_name_arr = explode('/', $postimg->src);

                 $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

+                if (file_exists($uploads_dir . '/' . $filename)) {
+                                    unlink($uploads_dir . '/' . $filename);
+                }
             }

 

         } // endif

@@ -1283,8 +1305,9 @@ 
 

             $file_info = pathinfo($file);

             $sub_dir = '';

-            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                $sub_dir = stripslashes_deep($file_info['dirname']);

+            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                            $sub_dir = stripslashes_deep($file_info['dirname']);
+            }
 

             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

             $uploads_baseurl = $uploads['baseurl'];

@@ -1328,9 +1351,9 @@ 
                 $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

             }

 

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_image) {

+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
+                            $default_img = $default_catimg['src'];
+            } elseif ($no_image) {

                 $default_img = get_option('geodir_listing_no_img');

             }

 

@@ -1362,10 +1385,13 @@ 
             }

         }

 

-        if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

-        else

-            return false;

+        if (!empty($img_arr)) {
+                    return (object)$img_arr;
+        }
+        //return (object)array( 'src' => $file_url, 'path' => $file_path );

+        else {
+                    return false;
+        }
     }

 }

 

@@ -1392,8 +1418,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -1421,8 +1448,9 @@ 
         }

         $not_featured = '';

         $sub_dir = '';

-        if (!$add_featured)

-            $not_featured = " AND is_featured = 0 ";

+        if (!$add_featured) {
+                    $not_featured = " AND is_featured = 0 ";
+        }
 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

@@ -1443,8 +1471,9 @@ 
 

                 $file_info = pathinfo($attechment->file);

 

-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                    $sub_dir = stripslashes_deep($file_info['dirname']);

+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                    $sub_dir = stripslashes_deep($file_info['dirname']);
+                }
 

                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

                 $uploads_baseurl = $uploads['baseurl'];

@@ -1489,9 +1518,9 @@ 
             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

             $post_type = get_post_type($post_id);

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_images) {

+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
+                            $default_img = $default_catimg['src'];
+            } elseif ($no_images) {

                 $default_img = get_option('geodir_listing_no_img');

             }

 

@@ -1526,8 +1555,9 @@ 
                 $return_arr[] = (object)$img_arr;

 

                 return $return_arr;

-            } else

-                return false;

+            } else {
+                            return false;
+            }
         }

     }

 }

@@ -1588,8 +1618,9 @@ 
                         $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

                     } else if ($image->width < ($max_size->h)) {

                         $width_per = round((($image->width / $max_size->w) * 100), 2);

-                    } else

-                        $width_per = 100;

+                    } else {
+                                            $width_per = 100;
+                    }
                 }

 

                 if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

@@ -1597,7 +1628,7 @@ 
                 } else {

                     if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

                         $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

+                    } else{

                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

                         $html = '<div data-src="'.$image->src.'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

@@ -1612,8 +1643,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -1651,8 +1683,9 @@ 
                 $post_obj = get_post($post_id);

 

                 $cat_ids = array('0');

-                if (is_array($tt_ids))

-                    $cat_ids = $tt_ids;

+                if (is_array($tt_ids)) {
+                                    $cat_ids = $tt_ids;
+                }
 

 

                 if (!empty($cat_ids)) {

@@ -1709,8 +1742,9 @@ 
                         $json .= '}';

 

 

-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

-                            $post_marker_json = $json;

+                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) {
+                                                    $post_marker_json = $json;
+                        }
 

 

                         if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

@@ -1741,10 +1775,13 @@ 
                 if (!empty($post_term) && is_array($post_term)) {

                     $categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+                    if ($categories != '' && $categories != 0) {
+                    	$categories = ',' . $categories . ',';
+                    }
 

-                    if (empty($post_marker_json))

-                        $post_marker_json = isset($json) ? $json : '';

+                    if (empty($post_marker_json)) {
+                                            $post_marker_json = isset($json) ? $json : '';
+                    }
 

                     if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

@@ -1783,8 +1820,9 @@ 
 

                                 }

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

+                                if ($default_category == '') {
+                                                                    $default_category = $categories[0];
+                                }
 

                                 geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

 

@@ -1928,7 +1966,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else{

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1936,7 +1974,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else{

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -2038,10 +2076,11 @@ 
      */

     function geodir_new_post_default_status()

     {

-        if (get_option('geodir_new_post_default_status'))

-            return get_option('geodir_new_post_default_status');

-        else

-            return 'publish';

+        if (get_option('geodir_new_post_default_status')) {
+                    return get_option('geodir_new_post_default_status');
+        } else {
+                    return 'publish';
+        }
 

     }

 }

@@ -2192,8 +2231,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

+        if (!in_array($post_type, $all_postypes)) {
+                    return false;
+        }
 

         $table = $plugin_prefix . $post_type . '_detail';

 

@@ -2461,8 +2501,9 @@ 
         $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

 

         $user_meta_data = '';

-        if (isset($current_user->data->ID))

-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+        if (isset($current_user->data->ID)) {
+                    $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
+        }
 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

@@ -2475,8 +2516,9 @@ 
 

             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

                 $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

-            } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+            } else {
+                            $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
+            }
 

             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

@@ -2539,14 +2581,16 @@ 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

 

             $cat_post_count = $wpdb->get_var($count_query);

-            if (empty($cat_post_count) || is_wp_error($cat_post_count))

-                $cat_post_count = 0;

+            if (empty($cat_post_count) || is_wp_error($cat_post_count)) {
+                            $cat_post_count = 0;
+            }
 

             return $cat_post_count;

 

-        } else

-

-            return $term->count;

+        } else {
+        

+            return $term->count;
+        }
     }

     return false;

 

@@ -2593,13 +2637,15 @@ 
 		return $length;

 	}

 	

-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

-        $length = get_option('geodir_desc_word_limit');

-    elseif (get_query_var('excerpt_length'))

-        $length = get_query_var('excerpt_length');

+    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit')) {
+            $length = get_option('geodir_desc_word_limit');
+    } elseif (get_query_var('excerpt_length')) {
+            $length = get_query_var('excerpt_length');
+    }
 

-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

-        $length = get_option('geodir_author_desc_word_limit');

+    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit')) {
+            $length = get_option('geodir_author_desc_word_limit');
+    }
 

     return $length;

 }

@@ -2732,10 +2778,11 @@ 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)

 {

     $listing_author_id = geodir_get_listing_author($listing_id);

-    if ($listing_author_id == $user_id)

-        return true;

-    else

-        return false;

+    if ($listing_author_id == $user_id) {
+            return true;
+    } else {
+            return false;
+    }
 

 }

 

@@ -2784,10 +2831,11 @@ 
     $pattern = '/-\d+x\d+\./';

     preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

 

-    if (empty($matches))

-        return '';

-    else

-        return $file;

+    if (empty($matches)) {
+            return '';
+    } else {
+            return $file;
+    }
 

 }

 

@@ -2872,8 +2920,9 @@ 
     } else {

         //set_post_thumbnail($post_id,-1);

 

-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

-            wp_delete_attachment($post_thumbnail_id);

+        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
+                    wp_delete_attachment($post_thumbnail_id);
+        }
 

     }

 }

@@ -2958,8 +3007,9 @@ 
 

     global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

+    if ($listing_type == '') {
+            $listing_type = 'gd_place';
+    }
 

     $fields_info = array();

 

@@ -2982,8 +3032,9 @@ 
 

                 $fields_info[$prefix . 'address'] = $data->field_type;

 

-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+                                    $fields_info[$prefix . 'zip'] = $data->field_type;
+                }
 

             } else {

 

Spacing +205 added lines, -205 removed lines

@@ -26,11 +26,11 @@ 
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

+    } else {

+        if (!is_int($default_cat)) {

             $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

+            if (isset($category->term_id)) {

+                $default_cat = $category->term_id;

             }

         }

 

@@ -58,7 +58,7 @@ 
 

     if ($default_pos === false) {

 

-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

+        $change_cat_str = str_replace($default_cat.',y:', $default_cat.',y,d:', $change_cat_str);

 

     }

 

@@ -227,7 +227,7 @@ 
         $send_post_submit_mail = false;

 

         // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

+        remove_action('save_post', 'geodir_post_information_save', 10, 2);

 

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

             $post['ID'] = $request_info['pid'];

@@ -251,13 +251,13 @@ 
         }

 

         // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+        add_action('save_post', 'geodir_post_information_save', 10, 2);

 

         $post_tags = '';

         if (!isset($request_info['post_tags'])) {

 

             $post_type = $request_info['listing_type'];

-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

+            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));

 

         }

 

@@ -275,13 +275,13 @@ 
         $payment_info = array();

         $package_info = array();

 

-        $package_info = (array)geodir_post_package_info($package_info, $post);

+        $package_info = (array) geodir_post_package_info($package_info, $post);

 

         $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

         if (!empty($package_info) && !$post_package_id) {

             if (isset($package_info['days']) && $package_info['days'] != 0) {

-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

+                $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));

             } else {

                 $payment_info['expire_date'] = 'Never';

             }

@@ -302,8 +302,8 @@ 
             $extrafields = $val['extra_fields'];

 

             if (trim($type) == 'address') {

-                $prefix = $name . '_';

-                $address = $prefix . 'address';

+                $prefix = $name.'_';

+                $address = $prefix.'address';

 

                 if (isset($request_info[$address]) && $request_info[$address] != '') {

                     $gd_post_info[$address] = wp_slash($request_info[$address]);

@@ -313,59 +313,59 @@ 
                     $extrafields = unserialize($extrafields);

 

 

-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

+                    if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {

 

                         $location_result = geodir_get_default_location();

 

-                        $gd_post_info[$prefix . 'city'] = $location_result->city;

-                        $gd_post_info[$prefix . 'region'] = $location_result->region;

-                        $gd_post_info[$prefix . 'country'] = $location_result->country;

+                        $gd_post_info[$prefix.'city'] = $location_result->city;

+                        $gd_post_info[$prefix.'region'] = $location_result->region;

+                        $gd_post_info[$prefix.'country'] = $location_result->country;

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location

 

                     } else {

 

-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

+                        $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city'];

+                        $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region'];

+                        $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country'];

 

                         //----------set post locations when import dummy data-------

                         $location_result = geodir_get_default_location();

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location

                         //-----------------------------------------------------------------

 

                     }

 

 

-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

+                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {

+                        $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip'];

                     }

 

 

                     if (isset($extrafields['show_map']) && $extrafields['show_map']) {

 

-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

+                        if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {

+                            $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude'];

                         }

 

-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

+                        if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {

+                            $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude'];

                         }

 

-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

+                        if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {

+                            $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview'];

                         }

 

-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

+                        if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {

+                            $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom'];

                         }

 

                     }

 

                     // show lat lng

-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

+                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {

+                        $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng'];

                     }

                 }

 

@@ -390,20 +390,20 @@ 
 

                     // check if we need to change the format or not

                     $date_format_len = strlen(str_replace(' ', '', $date_format));

-                    if($date_format_len>5){// if greater then 5 then it's the old style format.

+                    if ($date_format_len > 5) {// if greater then 5 then it's the old style format.

 

-                        $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                        $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                        $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                        $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                         $date_format = str_replace($search, $replace, $date_format);

 

                         $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

+                    } else {

                         $post_htmlvar_value = $request_info[$name];

                     }

 

-                    $post_htmlvar_value =  geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

+                    $post_htmlvar_value = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

 

                     $datetime = date("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

 

@@ -413,7 +413,7 @@ 
                 if (isset($request_info[$name])) {

                     $gd_post_info[$name] = $request_info[$name];

                 } else {

-                    if (isset($request_info['gd_field_' . $name])) {

+                    if (isset($request_info['gd_field_'.$name])) {

                         $gd_post_info[$name] = ''; /* fix de-select for multiselect */

                     }

                 }

@@ -473,7 +473,7 @@ 
         }

 

         if (is_array($post_tags)) {

-            $taxonomy = $request_info['listing_type'] . '_tags';

+            $taxonomy = $request_info['listing_type'].'_tags';

             wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

         }

 

@@ -485,7 +485,7 @@ 
                 $tmpimgArr = trim($request_info['post_images'], ",");

                 $tmpimgArr = explode(",", $tmpimgArr);

                 geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

+            } else {

                 geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

             }

 

@@ -566,7 +566,7 @@ 
     if (!in_array($post_type, $all_postypes))

         return false;

 

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

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

 

     /**

      * Apply Filter to change Post info

@@ -576,7 +576,7 @@ 
      * @since 1.0.0

      * @package GeoDirectory

      */

-    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

+    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd

 			  WHERE p.ID = pd.post_id

 			  AND post_id = " . $post_id);

 

@@ -639,7 +639,7 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         /**

          * Filter to change Post info

@@ -663,13 +663,13 @@ 
                         $mval = implode(",", $mval);

                     }

 

-                    $post_meta_set_query .= $mkey . " = '" . $mval . "', ";

+                    $post_meta_set_query .= $mkey." = '".$mval."', ";

                 }

             }

 

             $post_meta_set_query = trim($post_meta_set_query, ", ");

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query); // escape %

 

             /**

              * Called before saving the listing info.

@@ -681,11 +681,11 @@ 
              */

             do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id =%d",

                         array($post_id)

                     )

                 );

@@ -695,7 +695,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

+                        "INSERT INTO ".$table." SET post_id = %d,".$post_meta_set_query,

                         array($post_id)

                     )

                 );

@@ -741,7 +741,7 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

 

@@ -749,11 +749,11 @@ 
                 $meta_value = implode(",", $meta_value);

             }

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

+                        "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d",

                         array($post_id)

                     )

                 );

@@ -762,7 +762,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

+                        "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'",

                         array($post_id)

                     )

                 );

@@ -795,23 +795,23 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if (is_array($postmeta) && !empty($postmeta) && $post_id) {

             $post_meta_set_query = '';

 

             foreach ($postmeta as $mkey) {

                 if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

+                    $post_meta_set_query .= $mkey." = '', ";

             }

 

             $post_meta_set_query = trim($post_meta_set_query, ", ");

 

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d",

                         array($post_id)

                     )

                 );

@@ -820,11 +820,11 @@ 
             }

 

         } elseif ($postmeta != '' && $post_id) {

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

+                        "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d",

                         array($post_id)

                     )

                 );

@@ -866,10 +866,10 @@ 
         if (!in_array($post_type, $all_postypes))

             return false;

 

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

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

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {

+            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));

             

             if ($meta_value && $meta_value !== '') {

                 return maybe_serialize($meta_value);

@@ -903,13 +903,13 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $post_images = geodir_get_images($post_id);

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",

+                "UPDATE ".$table." SET featured_image = '' where post_id =%d",

                 array($post_id)

             )

         );

@@ -939,12 +939,12 @@ 
                 $file_path = '';

                 /* --------- start ------- */

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));

 

                 $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

                     /* --------- end ------- */

                     $curr_img_url = $post_image[$m];

@@ -988,7 +988,7 @@ 
                     // If the uploaded file is the right format

                     if (in_array($uploaded_file_type, $allowed_file_types)) {

                         if (!function_exists('wp_handle_upload')) {

-                            require_once(ABSPATH . 'wp-admin/includes/file.php');

+                            require_once(ABSPATH.'wp-admin/includes/file.php');

                         }

 

                         if (!is_dir($geodir_uploadpath)) {

@@ -996,41 +996,41 @@ 
                         }

 

                         $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+                        if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {

                         } else {

                             $external_img = true;

                         }

 

                         if ($dummy || $external_img) {

                             $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+                            $uploaded = (array) fetch_remote_file($curr_img_url);

 

                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

+                            } else {

+                                print_r($uploaded); exit;

                             }

                             $external_img = false;

                         } else {

-                            $new_name = $post_id . '_' . $file_name;

+                            $new_name = $post_id.'_'.$file_name;

 

                             if ($curr_img_dir == $sub_dir) {

-                                $img_path = $geodir_uploadpath . '/' . $filename;

-                                $img_url = $geodir_uploadurl . '/' . $filename;

+                                $img_path = $geodir_uploadpath.'/'.$filename;

+                                $img_url = $geodir_uploadurl.'/'.$filename;

                             } else {

-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                                $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

+                                $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;

                             }

 

                             $uploaded_file = '';

 

                             if (file_exists($img_path)) {

-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                                $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);

                                 $file_path = '';

-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

+                            } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {

                                 $uploaded_file = true;

-                                $file_path = $curr_img_dir . '/' . $filename;

+                                $file_path = $curr_img_dir.'/'.$filename;

                             }

 

                             if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

@@ -1039,14 +1039,14 @@ 
 

                         if (!empty($uploaded_file)) {

                             if (!isset($file_path) || !$file_path) {

-                                $file_path = $sub_dir . '/' . $new_name;

+                                $file_path = $sub_dir.'/'.$new_name;

                             }

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);

 

                             if ($menu_order == 1) {

 

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

 

                             }

 

@@ -1064,12 +1064,12 @@ 
 

                             foreach ($attachment as $key => $val) {

                                 if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                    $attachment_set .= $key." = '".$val."', ";

                             }

 

                             $attachment_set = trim($attachment_set, ", ");

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             $valid_file_ids[] = $wpdb->insert_id;

                         }

@@ -1080,17 +1080,17 @@ 
                 } else {

                     $valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);

 

                     $wpdb->query(

                         $wpdb->prepare(

-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

+                            "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d",

                             array($menu_order, $split_img_path[1], $post_id)

                         )

                     );

 

                     if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+                        $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

 

                 }

 

@@ -1114,9 +1114,9 @@ 
 

                 foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {

 

-                        $invalid_files[] = (object)array('src' => $img->src);

+                        $invalid_files[] = (object) array('src' => $img->src);

 

                     }

 

@@ -1124,12 +1124,12 @@ 
 

             }

 

-            $invalid_files = (object)$invalid_files;

+            $invalid_files = (object) $invalid_files;

         }

 

         $remove_files[] = $post_id;

 

-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

+        $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));

 

         if (!empty($invalid_files))

             geodir_remove_attachments($invalid_files);

@@ -1169,7 +1169,7 @@ 
 			rmdir($dirPath);

 	}	*/

 

-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;

+    $dirname = $uploads_dir.'/temp_'.$current_user->ID;

     geodir_delete_directory($dirname);

 }

 

@@ -1191,10 +1191,10 @@ 
         return false;

     while ($file = readdir($dir_handle)) {

         if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

+            if (!is_dir($dirname."/".$file))

+                unlink($dirname."/".$file);

             else

-                geodir_delete_directory($dirname . '/' . $file);

+                geodir_delete_directory($dirname.'/'.$file);

         }

     }

     closedir($dir_handle);

@@ -1223,8 +1223,8 @@ 
             foreach ($postcurr_images as $postimg) {

                 $image_name_arr = explode('/', $postimg->src);

                 $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

+                if (file_exists($uploads_dir.'/'.$filename))

+                    unlink($uploads_dir.'/'.$filename);

             }

 

         } // endif

@@ -1265,16 +1265,16 @@ 
         }

 

         if (!in_array($post_type, geodir_get_posttypes())) {

-            return false;// if not a GD CPT return;

+            return false; // if not a GD CPT return;

         }

 

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

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

 

         if (!$file) {

             if (isset($post->featured_image)) {

                 $file = $post->featured_image;

             } else {

-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

+                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));

             }

         }

 

@@ -1292,7 +1292,7 @@ 
 

             $file_name = $file_info['basename'];

 

-            $uploads_url = $uploads_baseurl . $sub_dir;

+            $uploads_url = $uploads_baseurl.$sub_dir;

             /*

              * Allows the filter of image src for such things as CDN change.

              *

@@ -1302,8 +1302,8 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-            $img_arr['path'] = $uploads_path . '/' . $file_name;

+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);

+            $img_arr['path'] = $uploads_path.'/'.$file_name;

             $width = 0;

             $height = 0;

             if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1346,7 +1346,7 @@ 
                 $file_name = $file_info['basename'];

 

                 $img_arr['src'] = $default_img;

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

+                $img_arr['path'] = $uploads_path.'/'.$file_name;

 

                 $width = 0;

                 $height = 0;

@@ -1363,7 +1363,7 @@ 
         }

 

         if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );

         else

             return false;

     }

@@ -1426,7 +1426,7 @@ 
 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ",

                 array('%image%', $post_id)

             )

         );

@@ -1452,7 +1452,7 @@ 
 

                 $file_name = $file_info['basename'];

 

-                $uploads_url = $uploads_baseurl . $sub_dir;

+                $uploads_url = $uploads_baseurl.$sub_dir;

                 /*

                 * Allows the filter of image src for such things as CDN change.

                 *

@@ -1462,8 +1462,8 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);

+                $img_arr['path'] = $uploads_path.'/'.$file_name;

                 $width = 0;

                 $height = 0;

                 if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1480,11 +1480,11 @@ 
                 $img_arr['content'] = $attechment->content; // add the description to the array

                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 $counter++;

             }

-            return (object)$return_arr;

+            return (object) $return_arr;

         } else if ($no_images) {

             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

@@ -1523,7 +1523,7 @@ 
                 $img_arr['title'] = $file_info['filename']; // add the title to the array

                 $img_arr['content'] = $file_info['filename']; // add the description to the array

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 return $return_arr;

             } else

@@ -1550,8 +1550,8 @@ 
 

         $html = '';

         if (!empty($request)) {

-            if (!is_object($request)){

-                $request = (object)$request;

+            if (!is_object($request)) {

+                $request = (object) $request;

             }

 

             if (isset($request->src) && !isset($request->path)) {

@@ -1565,7 +1565,7 @@ 
             $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

             $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

             if (strpos($img_no_http, $upload_no_http) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);

             }

             

             $width = 0;

@@ -1580,7 +1580,7 @@ 
             $image->width = $width;

             $image->height = $height;

 

-            $max_size = (object)geodir_get_imagesize($size);

+            $max_size = (object) geodir_get_imagesize($size);

 

             if (!is_wp_error($max_size)) {

                 if ($image->width) {

@@ -1592,15 +1592,15 @@ 
                         $width_per = 100;

                 }

 

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {

+                    $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'"  /></div>';

                 } else {

-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

+                    if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {

+                        $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');"></div>';

+                    } else {

                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

+                        $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

 

                     }

 

@@ -1636,15 +1636,15 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

 

-            if ($taxonomy == $post_type . '_tags') {

+            if ($taxonomy == $post_type.'_tags') {

                 if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

                     geodir_save_post_meta($post_id, 'post_tags', $terms);

                 }

-            } elseif ($taxonomy == $post_type . 'category') {

+            } elseif ($taxonomy == $post_type.'category') {

                 $srcharr = array('"', '\\');

                 $replarr = array("&quot;", '');

 

@@ -1666,7 +1666,7 @@ 
 

                     $wpdb->get_var(

                         $wpdb->prepare(

-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

+                            "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ",

                             $cat_ids_array_del

                         )

                     );

@@ -1674,7 +1674,7 @@ 
 

                     $post_term = $wpdb->get_col(

                         $wpdb->prepare(

-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

+                            "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id",

                             $cat_ids_array

                         )

                     );

@@ -1696,16 +1696,16 @@ 
                         $lat = geodir_get_post_meta($post_id, 'post_latitude', true);

                         $lng = geodir_get_post_meta($post_id, 'post_longitude', true);

 

-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

+                        $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

+                        $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true);

 

                         $json = '{';

-                        $json .= '"id":"' . $post_id . '",';

-                        $json .= '"lat_pos": "' . $lat . '",';

-                        $json .= '"long_pos": "' . $lng . '",';

-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

-                        $json .= '"icon":"' . $term_icon . '",';

-                        $json .= '"group":"catgroup' . $cat_id . '"';

+                        $json .= '"id":"'.$post_id.'",';

+                        $json .= '"lat_pos": "'.$lat.'",';

+                        $json .= '"long_pos": "'.$lng.'",';

+                        $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",';

+                        $json .= '"icon":"'.$term_icon.'",';

+                        $json .= '"group":"catgroup'.$cat_id.'"';

                         $json .= '}';

 

 

@@ -1713,9 +1713,9 @@ 
                             $post_marker_json = $json;

 

 

-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

+                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

 

-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

+                            $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET

 										post_title = %s,

 										json = %s

 										WHERE post_id = %d AND cat_id = %d ",

@@ -1723,7 +1723,7 @@ 
 

                         } else {

 

-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

+                            $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET

 										post_id = %d,

 										post_title = %s,

 										cat_id = %d,

@@ -1741,17 +1741,17 @@ 
                 if (!empty($post_term) && is_array($post_term)) {

                     $categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+                    if ($categories != '' && $categories != 0) $categories = ','.$categories.',';

 

                     if (empty($post_marker_json))

                         $post_marker_json = isset($json) ? $json : '';

 

-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                         $wpdb->query(

                             $wpdb->prepare(

-                                "UPDATE " . $table . " SET

-								" . $taxonomy . " = %s,

+                                "UPDATE ".$table." SET

+								" . $taxonomy." = %s,

 								marker_json = %s

 								where post_id = %d",

                                 array($categories, $post_marker_json, $post_id)

@@ -1772,7 +1772,7 @@ 
 

                                     $wpdb->query(

                                         $wpdb->prepare(

-                                            "UPDATE " . $table . " SET

+                                            "UPDATE ".$table." SET

 											default_category = %s

 											where post_id = %d",

                                             array($categories[0], $post_id)

@@ -1797,9 +1797,9 @@ 
 

                         $wpdb->query(

                             $wpdb->prepare(

-                                "INSERT INTO " . $table . " SET

+                                "INSERT INTO ".$table." SET

 								post_id = %d,

-								" . $taxonomy . " = %s,

+								" . $taxonomy." = %s,

 								marker_json = %s ",

 

                                 array($post_id, $categories, $post_marker_json)

@@ -1928,7 +1928,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1936,7 +1936,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -1981,7 +1981,7 @@ 
                              * @param object $postinfo_obj The posts info as an object.

                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

                              */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);

                             ?>

                         </div>

                         <?php

@@ -1993,10 +1993,10 @@ 
                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>

+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>

 

                                 <span

-                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>

+                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>

                   <span class="geodir-bubble-reviews"><a href="<?php echo get_comments_link($ID); ?>"

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

                           <?php echo get_comments_number($ID); ?>

@@ -2061,11 +2061,11 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

+                "UPDATE ".$table." SET post_status=%s WHERE post_id=%d",

                 array($status, $post_id)

             )

         );

@@ -2137,18 +2137,18 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

@@ -2157,7 +2157,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

@@ -2195,12 +2195,12 @@ 
         if (!in_array($post_type, $all_postypes))

             return false;

 

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

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

 

         /* Delete custom post meta*/

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . $table . " WHERE `post_id` = %d",

+                "DELETE FROM ".$table." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2209,7 +2209,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

+                "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2219,7 +2219,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

+                "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2291,7 +2291,7 @@ 
          */

         do_action('geodir_before_add_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-addtofav geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+        echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-addtofav geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>';

 

         /**

          * Called after adding the post from favourites.

@@ -2370,7 +2370,7 @@ 
          */

         do_action('geodir_before_remove_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+        echo '<a href="javascript:void(0);"  title="'.$add_favourite_text.'" class="geodir-addtofav geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>';

 

         /**

          * Called after removing the post from favourites.

@@ -2465,24 +2465,24 @@ 
             $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"

+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>

             </a>   </span><?php

 

         } else {

 

             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

+                $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\'';

             } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+                $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

-                                                                                        onclick="<?php echo $script_text;?>"

-                                                                                        title="<?php echo $add_favourite_text;?>"><i

-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

+                                                                                        onclick="<?php echo $script_text; ?>"

+                                                                                        title="<?php echo $add_favourite_text; ?>"><i

+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>

         <?php }

     }

 }

@@ -2512,7 +2512,7 @@ 
 

             $post_type = $taxonomy_obj->object_type[0];

 

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

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

 

             /**

              * Filter to modify the 'join' query

@@ -2535,8 +2535,8 @@ 
             $where = apply_filters('geodir_cat_post_count_where', $where, $term);

 

             $count_query = "SELECT count(post_id) FROM

-							" . $table . " as pd " . $join . "

-							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

+							" . $table." as pd ".$join."

+							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;

 

             $cat_post_count = $wpdb->get_var($count_query);

             if (empty($cat_post_count) || is_wp_error($cat_post_count))

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

     $all_postypes = geodir_get_posttypes();

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

-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

+        return ' <a href="'.get_permalink($post->ID).'">'.READ_MORE_TXT.'</a>';

     }

 

     return $more;

@@ -2646,14 +2646,14 @@ 
     if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

 

         $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+        $table = $plugin_prefix.$geodir_post_type.'_detail';

 

         $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

+        $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png';

 

         $posts = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

+                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ",

                 array($term_id, $taxonomy)

             )

         );

@@ -2665,19 +2665,19 @@ 
                 $lng = $post_obj->post_longitude;

 

                 $json = '{';

-                $json .= '"id":"' . $post_obj->post_id . '",';

-                $json .= '"lat_pos": "' . $lat . '",';

-                $json .= '"long_pos": "' . $lng . '",';

-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

-                $json .= '"icon":"' . $term_icon . '",';

-                $json .= '"group":"catgroup' . $term_id . '"';

+                $json .= '"id":"'.$post_obj->post_id.'",';

+                $json .= '"lat_pos": "'.$lat.'",';

+                $json .= '"long_pos": "'.$lng.'",';

+                $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",';

+                $json .= '"icon":"'.$term_icon.'",';

+                $json .= '"group":"catgroup'.$term_id.'"';

                 $json .= '}';

 

                 if ($post_obj->default_category == $term_id) {

 

                     $wpdb->query(

                         $wpdb->prepare(

-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",

+                            "UPDATE ".$table." SET marker_json = %s where post_id = %d",

                             array($json, $post_obj->post_id)

                         )

                     );

@@ -2685,7 +2685,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

+                        "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d",

                         array($json, $post_obj->post_id, $term_id)

                     )

                 );

@@ -2809,7 +2809,7 @@ 
 //	print_r($uploads ) ;

     $post_first_image = $wpdb->get_results(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

+            "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1  ", array($post_id)

         )

     );

 

@@ -2830,9 +2830,9 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

+        $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);

 

         $new_attachment_name = basename($post_first_image[0]->file);

 

@@ -2845,11 +2845,11 @@ 
                 wp_delete_attachment($post_thumbnail_id);

 

             }

-            $filename = $uploads['basedir'] . $post_first_image[0]->file;

+            $filename = $uploads['basedir'].$post_first_image[0]->file;

 

             $attachment = array(

                 'post_mime_type' => $post_first_image[0]->mime_type,

-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

+                'guid' => $uploads['baseurl'].$post_first_image[0]->file,

                 'post_parent' => $post_id,

                 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

                 'post_content' => ''

@@ -2862,7 +2862,7 @@ 
 

                 set_post_thumbnail($post_id, $id);

 

-                require_once(ABSPATH . 'wp-admin/includes/image.php');

+                require_once(ABSPATH.'wp-admin/includes/image.php');

                 wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

 

             }

@@ -2895,35 +2895,35 @@ 
         $post_id = absint($_POST['post_id']);

         $upload_dir = wp_upload_dir();

         $post_type = get_post_type($_POST['post_id']);

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

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

 

         $post_arr = $wpdb->get_results($wpdb->prepare(

-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

+            "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

             array($post_id)

         )

             , ARRAY_A);

 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

                 array('%image%', $post_id)

             )

         );

         if ($arrImages) {

             $image_arr = array();

             foreach ($arrImages as $img) {

-                $image_arr[] = $upload_dir['baseurl'] . $img->file;

+                $image_arr[] = $upload_dir['baseurl'].$img->file;

             }

             $comma_separated = implode(",", $image_arr);

             $post_arr[0]['post_images'] = $comma_separated;

         }

 

 

-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

+        $cats = $post_arr[0][$post_arr[0]['post_type'].'category'];

         $cat_arr = array_filter(explode(",", $cats));

         $trans_cat = array();

         foreach ($cat_arr as $cat) {

-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

+            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'].'category', false);

         }

 

 

@@ -2965,7 +2965,7 @@ 
 

     $get_data = $wpdb->get_results(

         $wpdb->prepare(

-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

+            "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'",

             array($listing_type)

         )

     );

@@ -2978,12 +2978,12 @@ 
 

                 $extra_fields = unserialize($data->extra_fields);

 

-                $prefix = $data->htmlvar_name . '_';

+                $prefix = $data->htmlvar_name.'_';

 

-                $fields_info[$prefix . 'address'] = $data->field_type;

+                $fields_info[$prefix.'address'] = $data->field_type;

 

                 if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+                    $fields_info[$prefix.'zip'] = $data->field_type;

 

             } else {

 

@@ -3081,13 +3081,13 @@ 
  * @since 1.4.9

  * @package GeoDirectory

  */

-function geodir_fb_like_thumbnail(){

+function geodir_fb_like_thumbnail() {

 

     // return if not a single post

-    if(!is_single()){return;}

+    if (!is_single()) {return; }

 

     global $post;

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

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

         $upload_dir = wp_upload_dir();

         $thumb = $upload_dir['baseurl'].$post->featured_image;

         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

Indentation +2223 added lines, -2223 removed lines

@@ -20,479 +20,479 @@ 
 function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '')

 {

 

-    $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

-    if (!empty($post_cat_ids))

-        $post_cat_array = explode(",", trim($post_cat_ids, ","));

-

-    if (!isset($default_cat) || empty($default_cat)) {

-        $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

-            $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

-            }

-        }

+	$post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

+	if (!empty($post_cat_ids))

+		$post_cat_array = explode(",", trim($post_cat_ids, ","));

+

+	if (!isset($default_cat) || empty($default_cat)) {

+		$default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

+	}else{

+		if(!is_int($default_cat)){

+			$category = get_term_by('name', $default_cat, $taxonomy);

+			if(isset($category->term_id)){

+				$default_cat =  $category->term_id;

+			}

+		}

 

-    }

+	}

 

 

-    geodir_save_post_meta($post_id, 'default_category', $default_cat);

+	geodir_save_post_meta($post_id, 'default_category', $default_cat);

 

-    if (isset($category_str) && empty($category_str)) {

+	if (isset($category_str) && empty($category_str)) {

 

-        $post_cat_str = '';

-        $post_categories = array();

-        if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {

-            $post_cat_str = implode(",y:#", $post_cat_array);

-            $post_cat_str .= ",y:";

-            $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));

-        }

-        $post_categories[$taxonomy] = $post_cat_str;

-        $category_str = $post_categories;

-    }

+		$post_cat_str = '';

+		$post_categories = array();

+		if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {

+			$post_cat_str = implode(",y:#", $post_cat_array);

+			$post_cat_str .= ",y:";

+			$post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));

+		}

+		$post_categories[$taxonomy] = $post_cat_str;

+		$category_str = $post_categories;

+	}

 

-    $change_cat_str = $category_str[$taxonomy];

+	$change_cat_str = $category_str[$taxonomy];

 

-    $default_pos = strpos($change_cat_str, 'd:');

+	$default_pos = strpos($change_cat_str, 'd:');

 

-    if ($default_pos === false) {

+	if ($default_pos === false) {

 

-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

+		$change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

 

-    }

+	}

 

-    $category_str[$taxonomy] = $change_cat_str;

+	$category_str[$taxonomy] = $change_cat_str;

 

-    update_post_meta($post_id, 'post_categories', $category_str);

+	update_post_meta($post_id, 'post_categories', $category_str);

 

 }

 

 

 if (!function_exists('geodir_save_listing')) {

-    /**

-     * Saves listing in the database using given information.

-     *

-     * @since 1.0.0

-     * @since 1.5.4 New parameter $wp_error added.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @global object $current_user Current user object.

+	/**

+	 * Saves listing in the database using given information.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.4 New parameter $wp_error added.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @global object $current_user Current user object.

 	 * @global object $gd_session GeoDirectory Session object.

-     * @param array $request_info {

-     *    Array of request info arguments.

-     *

-     *    @type string $action                                  Ajax action name.

-     *    @type string $geodir_ajax                             Ajax type.

-     *    @type string $ajax_action                             Ajax action.

-     *    @type string $listing_type                            Listing type.

-     *    @type string $pid                                     Default Post ID.

-     *    @type string $preview                                 Todo Desc needed.

-     *    @type string $add_listing_page_id                     Add listing page ID.

-     *    @type string $post_title                              Listing title.

-     *    @type string $post_desc                               Listing Description.

-     *    @type string $post_tags                               Listing tags.

-     *    @type array  $cat_limit                               Category limit.

-     *    @type array  $post_category                           Category IDs.

-     *    @type array  $post_category_str                       Category string.

-     *    @type string $post_default_category                   Default category ID.

-     *    @type string $post_address                            Listing address.

-     *    @type string $geodir_location_add_listing_country_val Add listing country value.

-     *    @type string $post_country                            Listing country.

-     *    @type string $geodir_location_add_listing_region_val  Add listing region value.

-     *    @type string $post_region                             Listing region.

-     *    @type string $geodir_location_add_listing_city_val    Add listing city value.

-     *    @type string $post_city                               Listing city.

-     *    @type string $post_zip                                Listing zip.

-     *    @type string $post_latitude                           Listing latitude.

-     *    @type string $post_longitude                          Listing longitude.

-     *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".

-     *    @type string $post_mapzoom                            Listing mapzoom Default "9".

-     *    @type string $geodir_timing                           Business timing info.

-     *    @type string $geodir_contact                          Contact number.

-     *    @type string $geodir_email                            Business contact email.

-     *    @type string $geodir_website                          Business website.

-     *    @type string $geodir_twitter                          Twitter link.

-     *    @type string $geodir_facebook                         Facebook link.

-     *    @type string $geodir_video                            Video link.

-     *    @type string $geodir_special_offers                   Speacial offers.

-     *    @type string $post_images                             Post image urls.

-     *    @type string $post_imagesimage_limit                  Post images limit.

-     *    @type string $post_imagestotImg                       Todo Desc needed.

-     *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.

-     *    @type string $geodir_spamblocker                      Todo Desc needed.

-     *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.

-     *

-     * }

-     * @param bool $dummy Optional. Is this a dummy listing? Default false.

-     * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.

-     * @return int|string|WP_Error Created post id or WP_Error on failure.

-     */

-    function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)

-    {

-        global $wpdb, $current_user, $gd_session;

-

-        $last_post_id = '';

-

-        if ($gd_session->get('listing') && !$dummy) {

-            $request_info = array();

-            $request_session = $gd_session->get('listing');

-            $request_info = array_merge($_REQUEST, $request_session);

-        } else if (!$gd_session->get('listing') && !$dummy) {

-            global $post;

-            $request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);

-            $request_info['post_title'] = $request_info['post_title'];

-            $request_info['listing_type'] = $post->post_type;

-            $request_info['post_desc'] = $request_info['content'];

-        } else if (!$dummy) {

-            return false;

-        }

-

-        /**

-         * Filter the request_info array.

-         *

-         * You can use this filter to modify request_info array.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param array $request_info See {@see geodir_save_listing()} for accepted args.

-         */

-        $request_info = apply_filters('geodir_action_get_request_info', $request_info);

-

-        // Check if we need to save post location as new location

-        $location_result = geodir_get_default_location();

-

-        if ($location_result->location_id > 0) {

-            if (isset($request_info['post_city']) && isset($request_info['post_region'])) {

-                $request_info['post_location'] = array(

-                    'city' => $request_info['post_city'],

-                    'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',

-                    'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',

-                    'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',

-                    'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''

-                );

-

-                $post_location_info = $request_info['post_location'];

-

-                if ($location_id = geodir_add_new_location($post_location_info)) {

-                    $post_location_id = $location_id;

-                }

-            } else {

-                $post_location_id = $location_result->location_id;

-            }

-        } else {

-            $post_location_id = $location_result->location_id;

-        }

-

-        if ($dummy) {

-            $post_status = 'publish';

-        } else {

-            $post_status = geodir_new_post_default_status();

-        }

-

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

-            $post_status = get_post_status($request_info['pid']);

-        }

-

-        /* fix change of slug on every title edit */

-        if (!isset($request_info['post_name'])) {

-            $request_info['post_name'] = $request_info['post_title'];

-

-            if (!empty($request_info['pid'])) {

-                $post_info = get_post($request_info['pid']);

-

-                if (!empty($post_info) && isset($post_info->post_name)) {

-                    $request_info['post_name'] = $post_info->post_name;

-                }

-            }

-        }

-

-        $post = array(

-            'post_content' => $request_info['post_desc'],

-            'post_status' => $post_status,

-            'post_title' => $request_info['post_title'],

-            'post_name' => $request_info['post_name'],

-            'post_type' => $request_info['listing_type']

-        );

-

-        /**

-         * Called before a listing is saved to the database.

-         *

-         * @since 1.0.0

-         * @param object $post The post object.

-         */

-        do_action_ref_array('geodir_before_save_listing', $post);

+	 * @param array $request_info {

+	 *    Array of request info arguments.

+	 *

+	 *    @type string $action                                  Ajax action name.

+	 *    @type string $geodir_ajax                             Ajax type.

+	 *    @type string $ajax_action                             Ajax action.

+	 *    @type string $listing_type                            Listing type.

+	 *    @type string $pid                                     Default Post ID.

+	 *    @type string $preview                                 Todo Desc needed.

+	 *    @type string $add_listing_page_id                     Add listing page ID.

+	 *    @type string $post_title                              Listing title.

+	 *    @type string $post_desc                               Listing Description.

+	 *    @type string $post_tags                               Listing tags.

+	 *    @type array  $cat_limit                               Category limit.

+	 *    @type array  $post_category                           Category IDs.

+	 *    @type array  $post_category_str                       Category string.

+	 *    @type string $post_default_category                   Default category ID.

+	 *    @type string $post_address                            Listing address.

+	 *    @type string $geodir_location_add_listing_country_val Add listing country value.

+	 *    @type string $post_country                            Listing country.

+	 *    @type string $geodir_location_add_listing_region_val  Add listing region value.

+	 *    @type string $post_region                             Listing region.

+	 *    @type string $geodir_location_add_listing_city_val    Add listing city value.

+	 *    @type string $post_city                               Listing city.

+	 *    @type string $post_zip                                Listing zip.

+	 *    @type string $post_latitude                           Listing latitude.

+	 *    @type string $post_longitude                          Listing longitude.

+	 *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".

+	 *    @type string $post_mapzoom                            Listing mapzoom Default "9".

+	 *    @type string $geodir_timing                           Business timing info.

+	 *    @type string $geodir_contact                          Contact number.

+	 *    @type string $geodir_email                            Business contact email.

+	 *    @type string $geodir_website                          Business website.

+	 *    @type string $geodir_twitter                          Twitter link.

+	 *    @type string $geodir_facebook                         Facebook link.

+	 *    @type string $geodir_video                            Video link.

+	 *    @type string $geodir_special_offers                   Speacial offers.

+	 *    @type string $post_images                             Post image urls.

+	 *    @type string $post_imagesimage_limit                  Post images limit.

+	 *    @type string $post_imagestotImg                       Todo Desc needed.

+	 *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.

+	 *    @type string $geodir_spamblocker                      Todo Desc needed.

+	 *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.

+	 *

+	 * }

+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.

+	 * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.

+	 * @return int|string|WP_Error Created post id or WP_Error on failure.

+	 */

+	function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)

+	{

+		global $wpdb, $current_user, $gd_session;

+

+		$last_post_id = '';

+

+		if ($gd_session->get('listing') && !$dummy) {

+			$request_info = array();

+			$request_session = $gd_session->get('listing');

+			$request_info = array_merge($_REQUEST, $request_session);

+		} else if (!$gd_session->get('listing') && !$dummy) {

+			global $post;

+			$request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);

+			$request_info['post_title'] = $request_info['post_title'];

+			$request_info['listing_type'] = $post->post_type;

+			$request_info['post_desc'] = $request_info['content'];

+		} else if (!$dummy) {

+			return false;

+		}

+

+		/**

+		 * Filter the request_info array.

+		 *

+		 * You can use this filter to modify request_info array.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param array $request_info See {@see geodir_save_listing()} for accepted args.

+		 */

+		$request_info = apply_filters('geodir_action_get_request_info', $request_info);

+

+		// Check if we need to save post location as new location

+		$location_result = geodir_get_default_location();

+

+		if ($location_result->location_id > 0) {

+			if (isset($request_info['post_city']) && isset($request_info['post_region'])) {

+				$request_info['post_location'] = array(

+					'city' => $request_info['post_city'],

+					'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',

+					'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',

+					'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',

+					'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''

+				);

+

+				$post_location_info = $request_info['post_location'];

+

+				if ($location_id = geodir_add_new_location($post_location_info)) {

+					$post_location_id = $location_id;

+				}

+			} else {

+				$post_location_id = $location_result->location_id;

+			}

+		} else {

+			$post_location_id = $location_result->location_id;

+		}

 

-        $send_post_submit_mail = false;

+		if ($dummy) {

+			$post_status = 'publish';

+		} else {

+			$post_status = geodir_new_post_default_status();

+		}

 

-        // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

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

+			$post_status = get_post_status($request_info['pid']);

+		}

 

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

-            $post['ID'] = $request_info['pid'];

+		/* fix change of slug on every title edit */

+		if (!isset($request_info['post_name'])) {

+			$request_info['post_name'] = $request_info['post_title'];

 

-            $last_post_id = wp_update_post($post, $wp_error);

-        } else {

-            $last_post_id = wp_insert_post($post, $wp_error);

+			if (!empty($request_info['pid'])) {

+				$post_info = get_post($request_info['pid']);

 

-            if (!$dummy && $last_post_id) {

-                $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)

-                //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);

-            }

-        }

+				if (!empty($post_info) && isset($post_info->post_name)) {

+					$request_info['post_name'] = $post_info->post_name;

+				}

+			}

+		}

+

+		$post = array(

+			'post_content' => $request_info['post_desc'],

+			'post_status' => $post_status,

+			'post_title' => $request_info['post_title'],

+			'post_name' => $request_info['post_name'],

+			'post_type' => $request_info['listing_type']

+		);

+

+		/**

+		 * Called before a listing is saved to the database.

+		 *

+		 * @since 1.0.0

+		 * @param object $post The post object.

+		 */

+		do_action_ref_array('geodir_before_save_listing', $post);

+

+		$send_post_submit_mail = false;

+

+		// unhook this function so it doesn't loop infinitely

+		remove_action('save_post', 'geodir_post_information_save',10,2);

+

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

+			$post['ID'] = $request_info['pid'];

+

+			$last_post_id = wp_update_post($post, $wp_error);

+		} else {

+			$last_post_id = wp_insert_post($post, $wp_error);

+

+			if (!$dummy && $last_post_id) {

+				$send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)

+				//geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);

+			}

+		}

 

-        if ($wp_error && is_wp_error($last_post_id)) {

-            return $last_post_id; // Return WP_Error on save failure.

-        }

+		if ($wp_error && is_wp_error($last_post_id)) {

+			return $last_post_id; // Return WP_Error on save failure.

+		}

 

-        if (!$last_post_id) {

-            return false; // Save failure.

-        }

+		if (!$last_post_id) {

+			return false; // Save failure.

+		}

 

-        // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+		// re-hook this function

+		add_action('save_post', 'geodir_post_information_save',10,2);

 

-        $post_tags = '';

-        if (!isset($request_info['post_tags'])) {

+		$post_tags = '';

+		if (!isset($request_info['post_tags'])) {

 

-            $post_type = $request_info['listing_type'];

-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

+			$post_type = $request_info['listing_type'];

+			$post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

 

-        }

+		}

 

-        $gd_post_info = array(

-            "post_title" => $request_info['post_title'],

-            "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,

-            "post_status" => $post_status,

-            "post_location_id" => $post_location_id,

-            "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',

-            "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',

-            "submit_time" => time(),

-            "submit_ip" => $_SERVER['REMOTE_ADDR'],

-        );

+		$gd_post_info = array(

+			"post_title" => $request_info['post_title'],

+			"post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,

+			"post_status" => $post_status,

+			"post_location_id" => $post_location_id,

+			"claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',

+			"businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',

+			"submit_time" => time(),

+			"submit_ip" => $_SERVER['REMOTE_ADDR'],

+		);

 

-        $payment_info = array();

-        $package_info = array();

+		$payment_info = array();

+		$package_info = array();

 

-        $package_info = (array)geodir_post_package_info($package_info, $post);

+		$package_info = (array)geodir_post_package_info($package_info, $post);

 

-        $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

+		$post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

-        if (!empty($package_info) && !$post_package_id) {

-            if (isset($package_info['days']) && $package_info['days'] != 0) {

-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

-            } else {

-                $payment_info['expire_date'] = 'Never';

-            }

+		if (!empty($package_info) && !$post_package_id) {

+			if (isset($package_info['days']) && $package_info['days'] != 0) {

+				$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

+			} else {

+				$payment_info['expire_date'] = 'Never';

+			}

 

-            $payment_info['package_id'] = $package_info['pid'];

-            $payment_info['alive_days'] = $package_info['days'];

-            $payment_info['is_featured'] = $package_info['is_featured'];

+			$payment_info['package_id'] = $package_info['pid'];

+			$payment_info['alive_days'] = $package_info['days'];

+			$payment_info['is_featured'] = $package_info['is_featured'];

 

-            $gd_post_info = array_merge($gd_post_info, $payment_info);

-        }

+			$gd_post_info = array_merge($gd_post_info, $payment_info);

+		}

 

-        $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);

+		$custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);

 

-        foreach ($custom_metaboxes as $key => $val):

+		foreach ($custom_metaboxes as $key => $val):

 

-            $name = $val['name'];

-            $type = $val['type'];

-            $extrafields = $val['extra_fields'];

+			$name = $val['name'];

+			$type = $val['type'];

+			$extrafields = $val['extra_fields'];

 

-            if (trim($type) == 'address') {

-                $prefix = $name . '_';

-                $address = $prefix . 'address';

+			if (trim($type) == 'address') {

+				$prefix = $name . '_';

+				$address = $prefix . 'address';

 

-                if (isset($request_info[$address]) && $request_info[$address] != '') {

-                    $gd_post_info[$address] = wp_slash($request_info[$address]);

-                }

+				if (isset($request_info[$address]) && $request_info[$address] != '') {

+					$gd_post_info[$address] = wp_slash($request_info[$address]);

+				}

 

-                if ($extrafields != '') {

-                    $extrafields = unserialize($extrafields);

+				if ($extrafields != '') {

+					$extrafields = unserialize($extrafields);

 

 

-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

+					if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

 

-                        $location_result = geodir_get_default_location();

+						$location_result = geodir_get_default_location();

 

-                        $gd_post_info[$prefix . 'city'] = $location_result->city;

-                        $gd_post_info[$prefix . 'region'] = $location_result->region;

-                        $gd_post_info[$prefix . 'country'] = $location_result->country;

+						$gd_post_info[$prefix . 'city'] = $location_result->city;

+						$gd_post_info[$prefix . 'region'] = $location_result->region;

+						$gd_post_info[$prefix . 'country'] = $location_result->country;

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

 

-                    } else {

+					} else {

 

-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

+						$gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

+						$gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

+						$gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

 

-                        //----------set post locations when import dummy data-------

-                        $location_result = geodir_get_default_location();

+						//----------set post locations when import dummy data-------

+						$location_result = geodir_get_default_location();

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

-                        //-----------------------------------------------------------------

+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+						//-----------------------------------------------------------------

 

-                    }

+					}

 

 

-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

-                    }

+					if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

+						$gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

+					}

 

 

-                    if (isset($extrafields['show_map']) && $extrafields['show_map']) {

+					if (isset($extrafields['show_map']) && $extrafields['show_map']) {

 

-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

-                        }

+						if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

+							$gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

+						}

 

-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

-                        }

+						if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

+							$gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

+						}

 

-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

-                        }

+						if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

+							$gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

+						}

 

-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

-                        }

+						if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

+							$gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

+						}

 

-                    }

+					}

 

-                    // show lat lng

-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

-                    }

-                }

+					// show lat lng

+					if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

+						$gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

+					}

+				}

 

-            } elseif (trim($type) == 'file') {

-                if (isset($request_info[$name])) {

-                    $request_files = array();

-                    if ($request_info[$name] != '')

-                        $request_files = explode(",", $request_info[$name]);

+			} elseif (trim($type) == 'file') {

+				if (isset($request_info[$name])) {

+					$request_files = array();

+					if ($request_info[$name] != '')

+						$request_files = explode(",", $request_info[$name]);

 

-                    $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

-                    geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

+					$extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

+					geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

 

-                }

-            } elseif (trim($type) == 'datepicker') {

-                $datetime = '';

-                if (isset($request_info[$name]) && $request_info[$name] != '') {

-                    $date_format = geodir_default_date_format();

-                    if (isset($val['extra_fields']) && $val['extra_fields'] != '') {

-                        $extra_fields = unserialize($val['extra_fields']);

-                        $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;

-                    }

+				}

+			} elseif (trim($type) == 'datepicker') {

+				$datetime = '';

+				if (isset($request_info[$name]) && $request_info[$name] != '') {

+					$date_format = geodir_default_date_format();

+					if (isset($val['extra_fields']) && $val['extra_fields'] != '') {

+						$extra_fields = unserialize($val['extra_fields']);

+						$date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;

+					}

 

-                    // check if we need to change the format or not

-                    $date_format_len = strlen(str_replace(' ', '', $date_format));

-                    if($date_format_len>5){// if greater then 5 then it's the old style format.

+					// check if we need to change the format or not

+					$date_format_len = strlen(str_replace(' ', '', $date_format));

+					if($date_format_len>5){// if greater then 5 then it's the old style format.

 

-                        $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                        $replace = array('d','j','l','m','n','F','Y');//PHP date format

+						$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

+						$replace = array('d','j','l','m','n','F','Y');//PHP date format

 

-                        $date_format = str_replace($search, $replace, $date_format);

+						$date_format = str_replace($search, $replace, $date_format);

 

-                        $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

+						$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

-                        $post_htmlvar_value = $request_info[$name];

-                    }

+					}else{

+						$post_htmlvar_value = $request_info[$name];

+					}

 

-                    $post_htmlvar_value =  geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

+					$post_htmlvar_value =  geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

 

-                    $datetime = date("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

+					$datetime = date("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

 

-                }

-                $gd_post_info[$name] = $datetime;

-            } else if ($type == 'multiselect') {

-                if (isset($request_info[$name])) {

-                    $gd_post_info[$name] = $request_info[$name];

-                } else {

-                    if (isset($request_info['gd_field_' . $name])) {

-                        $gd_post_info[$name] = ''; /* fix de-select for multiselect */

-                    }

-                }

-            } else if (isset($request_info[$name])) {

-                $gd_post_info[$name] = $request_info[$name];

-            }

+				}

+				$gd_post_info[$name] = $datetime;

+			} else if ($type == 'multiselect') {

+				if (isset($request_info[$name])) {

+					$gd_post_info[$name] = $request_info[$name];

+				} else {

+					if (isset($request_info['gd_field_' . $name])) {

+						$gd_post_info[$name] = ''; /* fix de-select for multiselect */

+					}

+				}

+			} else if (isset($request_info[$name])) {

+				$gd_post_info[$name] = $request_info[$name];

+			}

 

-        endforeach;

+		endforeach;

 

-        if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {

-            $gd_post_info['post_dummy'] = $request_info['post_dummy'];

-        }

+		if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {

+			$gd_post_info['post_dummy'] = $request_info['post_dummy'];

+		}

 

-        // Save post detail info in detail table

-        if (!empty($gd_post_info)) {

-            geodir_save_post_info($last_post_id, $gd_post_info);

-        }

+		// Save post detail info in detail table

+		if (!empty($gd_post_info)) {

+			geodir_save_post_info($last_post_id, $gd_post_info);

+		}

 

 

-        // Set categories to the listing

-        if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {

-            $post_category = array();

+		// Set categories to the listing

+		if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {

+			$post_category = array();

 

-            foreach ($request_info['post_category'] as $taxonomy => $cat) {

+			foreach ($request_info['post_category'] as $taxonomy => $cat) {

 

-                if ($dummy)

-                    $post_category = $cat;

-                else {

+				if ($dummy)

+					$post_category = $cat;

+				else {

 

-                    if (!is_array($cat) && strstr($cat, ','))

-                        $cat = explode(',', $cat);

+					if (!is_array($cat) && strstr($cat, ','))

+						$cat = explode(',', $cat);

 

-                    if (!empty($cat) && is_array($cat))

-                        $post_category = array_map('intval', $cat);

-                }

+					if (!empty($cat) && is_array($cat))

+						$post_category = array_map('intval', $cat);

+				}

 

-                wp_set_object_terms($last_post_id, $post_category, $taxonomy);

-            }

+				wp_set_object_terms($last_post_id, $post_category, $taxonomy);

+			}

 

-            $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';

+			$post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';

 

-            $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';

-            geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);

+			$post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';

+			geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);

 

-        }

+		}

 

-        $post_tags = '';

-        // Set tags to the listing

-        if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

-            $post_tags = explode(",", $request_info['post_tags']);

-        } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

-            if ($dummy)

-                $post_tags = $request_info['post_tags'];

-        } else {

-            if ($dummy)

-                $post_tags = array($request_info['post_title']);

-        }

+		$post_tags = '';

+		// Set tags to the listing

+		if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

+			$post_tags = explode(",", $request_info['post_tags']);

+		} elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

+			if ($dummy)

+				$post_tags = $request_info['post_tags'];

+		} else {

+			if ($dummy)

+				$post_tags = array($request_info['post_title']);

+		}

 

-        if (is_array($post_tags)) {

-            $taxonomy = $request_info['listing_type'] . '_tags';

-            wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

-        }

+		if (is_array($post_tags)) {

+			$taxonomy = $request_info['listing_type'] . '_tags';

+			wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

+		}

 

 

-        // Insert attechment

+		// Insert attechment

 

-        if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {

-            if (!$dummy) {

-                $tmpimgArr = trim($request_info['post_images'], ",");

-                $tmpimgArr = explode(",", $tmpimgArr);

-                geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

-                geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

-            }

+		if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {

+			if (!$dummy) {

+				$tmpimgArr = trim($request_info['post_images'], ",");

+				$tmpimgArr = explode(",", $tmpimgArr);

+				geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

+			} else{

+				geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

+			}

 

 

-        } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {

+		} elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {

 

-            /* Delete Attachments

+			/* Delete Attachments

 			$postcurr_images = geodir_get_images($last_post_id);

 

 			$wpdb->query(

@@ -508,34 +508,34 @@ 
 			geodir_save_post_info($last_post_id, $gd_post_featured_img);

 			*/

 

-        }

+		}

 

-        geodir_remove_temp_images();

-        geodir_set_wp_featured_image($last_post_id);

+		geodir_remove_temp_images();

+		geodir_set_wp_featured_image($last_post_id);

 

-        /**

-         * Called after a listing is saved to the database and before any email have been sent.

-         *

-         * @since 1.0.0

-         * @param int $last_post_id The saved post ID.

-         * @param array $request_info The post details in an array.

-         * @see 'geodir_after_save_listinginfo'

-         */

-        do_action('geodir_after_save_listing', $last_post_id, $request_info);

+		/**

+		 * Called after a listing is saved to the database and before any email have been sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $last_post_id The saved post ID.

+		 * @param array $request_info The post details in an array.

+		 * @see 'geodir_after_save_listinginfo'

+		 */

+		do_action('geodir_after_save_listing', $last_post_id, $request_info);

 

-        //die;

+		//die;

 

-        if ($send_post_submit_mail) { // if new post send out email

-            $to_name = geodir_get_client_name($current_user->ID);

-            geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);

-        }

-        /*

+		if ($send_post_submit_mail) { // if new post send out email

+			$to_name = geodir_get_client_name($current_user->ID);

+			geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);

+		}

+		/*

          * Unset the session so we don't loop.

          */

-        $gd_session->un_set('listing');

-        return $last_post_id;

+		$gd_session->un_set('listing');

+		return $last_post_id;

 

-    }

+	}

 

 }

 

@@ -554,585 +554,585 @@ 
 function geodir_get_post_info($post_id = '')

 {

 

-    global $wpdb, $plugin_prefix, $post, $post_info;

+	global $wpdb, $plugin_prefix, $post, $post_info;

 

-    if ($post_id == '' && !empty($post))

-        $post_id = $post->ID;

+	if ($post_id == '' && !empty($post))

+		$post_id = $post->ID;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

+		return false;

 

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

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

 

-    /**

-     * Apply Filter to change Post info

-     *

-     * You can use this filter to change Post info.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

+	/**

+	 * Apply Filter to change Post info

+	 *

+	 * You can use this filter to change Post info.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	$query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

 			  WHERE p.ID = pd.post_id

 			  AND post_id = " . $post_id);

 

-    $post_detail = $wpdb->get_row($query);

+	$post_detail = $wpdb->get_row($query);

 

-    return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;

+	return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;

 

 }

 

 

 if (!function_exists('geodir_save_post_info')) {

-    /**

-     * Saves post detail info in detail table.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $post_id The post ID.

-     * @param array $postinfo_array {

-     *    Post info that needs to be saved in detail table.

-     *

-     *    @type string $post_title              Listing title.

-     *    @type string $post_tags               Listing tags.

-     *    @type string $post_status             Listing post status.

-     *    @type string $post_location_id        Listing location ID.

-     *    @type string $claimed                 Todo Desc needed.

-     *    @type string $businesses              Todo Desc needed.

-     *    @type int    $submit_time             Submitted time in unix timestamp.

-     *    @type string $submit_ip               Submitted IP.

-     *    @type string $expire_date             Listing expiration date.

-     *    @type int    $package_id              Listing package ID.

-     *    @type int    $alive_days              Todo Desc needed.

-     *    @type int    $is_featured             Is this a featured listing?.

-     *    @type string $post_address            Listing address.

-     *    @type string $post_city               Listing city.

-     *    @type string $post_region             Listing region.

-     *    @type string $post_country            Listing country.

-     *    @type string $post_locations          Listing locations.

-     *    @type string $post_zip                Listing zip.

-     *    @type string $post_latitude           Listing latitude.

-     *    @type string $post_longitude          Listing longitude.

-     *    @type string $post_mapview            Listing mapview. Default "ROADMAP".

-     *    @type string $post_mapzoom            Listing mapzoom Default "9".

-     *    @type string $geodir_timing           Business timing info.

-     *    @type string $geodir_contact          Contact number.

-     *    @type string $geodir_email            Business contact email.

-     *    @type string $geodir_website          Business website.

-     *    @type string $geodir_twitter          Twitter link.

-     *    @type string $geodir_facebook         Facebook link.

-     *    @type string $geodir_video            Video link.

-     *    @type string $geodir_special_offers   Speacial offers.

-     *

-     * }

-     * @return bool

-     */

-    function geodir_save_post_info($post_id, $postinfo_array = array())

-    {

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        /**

-         * Filter to change Post info

-         *

-         * You can use this filter to change Post info.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

-         * @param int $post_id The post ID.

-         */

-        $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);

+	/**

+	 * Saves post detail info in detail table.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $post_id The post ID.

+	 * @param array $postinfo_array {

+	 *    Post info that needs to be saved in detail table.

+	 *

+	 *    @type string $post_title              Listing title.

+	 *    @type string $post_tags               Listing tags.

+	 *    @type string $post_status             Listing post status.

+	 *    @type string $post_location_id        Listing location ID.

+	 *    @type string $claimed                 Todo Desc needed.

+	 *    @type string $businesses              Todo Desc needed.

+	 *    @type int    $submit_time             Submitted time in unix timestamp.

+	 *    @type string $submit_ip               Submitted IP.

+	 *    @type string $expire_date             Listing expiration date.

+	 *    @type int    $package_id              Listing package ID.

+	 *    @type int    $alive_days              Todo Desc needed.

+	 *    @type int    $is_featured             Is this a featured listing?.

+	 *    @type string $post_address            Listing address.

+	 *    @type string $post_city               Listing city.

+	 *    @type string $post_region             Listing region.

+	 *    @type string $post_country            Listing country.

+	 *    @type string $post_locations          Listing locations.

+	 *    @type string $post_zip                Listing zip.

+	 *    @type string $post_latitude           Listing latitude.

+	 *    @type string $post_longitude          Listing longitude.

+	 *    @type string $post_mapview            Listing mapview. Default "ROADMAP".

+	 *    @type string $post_mapzoom            Listing mapzoom Default "9".

+	 *    @type string $geodir_timing           Business timing info.

+	 *    @type string $geodir_contact          Contact number.

+	 *    @type string $geodir_email            Business contact email.

+	 *    @type string $geodir_website          Business website.

+	 *    @type string $geodir_twitter          Twitter link.

+	 *    @type string $geodir_facebook         Facebook link.

+	 *    @type string $geodir_video            Video link.

+	 *    @type string $geodir_special_offers   Speacial offers.

+	 *

+	 * }

+	 * @return bool

+	 */

+	function geodir_save_post_info($post_id, $postinfo_array = array())

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		/**

+		 * Filter to change Post info

+		 *

+		 * You can use this filter to change Post info.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

+		 * @param int $post_id The post ID.

+		 */

+		$postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);

+

+		if (!empty($postmeta) && $post_id) {

+			$post_meta_set_query = '';

+

+			foreach ($postmeta as $mkey => $mval) {

+				if (geodir_column_exist($table, $mkey)) {

+					if (is_array($mval)) {

+						$mval = implode(",", $mval);

+					}

+

+					$post_meta_set_query .= $mkey . " = '" . $mval . "', ";

+				}

+			}

 

-        if (!empty($postmeta) && $post_id) {

-            $post_meta_set_query = '';

+			$post_meta_set_query = trim($post_meta_set_query, ", ");

 

-            foreach ($postmeta as $mkey => $mval) {

-                if (geodir_column_exist($table, $mkey)) {

-                    if (is_array($mval)) {

-                        $mval = implode(",", $mval);

-                    }

+			$post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

 

-                    $post_meta_set_query .= $mkey . " = '" . $mval . "', ";

-                }

-            }

+			/**

+			 * Called before saving the listing info.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

+			 * @param int $post_id The post ID.

+			 */

+			do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            $post_meta_set_query = trim($post_meta_set_query, ", ");

+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

+						array($post_id)

+					)

+				);

 

-            /**

-             * Called before saving the listing info.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

-             * @param int $post_id The post ID.

-             */

-            do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+			} else {

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

-                        array($post_id)

-                    )

-                );

+				$wpdb->query(

+					$wpdb->prepare(

+						"INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

+						array($post_id)

+					)

+				);

 

+			}

 

-            } else {

+			/**

+			 * Called after saving the listing info.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $postinfo_array Post info that needs to be saved in detail table.

+			 * @param int $post_id The post ID.

+			 * @see 'geodir_after_save_listing'

+			 */

+			do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

+

+			return true;

+		} else

+			return false;

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

-                        array($post_id)

-                    )

-                );

+	}

+}

 

-            }

 

-            /**

-             * Called after saving the listing info.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $postinfo_array Post info that needs to be saved in detail table.

-             * @param int $post_id The post ID.

-             * @see 'geodir_after_save_listing'

-             */

-            do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

+if (!function_exists('geodir_save_post_meta')) {

+	/**

+	 * Save or update post custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $post_id The post ID.

+	 * @param string $postmeta Detail table column name.

+	 * @param string $meta_value Detail table column value.

+	 * @return void|bool

+	 */

+	function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

+

+			if (is_array($meta_value)) {

+				$meta_value = implode(",", $meta_value);

+			}

 

-            return true;

-        } else

-            return false;

+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-    }

-}

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

+						array($post_id)

+					)

+				);

 

+			} else {

 

-if (!function_exists('geodir_save_post_meta')) {

-    /**

-     * Save or update post custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $post_id The post ID.

-     * @param string $postmeta Detail table column name.

-     * @param string $meta_value Detail table column value.

-     * @return void|bool

-     */

-    function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

-

-            if (is_array($meta_value)) {

-                $meta_value = implode(",", $meta_value);

-            }

-

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

-                        array($post_id)

-                    )

-                );

-

-            } else {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

-                        array($post_id)

-                    )

-                );

-            }

-

-

-        } else

-            return false;

-    }

+				$wpdb->query(

+					$wpdb->prepare(

+						"INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

+						array($post_id)

+					)

+				);

+			}

+

+

+		} else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_delete_post_meta')) {

-    /**

-     * Delete post custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $post_id The post ID.

-     * @param string $postmeta Detail table column name.

-     * @todo check if this is depreciated

-     * @todo Fix unknown variable mval

-     * @return bool

-     */

-    function geodir_delete_post_meta($post_id, $postmeta)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        if (is_array($postmeta) && !empty($postmeta) && $post_id) {

-            $post_meta_set_query = '';

-

-            foreach ($postmeta as $mkey) {

-                if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

-            }

-

-            $post_meta_set_query = trim($post_meta_set_query, ", ");

-

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

-                        array($post_id)

-                    )

-                );

-

-                return true;

-            }

-

-        } elseif ($postmeta != '' && $post_id) {

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

-                        array($post_id)

-                    )

-                );

-

-                return true;

-            }

-

-        } else

-            return false;

-    }

+	/**

+	 * Delete post custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $post_id The post ID.

+	 * @param string $postmeta Detail table column name.

+	 * @todo check if this is depreciated

+	 * @todo Fix unknown variable mval

+	 * @return bool

+	 */

+	function geodir_delete_post_meta($post_id, $postmeta)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if (is_array($postmeta) && !empty($postmeta) && $post_id) {

+			$post_meta_set_query = '';

+

+			foreach ($postmeta as $mkey) {

+				if ($mval != '')

+					$post_meta_set_query .= $mkey . " = '', ";

+			}

+

+			$post_meta_set_query = trim($post_meta_set_query, ", ");

+

+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

+						array($post_id)

+					)

+				);

+

+				return true;

+			}

+

+		} elseif ($postmeta != '' && $post_id) {

+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

+						array($post_id)

+					)

+				);

+

+				return true;

+			}

+

+		} else

+			return false;

+	}

 }

 

 

 if (!function_exists('geodir_get_post_meta')) {

-    /**

-     * Get post custom meta.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $post_id The post ID.

-     * @param string $meta_key The meta key to retrieve.

-     * @param bool $single Optional. Whether to return a single value. Default false.

-     * @todo single variable not yet implemented.

-     * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.

-     */

-    function geodir_get_post_meta($post_id, $meta_key, $single = false)

-    {

-        if (!$post_id) {

-            return false;

-        }

-        global $wpdb, $plugin_prefix;

-

-        $all_postypes = geodir_get_posttypes();

-

-        $post_type = get_post_type($post_id);

-

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

-            return false;

-

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

-

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

+	/**

+	 * Get post custom meta.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $post_id The post ID.

+	 * @param string $meta_key The meta key to retrieve.

+	 * @param bool $single Optional. Whether to return a single value. Default false.

+	 * @todo single variable not yet implemented.

+	 * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.

+	 */

+	function geodir_get_post_meta($post_id, $meta_key, $single = false)

+	{

+		if (!$post_id) {

+			return false;

+		}

+		global $wpdb, $plugin_prefix;

+

+		$all_postypes = geodir_get_posttypes();

+

+		$post_type = get_post_type($post_id);

+

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

+			return false;

+

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

+

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

+			$meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

             

-            if ($meta_value && $meta_value !== '') {

-                return maybe_serialize($meta_value);

-            } else

-                return $meta_value;

-        } else {

-            return false;

-        }

-    }

+			if ($meta_value && $meta_value !== '') {

+				return maybe_serialize($meta_value);

+			} else

+				return $meta_value;

+		} else {

+			return false;

+		}

+	}

 }

 

 

 if (!function_exists('geodir_save_post_images')) {

-    /**

-     * Save post attachments.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     * @param array $post_image Post image urls as an array.

-     * @param bool $dummy Optional. Is this a dummy listing? Default false.

-     */

-    function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)

-    {

-

+	/**

+	 * Save post attachments.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 * @param array $post_image Post image urls as an array.

+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.

+	 */

+	function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

 

-        $post_type = get_post_type($post_id);

+		global $wpdb, $plugin_prefix, $current_user;

 

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

+		$post_type = get_post_type($post_id);

 

-        $post_images = geodir_get_images($post_id);

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

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",

-                array($post_id)

-            )

-        );

+		$post_images = geodir_get_images($post_id);

 

-        $invalid_files = $post_images;

-        $valid_file_ids = array();

-        $valid_files_condition = '';

-        $geodir_uploaddir = '';

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET featured_image = '' where post_id =%d",

+				array($post_id)

+			)

+		);

 

-        $remove_files = array();

+		$invalid_files = $post_images;

+		$valid_file_ids = array();

+		$valid_files_condition = '';

+		$geodir_uploaddir = '';

 

-        if (!empty($post_image)) {

+		$remove_files = array();

 

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+		if (!empty($post_image)) {

 

-            $geodir_uploadpath = $uploads['path'];

-            $geodir_uploadurl = $uploads['url'];

-            $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $invalid_files = array();

-            $postcurr_images = array();

+			$geodir_uploadpath = $uploads['path'];

+			$geodir_uploadurl = $uploads['url'];

+			$sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';

 

-            for ($m = 0; $m < count($post_image); $m++) {

-                $menu_order = $m + 1;

+			$invalid_files = array();

+			$postcurr_images = array();

 

-                $file_path = '';

-                /* --------- start ------- */

+			for ($m = 0; $m < count($post_image); $m++) {

+				$menu_order = $m + 1;

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+				$file_path = '';

+				/* --------- start ------- */

 

-                $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

+				$split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

 

+				$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

-                    /* --------- end ------- */

-                    $curr_img_url = $post_image[$m];

+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

-                    $image_name_arr = explode('/', $curr_img_url);

+					/* --------- end ------- */

+					$curr_img_url = $post_image[$m];

 

-                    $count_image_name_arr = count($image_name_arr) - 2;

+					$image_name_arr = explode('/', $curr_img_url);

 

-                    $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;

+					$count_image_name_arr = count($image_name_arr) - 2;

 

-                    $curr_img_dir = $image_name_arr[$count_image_name_arr];

+					$count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;

 

-                    $filename = end($image_name_arr);

-                    if (strpos($filename, '?') !== false) {

-                        list($filename) = explode('?', $filename);

-                    }

+					$curr_img_dir = $image_name_arr[$count_image_name_arr];

 

-                    $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);

-                    $curr_img_dir = str_replace($filename, "", $curr_img_dir);

+					$filename = end($image_name_arr);

+					if (strpos($filename, '?') !== false) {

+						list($filename) = explode('?', $filename);

+					}

 

-                    $img_name_arr = explode('.', $filename);

+					$curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);

+					$curr_img_dir = str_replace($filename, "", $curr_img_dir);

 

-                    $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;

-                    if (!empty($img_name_arr) && count($img_name_arr) > 2) {

-                        $new_img_name_arr = $img_name_arr;

-                        if (isset($new_img_name_arr[count($img_name_arr) - 1])) {

-                            unset($new_img_name_arr[count($img_name_arr) - 1]);

-                            $file_title = implode('.', $new_img_name_arr);

-                        }

-                    }

-                    $file_title = sanitize_file_name($file_title);

-                    $file_name = sanitize_file_name($filename);

+					$img_name_arr = explode('.', $filename);

 

-                    $arr_file_type = wp_check_filetype($filename);

+					$file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;

+					if (!empty($img_name_arr) && count($img_name_arr) > 2) {

+						$new_img_name_arr = $img_name_arr;

+						if (isset($new_img_name_arr[count($img_name_arr) - 1])) {

+							unset($new_img_name_arr[count($img_name_arr) - 1]);

+							$file_title = implode('.', $new_img_name_arr);

+						}

+					}

+					$file_title = sanitize_file_name($file_title);

+					$file_name = sanitize_file_name($filename);

 

-                    $uploaded_file_type = $arr_file_type['type'];

+					$arr_file_type = wp_check_filetype($filename);

 

-                    // Set an array containing a list of acceptable formats

-                    $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');

+					$uploaded_file_type = $arr_file_type['type'];

 

-                    // If the uploaded file is the right format

-                    if (in_array($uploaded_file_type, $allowed_file_types)) {

-                        if (!function_exists('wp_handle_upload')) {

-                            require_once(ABSPATH . 'wp-admin/includes/file.php');

-                        }

+					// Set an array containing a list of acceptable formats

+					$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');

 

-                        if (!is_dir($geodir_uploadpath)) {

-                            mkdir($geodir_uploadpath);

-                        }

+					// If the uploaded file is the right format

+					if (in_array($uploaded_file_type, $allowed_file_types)) {

+						if (!function_exists('wp_handle_upload')) {

+							require_once(ABSPATH . 'wp-admin/includes/file.php');

+						}

 

-                        $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

-                        } else {

-                            $external_img = true;

-                        }

+						if (!is_dir($geodir_uploadpath)) {

+							mkdir($geodir_uploadpath);

+						}

 

-                        if ($dummy || $external_img) {

-                            $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+						$external_img = false;

+						if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+						} else {

+							$external_img = true;

+						}

 

-                            if (isset($uploaded['error']) && empty($uploaded['error'])) {

-                                $new_name = basename($uploaded['file']);

-                                $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

-                            }

-                            $external_img = false;

-                        } else {

-                            $new_name = $post_id . '_' . $file_name;

+						if ($dummy || $external_img) {

+							$uploaded_file = array();

+							$uploaded = (array)fetch_remote_file($curr_img_url);

 

-                            if ($curr_img_dir == $sub_dir) {

-                                $img_path = $geodir_uploadpath . '/' . $filename;

-                                $img_url = $geodir_uploadurl . '/' . $filename;

-                            } else {

-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-                            }

+							if (isset($uploaded['error']) && empty($uploaded['error'])) {

+								$new_name = basename($uploaded['file']);

+								$uploaded_file = $uploaded;

+							}else{

+								print_r($uploaded);exit;

+							}

+							$external_img = false;

+						} else {

+							$new_name = $post_id . '_' . $file_name;

 

-                            $uploaded_file = '';

+							if ($curr_img_dir == $sub_dir) {

+								$img_path = $geodir_uploadpath . '/' . $filename;

+								$img_url = $geodir_uploadurl . '/' . $filename;

+							} else {

+								$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+								$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+							}

 

-                            if (file_exists($img_path)) {

-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

-                                $file_path = '';

-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

-                                $uploaded_file = true;

-                                $file_path = $curr_img_dir . '/' . $filename;

-                            }

+							$uploaded_file = '';

 

-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

-                                unlink($img_path);

-                        }

+							if (file_exists($img_path)) {

+								$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+								$file_path = '';

+							} else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

+								$uploaded_file = true;

+								$file_path = $curr_img_dir . '/' . $filename;

+							}

 

-                        if (!empty($uploaded_file)) {

-                            if (!isset($file_path) || !$file_path) {

-                                $file_path = $sub_dir . '/' . $new_name;

-                            }

+							if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

+								unlink($img_path);

+						}

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+						if (!empty($uploaded_file)) {

+							if (!isset($file_path) || !$file_path) {

+								$file_path = $sub_dir . '/' . $new_name;

+							}

 

-                            if ($menu_order == 1) {

+							$postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

 

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

+							if ($menu_order == 1) {

 

-                            }

+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

 

-                            // Set up options array to add this file as an attachment

-                            $attachment = array();

-                            $attachment['post_id'] = $post_id;

-                            $attachment['title'] = $file_title;

-                            $attachment['content'] = '';

-                            $attachment['file'] = $file_path;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

+							}

 

-                            $attachment_set = '';

+							// Set up options array to add this file as an attachment

+							$attachment = array();

+							$attachment['post_id'] = $post_id;

+							$attachment['title'] = $file_title;

+							$attachment['content'] = '';

+							$attachment['file'] = $file_path;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

 

-                            foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

-                            }

+							$attachment_set = '';

 

-                            $attachment_set = trim($attachment_set, ", ");

+							foreach ($attachment as $key => $val) {

+								if ($val != '')

+									$attachment_set .= $key . " = '" . $val . "', ";

+							}

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+							$attachment_set = trim($attachment_set, ", ");

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

 

-                            $valid_file_ids[] = $wpdb->insert_id;

-                        }

+							$valid_file_ids[] = $wpdb->insert_id;

+						}

 

-                    }

+					}

 

 

-                } else {

-                    $valid_file_ids[] = $find_image;

+				} else {

+					$valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+					$postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

 

-                    $wpdb->query(

-                        $wpdb->prepare(

-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

-                            array($menu_order, $split_img_path[1], $post_id)

-                        )

-                    );

+					$wpdb->query(

+						$wpdb->prepare(

+							"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

+							array($menu_order, $split_img_path[1], $post_id)

+						)

+					);

 

-                    if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+					if ($menu_order == 1)

+						$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

 

-                }

+				}

 

 

-            }

+			}

 

-            if (!empty($valid_file_ids)) {

+			if (!empty($valid_file_ids)) {

 

-                $remove_files = $valid_file_ids;

+				$remove_files = $valid_file_ids;

 

-                $remove_files_length = count($remove_files);

-                $remove_files_format = array_fill(0, $remove_files_length, '%d');

-                $format = implode(',', $remove_files_format);

-                $valid_files_condition = " ID NOT IN ($format) AND ";

+				$remove_files_length = count($remove_files);

+				$remove_files_format = array_fill(0, $remove_files_length, '%d');

+				$format = implode(',', $remove_files_format);

+				$valid_files_condition = " ID NOT IN ($format) AND ";

 

-            }

+			}

 

-            //Get and remove all old images of post from database to set by new order

+			//Get and remove all old images of post from database to set by new order

 

-            if (!empty($post_images)) {

+			if (!empty($post_images)) {

 

-                foreach ($post_images as $img) {

+				foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+					if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

 

-                        $invalid_files[] = (object)array('src' => $img->src);

+						$invalid_files[] = (object)array('src' => $img->src);

 

-                    }

+					}

 

-                }

+				}

 

-            }

+			}

 

-            $invalid_files = (object)$invalid_files;

-        }

+			$invalid_files = (object)$invalid_files;

+		}

 

-        $remove_files[] = $post_id;

+		$remove_files[] = $post_id;

 

-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

+		$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

-    }

+		if (!empty($invalid_files))

+			geodir_remove_attachments($invalid_files);

+	}

 

 }

 

@@ -1146,12 +1146,12 @@ 
 function geodir_remove_temp_images()

 {

 

-    global $current_user;

+	global $current_user;

 

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

 

-    /*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){

+	/*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){

 

 			$dirPath = $uploads_dir.'/temp_'.$current_user->data->ID;

 			if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {

@@ -1168,8 +1168,8 @@ 
 			rmdir($dirPath);

 	}	*/

 

-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;

-    geodir_delete_directory($dirname);

+	$dirname = $uploads_dir . '/temp_' . $current_user->ID;

+	geodir_delete_directory($dirname);

 }

 

 

@@ -1183,116 +1183,116 @@ 
  */

 function geodir_delete_directory($dirname)

 {

-    $dir_handle = '';

-    if (is_dir($dirname))

-        $dir_handle = opendir($dirname);

-    if (!$dir_handle)

-        return false;

-    while ($file = readdir($dir_handle)) {

-        if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

-            else

-                geodir_delete_directory($dirname . '/' . $file);

-        }

-    }

-    closedir($dir_handle);

-    rmdir($dirname);

-    return true;

+	$dir_handle = '';

+	if (is_dir($dirname))

+		$dir_handle = opendir($dirname);

+	if (!$dir_handle)

+		return false;

+	while ($file = readdir($dir_handle)) {

+		if ($file != "." && $file != "..") {

+			if (!is_dir($dirname . "/" . $file))

+				unlink($dirname . "/" . $file);

+			else

+				geodir_delete_directory($dirname . '/' . $file);

+		}

+	}

+	closedir($dir_handle);

+	rmdir($dirname);

+	return true;

 

 }

 

 

 if (!function_exists('geodir_remove_attachments')) {

-    /**

-     * Remove post attachments.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $postcurr_images Array of image objects.

-     */

-    function geodir_remove_attachments($postcurr_images = array())

-    {

-        // Unlink all past images of post

-        if (!empty($postcurr_images)) {

-

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-

-            foreach ($postcurr_images as $postimg) {

-                $image_name_arr = explode('/', $postimg->src);

-                $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

-            }

-

-        } // endif

-        // Unlink all past images of post end

-    }

+	/**

+	 * Remove post attachments.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $postcurr_images Array of image objects.

+	 */

+	function geodir_remove_attachments($postcurr_images = array())

+	{

+		// Unlink all past images of post

+		if (!empty($postcurr_images)) {

+

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+

+			foreach ($postcurr_images as $postimg) {

+				$image_name_arr = explode('/', $postimg->src);

+				$filename = end($image_name_arr);

+				if (file_exists($uploads_dir . '/' . $filename))

+					unlink($uploads_dir . '/' . $filename);

+			}

+

+		} // endif

+		// Unlink all past images of post end

+	}

 }

 

 if (!function_exists('geodir_get_featured_image')) {

-    /**

-     * Gets the post featured image.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int|string $post_id The post ID.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.

-     * @return bool|object Image details as an object.

-     */

-    function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)

-    {

-

-        /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail

+	/**

+	 * Gets the post featured image.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int|string $post_id The post ID.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.

+	 * @return bool|object Image details as an object.

+	 */

+	function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)

+	{

+

+		/*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail

         $img_arr['path'] = '';

         $img_arr['width'] = '';

         $img_arr['height'] = '';

         $img_arr['title'] = '';

         return (object)$img_arr;*/

-        global $wpdb, $plugin_prefix, $post;

+		global $wpdb, $plugin_prefix, $post;

 

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

-            $post_type = $post->post_type;

-        } else {

-            $post_type = get_post_type($post_id);

-        }

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

+			$post_type = $post->post_type;

+		} else {

+			$post_type = get_post_type($post_id);

+		}

 

-        if (!in_array($post_type, geodir_get_posttypes())) {

-            return false;// if not a GD CPT return;

-        }

+		if (!in_array($post_type, geodir_get_posttypes())) {

+			return false;// if not a GD CPT return;

+		}

 

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

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

 

-        if (!$file) {

-            if (isset($post->featured_image)) {

-                $file = $post->featured_image;

-            } else {

-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

-            }

-        }

+		if (!$file) {

+			if (isset($post->featured_image)) {

+				$file = $post->featured_image;

+			} else {

+				$file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

+			}

+		}

 

-        if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {

-            $img_arr = array();

+		if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {

+			$img_arr = array();

 

-            $file_info = pathinfo($file);

-            $sub_dir = '';

-            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                $sub_dir = stripslashes_deep($file_info['dirname']);

+			$file_info = pathinfo($file);

+			$sub_dir = '';

+			if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+				$sub_dir = stripslashes_deep($file_info['dirname']);

 

-            $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-            $uploads_baseurl = $uploads['baseurl'];

-            $uploads_path = $uploads['path'];

+			$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+			$uploads_baseurl = $uploads['baseurl'];

+			$uploads_path = $uploads['path'];

 

-            $file_name = $file_info['basename'];

+			$file_name = $file_info['basename'];

 

-            $uploads_url = $uploads_baseurl . $sub_dir;

-            /*

+			$uploads_url = $uploads_baseurl . $sub_dir;

+			/*

              * Allows the filter of image src for such things as CDN change.

              *

              * @since 1.5.7

@@ -1301,158 +1301,158 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-            $img_arr['path'] = $uploads_path . '/' . $file_name;

-            $width = 0;

-            $height = 0;

-            if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                $imagesize = getimagesize($img_arr['path']);

-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-            }

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

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

-            $img_arr['title'] = '';

-        } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {

-            foreach ($post_images as $image) {

-                return $image;

-            }

-        } else if ($no_image) {

-            $img_arr = array();

-

-            $default_img = '';

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

-                $default_cat = $post->default_category;

-            } else {

-                $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

-            }

-

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_image) {

-                $default_img = get_option('geodir_listing_no_img');

-            }

-

-            if (!empty($default_img)) {

-                $uploads = wp_upload_dir(); // Array of key => value pairs

-                $uploads_baseurl = $uploads['baseurl'];

-                $uploads_path = $uploads['path'];

-

-                $img_arr = array();

-

-                $file_info = pathinfo($default_img);

-

-                $file_name = $file_info['basename'];

-

-                $img_arr['src'] = $default_img;

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

-

-                $width = 0;

-                $height = 0;

-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                    $imagesize = getimagesize($img_arr['path']);

-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

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

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

-

-                $img_arr['title'] = ''; // add the title to the array

-            }

-        }

-

-        if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

-        else

-            return false;

-    }

+			$img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+			$img_arr['path'] = $uploads_path . '/' . $file_name;

+			$width = 0;

+			$height = 0;

+			if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+				$imagesize = getimagesize($img_arr['path']);

+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+			}

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

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

+			$img_arr['title'] = '';

+		} elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {

+			foreach ($post_images as $image) {

+				return $image;

+			}

+		} else if ($no_image) {

+			$img_arr = array();

+

+			$default_img = '';

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

+				$default_cat = $post->default_category;

+			} else {

+				$default_cat = geodir_get_post_meta($post_id, 'default_category', true);

+			}

+

+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

+				$default_img = $default_catimg['src'];

+			elseif ($no_image) {

+				$default_img = get_option('geodir_listing_no_img');

+			}

+

+			if (!empty($default_img)) {

+				$uploads = wp_upload_dir(); // Array of key => value pairs

+				$uploads_baseurl = $uploads['baseurl'];

+				$uploads_path = $uploads['path'];

+

+				$img_arr = array();

+

+				$file_info = pathinfo($default_img);

+

+				$file_name = $file_info['basename'];

+

+				$img_arr['src'] = $default_img;

+				$img_arr['path'] = $uploads_path . '/' . $file_name;

+

+				$width = 0;

+				$height = 0;

+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+					$imagesize = getimagesize($img_arr['path']);

+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

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

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

+

+				$img_arr['title'] = ''; // add the title to the array

+			}

+		}

+

+		if (!empty($img_arr))

+			return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+		else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_show_featured_image')) {

-    /**

-     * Gets the post featured image.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param int|string $post_id The post ID.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

-     * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.

-     * @return bool|string Returns image html.

-     */

-    function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)

-    {

-        $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);

-

-        $html = geodir_show_image($image, $size, $no_image, false);

-

-        if (!empty($html) && $echo) {

-            echo $html;

-        } elseif (!empty($html)) {

-            return $html;

-        } else

-            return false;

-    }

+	/**

+	 * Gets the post featured image.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param int|string $post_id The post ID.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

+	 * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.

+	 * @return bool|string Returns image html.

+	 */

+	function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)

+	{

+		$image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);

+

+		$html = geodir_show_image($image, $size, $no_image, false);

+

+		if (!empty($html) && $echo) {

+			echo $html;

+		} elseif (!empty($html)) {

+			return $html;

+		} else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_get_images')) {

-    /**

-     * Gets the post images.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param int $post_id The post ID.

-     * @param string $img_size Optional. Thumbnail size.

-     * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.

-     * @param int|string $limit Optional. Number of images.

-     * @return array|bool Returns images as an array. Each item is an object.

-     */

-    function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')

-    {

-        global $wpdb;

-        if ($limit) {

-            $limit_q = " LIMIT $limit ";

-        } else {

-            $limit_q = '';

-        }

-        $not_featured = '';

-        $sub_dir = '';

-        if (!$add_featured)

-            $not_featured = " AND is_featured = 0 ";

-

-        $arrImages = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

-                array('%image%', $post_id)

-            )

-        );

-

-        $counter = 0;

-        $return_arr = array();

-

-        if (!empty($arrImages)) {

-            foreach ($arrImages as $attechment) {

-

-                $img_arr = array();

-                $img_arr['id'] = $attechment->ID;

-                $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;

-

-                $file_info = pathinfo($attechment->file);

-

-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                    $sub_dir = stripslashes_deep($file_info['dirname']);

-

-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-                $uploads_baseurl = $uploads['baseurl'];

-                $uploads_path = $uploads['path'];

-

-                $file_name = $file_info['basename'];

-

-                $uploads_url = $uploads_baseurl . $sub_dir;

-                /*

+	/**

+	 * Gets the post images.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param int $post_id The post ID.

+	 * @param string $img_size Optional. Thumbnail size.

+	 * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.

+	 * @param int|string $limit Optional. Number of images.

+	 * @return array|bool Returns images as an array. Each item is an object.

+	 */

+	function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')

+	{

+		global $wpdb;

+		if ($limit) {

+			$limit_q = " LIMIT $limit ";

+		} else {

+			$limit_q = '';

+		}

+		$not_featured = '';

+		$sub_dir = '';

+		if (!$add_featured)

+			$not_featured = " AND is_featured = 0 ";

+

+		$arrImages = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

+				array('%image%', $post_id)

+			)

+		);

+

+		$counter = 0;

+		$return_arr = array();

+

+		if (!empty($arrImages)) {

+			foreach ($arrImages as $attechment) {

+

+				$img_arr = array();

+				$img_arr['id'] = $attechment->ID;

+				$img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;

+

+				$file_info = pathinfo($attechment->file);

+

+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+					$sub_dir = stripslashes_deep($file_info['dirname']);

+

+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+				$uploads_baseurl = $uploads['baseurl'];

+				$uploads_path = $uploads['path'];

+

+				$file_name = $file_info['basename'];

+

+				$uploads_url = $uploads_baseurl . $sub_dir;

+				/*

                 * Allows the filter of image src for such things as CDN change.

                 *

                 * @since 1.5.7

@@ -1461,534 +1461,534 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

-                $width = 0;

-                $height = 0;

-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                    $imagesize = getimagesize($img_arr['path']);

-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

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

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

-

-                $img_arr['file'] = $file_name; // add the title to the array

-                $img_arr['title'] = $attechment->title; // add the title to the array

-                $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array

-                $img_arr['content'] = $attechment->content; // add the description to the array

-                $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

-

-                $return_arr[] = (object)$img_arr;

-

-                $counter++;

-            }

-            return (object)$return_arr;

-        } else if ($no_images) {

-            $default_img = '';

-            $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

-            $post_type = get_post_type($post_id);

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_images) {

-                $default_img = get_option('geodir_listing_no_img');

-            }

-

-            if (!empty($default_img)) {

-                $uploads = wp_upload_dir(); // Array of key => value pairs

+				$img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+				$img_arr['path'] = $uploads_path . '/' . $file_name;

+				$width = 0;

+				$height = 0;

+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+					$imagesize = getimagesize($img_arr['path']);

+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

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

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

+

+				$img_arr['file'] = $file_name; // add the title to the array

+				$img_arr['title'] = $attechment->title; // add the title to the array

+				$img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array

+				$img_arr['content'] = $attechment->content; // add the description to the array

+				$img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

+

+				$return_arr[] = (object)$img_arr;

+

+				$counter++;

+			}

+			return (object)$return_arr;

+		} else if ($no_images) {

+			$default_img = '';

+			$default_cat = geodir_get_post_meta($post_id, 'default_category', true);

+			$post_type = get_post_type($post_id);

+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

+				$default_img = $default_catimg['src'];

+			elseif ($no_images) {

+				$default_img = get_option('geodir_listing_no_img');

+			}

+

+			if (!empty($default_img)) {

+				$uploads = wp_upload_dir(); // Array of key => value pairs

                 

-                $image_path = $default_img;

-                if (!path_is_absolute($image_path)) {

-                    $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);

-                }

-

-                $file_info = pathinfo($default_img);

-                $file_name = $file_info['basename'];

-

-                $width = '';

-                $height = '';

-                if (is_file($image_path) && file_exists($image_path)) {

-                    $imagesize = getimagesize($image_path);

-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

+				$image_path = $default_img;

+				if (!path_is_absolute($image_path)) {

+					$image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);

+				}

+

+				$file_info = pathinfo($default_img);

+				$file_name = $file_info['basename'];

+

+				$width = '';

+				$height = '';

+				if (is_file($image_path) && file_exists($image_path)) {

+					$imagesize = getimagesize($image_path);

+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

                 

-                $img_arr = array();

-                $img_arr['src'] = $default_img;

-                $img_arr['path'] = $image_path;

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

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

-                $img_arr['file'] = $file_name; // add the title to the array

-                $img_arr['title'] = $file_info['filename']; // add the title to the array

-                $img_arr['content'] = $file_info['filename']; // add the description to the array

-

-                $return_arr[] = (object)$img_arr;

-

-                return $return_arr;

-            } else

-                return false;

-        }

-    }

+				$img_arr = array();

+				$img_arr['src'] = $default_img;

+				$img_arr['path'] = $image_path;

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

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

+				$img_arr['file'] = $file_name; // add the title to the array

+				$img_arr['title'] = $file_info['filename']; // add the title to the array

+				$img_arr['content'] = $file_info['filename']; // add the description to the array

+

+				$return_arr[] = (object)$img_arr;

+

+				return $return_arr;

+			} else

+				return false;

+		}

+	}

 }

 

 if (!function_exists('geodir_show_image')) {

-    /**

-     * Show image using image details.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array|object $request Image info either as an array or object.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

-     * @return bool|string Returns image html.

-     */

-    function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)

-    {

-        $image = new stdClass();

-

-        $html = '';

-        if (!empty($request)) {

-            if (!is_object($request)){

-                $request = (object)$request;

-            }

-

-            if (isset($request->src) && !isset($request->path)) {

-                $request->path = $request->src;

-            }

-

-            /*

+	/**

+	 * Show image using image details.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array|object $request Image info either as an array or object.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

+	 * @return bool|string Returns image html.

+	 */

+	function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)

+	{

+		$image = new stdClass();

+

+		$html = '';

+		if (!empty($request)) {

+			if (!is_object($request)){

+				$request = (object)$request;

+			}

+

+			if (isset($request->src) && !isset($request->path)) {

+				$request->path = $request->src;

+			}

+

+			/*

              * getimagesize() works faster from path than url so we try and get path if we can.

              */

-            $upload_dir = wp_upload_dir();

-            $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

-            $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

-            if (strpos($img_no_http, $upload_no_http) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

-            }

+			$upload_dir = wp_upload_dir();

+			$img_no_http = str_replace(array("http://", "https://"), "", $request->path);

+			$upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

+			if (strpos($img_no_http, $upload_no_http) !== false) {

+				$request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

+			}

             

-            $width = 0;

-            $height = 0;

-            if (is_file($request->path) && file_exists($request->path)) {

-                $imagesize = getimagesize($request->path);

-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-            }

-

-            $image->src = $request->src;

-            $image->width = $width;

-            $image->height = $height;

-

-            $max_size = (object)geodir_get_imagesize($size);

-

-            if (!is_wp_error($max_size)) {

-                if ($image->width) {

-                    if ($image->height >= $image->width) {

-                        $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

-                    } else if ($image->width < ($max_size->h)) {

-                        $width_per = round((($image->width / $max_size->w) * 100), 2);

-                    } else

-                        $width_per = 100;

-                }

-

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

-                } else {

-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

-                        //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                        //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

-

-                    }

-

-                }

-            }

-        }

-

-        if (!empty($html) && $echo) {

-            echo $html;

-        } elseif (!empty($html)) {

-            return $html;

-        } else

-            return false;

-    }

-}

+			$width = 0;

+			$height = 0;

+			if (is_file($request->path) && file_exists($request->path)) {

+				$imagesize = getimagesize($request->path);

+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+			}

 

-if (!function_exists('geodir_set_post_terms')) {

-    /**

-     * Set post Categories.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $post_id The post ID.

-     * @param array $terms An array of term objects.

-     * @param array $tt_ids An array of term taxonomy IDs.

-     * @param string $taxonomy Taxonomy slug.

-     */

-    function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)

-    {

-        global $wpdb, $plugin_prefix;

+			$image->src = $request->src;

+			$image->width = $width;

+			$image->height = $height;

 

-        $post_type = get_post_type($post_id);

+			$max_size = (object)geodir_get_imagesize($size);

 

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

+			if (!is_wp_error($max_size)) {

+				if ($image->width) {

+					if ($image->height >= $image->width) {

+						$width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

+					} else if ($image->width < ($max_size->h)) {

+						$width_per = round((($image->width / $max_size->w) * 100), 2);

+					} else

+						$width_per = 100;

+				}

+

+				if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

+					$html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

+				} else {

+					if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

+						$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

+					}else{

+						//$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

+						//$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

+						$html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

+

+					}

 

-        if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

+				}

+			}

+		}

+

+		if (!empty($html) && $echo) {

+			echo $html;

+		} elseif (!empty($html)) {

+			return $html;

+		} else

+			return false;

+	}

+}

 

-            if ($taxonomy == $post_type . '_tags') {

-                if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-                    geodir_save_post_meta($post_id, 'post_tags', $terms);

-                }

-            } elseif ($taxonomy == $post_type . 'category') {

-                $srcharr = array('"', '\\');

-                $replarr = array("&quot;", '');

+if (!function_exists('geodir_set_post_terms')) {

+	/**

+	 * Set post Categories.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $post_id The post ID.

+	 * @param array $terms An array of term objects.

+	 * @param array $tt_ids An array of term taxonomy IDs.

+	 * @param string $taxonomy Taxonomy slug.

+	 */

+	function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

+

+			if ($taxonomy == $post_type . '_tags') {

+				if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+					geodir_save_post_meta($post_id, 'post_tags', $terms);

+				}

+			} elseif ($taxonomy == $post_type . 'category') {

+				$srcharr = array('"', '\\');

+				$replarr = array("&quot;", '');

 

-                $post_obj = get_post($post_id);

+				$post_obj = get_post($post_id);

 

-                $cat_ids = array('0');

-                if (is_array($tt_ids))

-                    $cat_ids = $tt_ids;

+				$cat_ids = array('0');

+				if (is_array($tt_ids))

+					$cat_ids = $tt_ids;

 

 

-                if (!empty($cat_ids)) {

-                    $cat_ids_array = $cat_ids;

-                    $cat_ids_length = count($cat_ids_array);

-                    $cat_ids_format = array_fill(0, $cat_ids_length, '%d');

-                    $format = implode(',', $cat_ids_format);

+				if (!empty($cat_ids)) {

+					$cat_ids_array = $cat_ids;

+					$cat_ids_length = count($cat_ids_array);

+					$cat_ids_format = array_fill(0, $cat_ids_length, '%d');

+					$format = implode(',', $cat_ids_format);

 

-                    $cat_ids_array_del = $cat_ids_array;

-                    $cat_ids_array_del[] = $post_id;

+					$cat_ids_array_del = $cat_ids_array;

+					$cat_ids_array_del[] = $post_id;

 

-                    $wpdb->get_var(

-                        $wpdb->prepare(

-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

-                            $cat_ids_array_del

-                        )

-                    );

+					$wpdb->get_var(

+						$wpdb->prepare(

+							"DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

+							$cat_ids_array_del

+						)

+					);

 

 

-                    $post_term = $wpdb->get_col(

-                        $wpdb->prepare(

-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

-                            $cat_ids_array

-                        )

-                    );

+					$post_term = $wpdb->get_col(

+						$wpdb->prepare(

+							"SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

+							$cat_ids_array

+						)

+					);

 

-                }

+				}

 

-                $post_marker_json = '';

+				$post_marker_json = '';

 

-                if (!empty($post_term)):

+				if (!empty($post_term)):

 

-                    foreach ($post_term as $cat_id):

+					foreach ($post_term as $cat_id):

 

-                        $term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);

-                        $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';

+						$term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);

+						$term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';

 

-                        $post_title = $post_obj->title;

-                        $title = str_replace($srcharr, $replarr, $post_title);

+						$post_title = $post_obj->title;

+						$title = str_replace($srcharr, $replarr, $post_title);

 

-                        $lat = geodir_get_post_meta($post_id, 'post_latitude', true);

-                        $lng = geodir_get_post_meta($post_id, 'post_longitude', true);

+						$lat = geodir_get_post_meta($post_id, 'post_latitude', true);

+						$lng = geodir_get_post_meta($post_id, 'post_longitude', true);

 

-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

+						$timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

+						$timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

 

-                        $json = '{';

-                        $json .= '"id":"' . $post_id . '",';

-                        $json .= '"lat_pos": "' . $lat . '",';

-                        $json .= '"long_pos": "' . $lng . '",';

-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

-                        $json .= '"icon":"' . $term_icon . '",';

-                        $json .= '"group":"catgroup' . $cat_id . '"';

-                        $json .= '}';

+						$json = '{';

+						$json .= '"id":"' . $post_id . '",';

+						$json .= '"lat_pos": "' . $lat . '",';

+						$json .= '"long_pos": "' . $lng . '",';

+						$json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

+						$json .= '"icon":"' . $term_icon . '",';

+						$json .= '"group":"catgroup' . $cat_id . '"';

+						$json .= '}';

 

 

-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

-                            $post_marker_json = $json;

+						if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

+							$post_marker_json = $json;

 

 

-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

+						if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

 

-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

+							$json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

 										post_title = %s,

 										json = %s

 										WHERE post_id = %d AND cat_id = %d ",

-                                array($post_title, $json, $post_id, $cat_id));

+								array($post_title, $json, $post_id, $cat_id));

 

-                        } else {

+						} else {

 

-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

+							$json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

 										post_id = %d,

 										post_title = %s,

 										cat_id = %d,

 										json = %s",

-                                array($post_id, $post_title, $cat_id, $json));

+								array($post_id, $post_title, $cat_id, $json));

 

-                        }

+						}

 

-                        $wpdb->query($json_query);

+						$wpdb->query($json_query);

 

-                    endforeach;

+					endforeach;

 

-                endif;

+				endif;

 

-                if (!empty($post_term) && is_array($post_term)) {

-                    $categories = implode(',', $post_term);

+				if (!empty($post_term) && is_array($post_term)) {

+					$categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+					if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

 

-                    if (empty($post_marker_json))

-                        $post_marker_json = isset($json) ? $json : '';

+					if (empty($post_marker_json))

+						$post_marker_json = isset($json) ? $json : '';

 

-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+					if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-                        $wpdb->query(

-                            $wpdb->prepare(

-                                "UPDATE " . $table . " SET

+						$wpdb->query(

+							$wpdb->prepare(

+								"UPDATE " . $table . " SET

 								" . $taxonomy . " = %s,

 								marker_json = %s

 								where post_id = %d",

-                                array($categories, $post_marker_json, $post_id)

-                            )

-                        );

+								array($categories, $post_marker_json, $post_id)

+							)

+						);

 

-                        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {

+						if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {

 

-                            $categories = trim($categories, ',');

+							$categories = trim($categories, ',');

 

-                            if ($categories) {

+							if ($categories) {

 

-                                $categories = explode(',', $categories);

+								$categories = explode(',', $categories);

 

-                                $default_category = geodir_get_post_meta($post_id, 'default_category', true);

+								$default_category = geodir_get_post_meta($post_id, 'default_category', true);

 

-                                if (!in_array($default_category, $categories)) {

+								if (!in_array($default_category, $categories)) {

 

-                                    $wpdb->query(

-                                        $wpdb->prepare(

-                                            "UPDATE " . $table . " SET

+									$wpdb->query(

+										$wpdb->prepare(

+											"UPDATE " . $table . " SET

 											default_category = %s

 											where post_id = %d",

-                                            array($categories[0], $post_id)

-                                        )

-                                    );

+											array($categories[0], $post_id)

+										)

+									);

 

-                                    $default_category = $categories[0];

+									$default_category = $categories[0];

 

-                                }

+								}

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

+								if ($default_category == '')

+									$default_category = $categories[0];

 

-                                geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

+								geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

 

-                            }

+							}

 

-                        }

+						}

 

 

-                    } else {

+					} else {

 

-                        $wpdb->query(

-                            $wpdb->prepare(

-                                "INSERT INTO " . $table . " SET

+						$wpdb->query(

+							$wpdb->prepare(

+								"INSERT INTO " . $table . " SET

 								post_id = %d,

 								" . $taxonomy . " = %s,

 								marker_json = %s ",

 

-                                array($post_id, $categories, $post_marker_json)

-                            )

-                        );

-                    }

-                }

-            }

-        }

-    }

+								array($post_id, $categories, $post_marker_json)

+							)

+						);

+					}

+				}

+			}

+		}

+	}

 }

 

 if (!function_exists('geodir_get_infowindow_html')) {

-    /**

-     * Set post Map Marker info html.

-     *

-     * @since 1.0.0

-     * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".

-     * @package GeoDirectory

-     * @global array $geodir_addon_list List of active GeoDirectory extensions.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param object $postinfo_obj The post details object.

-     * @param string $post_preview Is this a post preview?.

-     * @return mixed|string|void

-     */

-    function geodir_get_infowindow_html($postinfo_obj, $post_preview = '')

-    {

-        global $preview, $gd_session;

-        $srcharr = array("'", "/", "-", '"', '\\');

-        $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

-

-        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

-            $ID = '';

-            $plink = '';

-

-            if (isset($postinfo_obj->pid)) {

-                $ID = $postinfo_obj->pid;

-                $plink = get_permalink($ID);

-            }

-

-            $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));

-            $lat = $postinfo_obj->post_latitude;

-            $lng = $postinfo_obj->post_longitude;

-            $address = str_replace($srcharr, $replarr, ($postinfo_obj->post_address));

-            $contact = str_replace($srcharr, $replarr, ($postinfo_obj->geodir_contact));

-            $timing = str_replace($srcharr, $replarr, ($postinfo_obj->geodir_timing));

-        } else {

-            $ID = $postinfo_obj->post_id;

-            $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan

-            $plink = get_permalink($ID);

-            $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));

-            $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));

-            $address = str_replace($srcharr, $replarr, htmlentities(geodir_get_post_meta($ID, 'post_address', true), ENT_COMPAT, 'UTF-8')); // fix by Stiofan

-            $contact = str_replace($srcharr, $replarr, htmlentities(geodir_get_post_meta($ID, 'geodir_contact', true), ENT_COMPAT, 'UTF-8'));

-            $timing = str_replace($srcharr, $replarr, (geodir_get_post_meta($ID, 'geodir_timing', true)));

-        }

-

-        // filter field as per price package

-        global $geodir_addon_list;

-        if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

-            $post_type = get_post_type($ID);

-            $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;

-            $field_name = 'geodir_contact';

-            if (!check_field_visibility($package_id, $field_name, $post_type)) {

-                $contact = '';

-            }

-

-            $field_name = 'geodir_timing';

-            if (!check_field_visibility($package_id, $field_name, $post_type)) {

-                $timing = '';

-            }

-        }

-

-        if ($lat && $lng) {

-            ob_start(); ?>

+	/**

+	 * Set post Map Marker info html.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".

+	 * @package GeoDirectory

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param object $postinfo_obj The post details object.

+	 * @param string $post_preview Is this a post preview?.

+	 * @return mixed|string|void

+	 */

+	function geodir_get_infowindow_html($postinfo_obj, $post_preview = '')

+	{

+		global $preview, $gd_session;

+		$srcharr = array("'", "/", "-", '"', '\\');

+		$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

+

+		if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

+			$ID = '';

+			$plink = '';

+

+			if (isset($postinfo_obj->pid)) {

+				$ID = $postinfo_obj->pid;

+				$plink = get_permalink($ID);

+			}

+

+			$title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));

+			$lat = $postinfo_obj->post_latitude;

+			$lng = $postinfo_obj->post_longitude;

+			$address = str_replace($srcharr, $replarr, ($postinfo_obj->post_address));

+			$contact = str_replace($srcharr, $replarr, ($postinfo_obj->geodir_contact));

+			$timing = str_replace($srcharr, $replarr, ($postinfo_obj->geodir_timing));

+		} else {

+			$ID = $postinfo_obj->post_id;

+			$title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan

+			$plink = get_permalink($ID);

+			$lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));

+			$lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));

+			$address = str_replace($srcharr, $replarr, htmlentities(geodir_get_post_meta($ID, 'post_address', true), ENT_COMPAT, 'UTF-8')); // fix by Stiofan

+			$contact = str_replace($srcharr, $replarr, htmlentities(geodir_get_post_meta($ID, 'geodir_contact', true), ENT_COMPAT, 'UTF-8'));

+			$timing = str_replace($srcharr, $replarr, (geodir_get_post_meta($ID, 'geodir_timing', true)));

+		}

+

+		// filter field as per price package

+		global $geodir_addon_list;

+		if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

+			$post_type = get_post_type($ID);

+			$package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;

+			$field_name = 'geodir_contact';

+			if (!check_field_visibility($package_id, $field_name, $post_type)) {

+				$contact = '';

+			}

+

+			$field_name = 'geodir_timing';

+			if (!check_field_visibility($package_id, $field_name, $post_type)) {

+				$timing = '';

+			}

+		}

+

+		if ($lat && $lng) {

+			ob_start(); ?>

             <div class="gd-bubble" style="">

                 <div class="gd-bubble-inside">

                     <?php

-                    $comment_count = '';

-                    $rating_star = '';

-                    if ($ID != '') {

-                        $rating_star = '';

-                        $comment_count = geodir_get_review_count_total($ID);

-

-                        if (!$preview) {

-                            $post_avgratings = geodir_get_post_rating($ID);

-

-                            $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);

-

-                            /**

-                             * Filter to change rating stars

-                             *

-                             * You can use this filter to change Rating stars.

-                             *

-                             * @since 1.0.0

-                             * @package GeoDirectory

-                             * @param string $rating_star Rating stars.

-                             * @param float $post_avgratings Average ratings of the post.

-                             * @param int $ID The post ID.

-                             */

-                            $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);

-                        }

-                    }

-                    ?>

+					$comment_count = '';

+					$rating_star = '';

+					if ($ID != '') {

+						$rating_star = '';

+						$comment_count = geodir_get_review_count_total($ID);

+

+						if (!$preview) {

+							$post_avgratings = geodir_get_post_rating($ID);

+

+							$rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);

+

+							/**

+							 * Filter to change rating stars

+							 *

+							 * You can use this filter to change Rating stars.

+							 *

+							 * @since 1.0.0

+							 * @package GeoDirectory

+							 * @param string $rating_star Rating stars.

+							 * @param float $post_avgratings Average ratings of the post.

+							 * @param int $ID The post ID.

+							 */

+							$rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);

+						}

+					}

+					?>

                     <div class="geodir-bubble_desc">

                         <h4>

                             <a href="<?php if ($plink != '') {

-                                echo $plink;

-                            } else {

-                                echo 'javascript:void(0);';

-                            } ?>"><?php echo $title; ?></a>

+								echo $plink;

+							} else {

+								echo 'javascript:void(0);';

+							} ?>"><?php echo $title; ?></a>

                         </h4>

                         <?php

-                        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

-                            $post_images = array();

-                            if (!empty($postinfo_obj->post_images)) {

-                                $post_images = explode(",", $postinfo_obj->post_images);

-                            }

-

-                            if (!empty($post_images)) {

-                                ?>

+						if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

+							$post_images = array();

+							if (!empty($postinfo_obj->post_images)) {

+								$post_images = explode(",", $postinfo_obj->post_images);

+							}

+

+							if (!empty($post_images)) {

+								?>

                                 <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {

-                                        echo $plink;

-                                    } else {

-                                        echo 'javascript:void(0);';

-                                    } ?>"><img alt="bubble image" style="max-height:50px;"

+										echo $plink;

+									} else {

+										echo 'javascript:void(0);';

+									} ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

-                                echo '<div class="geodir-bubble_image"></div>';

-                            }

-                        } else {

-                            if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {

-                                ?>

+							}else{

+								echo '<div class="geodir-bubble_image"></div>';

+							}

+						} else {

+							if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {

+								?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

-                                echo '<div class="geodir-bubble_image"></div>';

-                            }

-                        }

-                        ?>

+							}else{

+								echo '<div class="geodir-bubble_image"></div>';

+							}

+						}

+						?>

                         <div class="geodir-bubble-meta-side">

                             <?php

-                            /**

-                             * Fires before the meta info in the map info window.

-                             *

-                             * This can be used to add more info to the map info window before the normal meta info.

-                             *

-                             * @since 1.5.4

-                             * @param int $ID The post id.

-                             * @param object $postinfo_obj The posts info as an object.

-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

-                             */

-                            do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);

-                            ?>

+							/**

+							 * Fires before the meta info in the map info window.

+							 *

+							 * This can be used to add more info to the map info window before the normal meta info.

+							 *

+							 * @since 1.5.4

+							 * @param int $ID The post id.

+							 * @param object $postinfo_obj The posts info as an object.

+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

+							 */

+							do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);

+							?>

                             <span class="geodir_address"><i class="fa fa-home"></i> <?php echo $address; ?></span>

                             <?php if ($contact) { ?><span class="geodir_contact"><i

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

                                 <?php

-                                $tel_link = apply_filters('geodir_map_bubble_tel_linkable', false);

-                                if ($tel_link) {

-                                    ?>

+								$tel_link = apply_filters('geodir_map_bubble_tel_linkable', false);

+								if ($tel_link) {

+									?>

                                     <a href="tel:<?php echo preg_replace('/[^0-9+]/', '', $contact); ?>"><?php echo stripslashes($contact); ?></a>

                                     <?php

-                                } else {

-                                    echo $contact;

-                                }

-                                ?>

+								} else {

+									echo $contact;

+								}

+								?>

                                 </span><?php } ?>

                             <?php if ($timing) { ?><span class="geodir_timing"><i

                                 class="fa fa-clock-o"></i> <?php echo $timing; ?></span><?php }

 

-                            /**

-                             * Fires after the meta info in the map info window.

-                             *

-                             * This can be used to add more info to the map info window after the normal meta info.

-                             *

-                             * @since 1.4.2

-                             * @param object $postinfo_obj The posts info as an object.

-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

-                             */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

-                            ?>

+							/**

+							 * Fires after the meta info in the map info window.

+							 *

+							 * This can be used to add more info to the map info window after the normal meta info.

+							 *

+							 * @since 1.4.2

+							 * @param object $postinfo_obj The posts info as an object.

+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

+							 */

+							do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+							?>

                         </div>

                         <?php

 

-                        if ($ID) {

+						if ($ID) {

 

-                            $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);

-                            ?>

+							$post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);

+							?>

                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

@@ -2008,69 +2008,69 @@ 
                 </div>

             </div>

             <?php

-            $html = ob_get_clean();

-            /**

-             * Filter to change infowindow html

-             *

-             * You can use this filter to change infowindow html.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param string $html Infowindow html.

-             * @param object $postinfo_obj The Post object.

-             * @param bool|string $post_preview Is this a post preview?

-             */

-            $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);

-            return $html;

-        }

-    }

+			$html = ob_get_clean();

+			/**

+			 * Filter to change infowindow html

+			 *

+			 * You can use this filter to change infowindow html.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param string $html Infowindow html.

+			 * @param object $postinfo_obj The Post object.

+			 * @param bool|string $post_preview Is this a post preview?

+			 */

+			$html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);

+			return $html;

+		}

+	}

 }

 

 

 if (!function_exists('geodir_new_post_default_status')) {

-    /**

-     * Default post status for new posts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Returns the default post status for new posts. Ex: draft, publish etc.

-     */

-    function geodir_new_post_default_status()

-    {

-        if (get_option('geodir_new_post_default_status'))

-            return get_option('geodir_new_post_default_status');

-        else

-            return 'publish';

-

-    }

+	/**

+	 * Default post status for new posts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Returns the default post status for new posts. Ex: draft, publish etc.

+	 */

+	function geodir_new_post_default_status()

+	{

+		if (get_option('geodir_new_post_default_status'))

+			return get_option('geodir_new_post_default_status');

+		else

+			return 'publish';

+

+	}

 }

 

 if (!function_exists('geodir_change_post_status')) {

-    /**

-     * Change post status of a post.

-     *

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int|string $post_id The post ID.

-     * @param string $status New post status. Ex: draft, publish etc.

-     */

-    function geodir_change_post_status($post_id = '', $status = '')

-    {

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

-                array($status, $post_id)

-            )

-        );

-

-

-    }

+	/**

+	 * Change post status of a post.

+	 *

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int|string $post_id The post ID.

+	 * @param string $status New post status. Ex: draft, publish etc.

+	 */

+	function geodir_change_post_status($post_id = '', $status = '')

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

+				array($status, $post_id)

+			)

+		);

+

+

+	}

 }

 

 /**

@@ -2084,13 +2084,13 @@ 
  */

 function geodir_set_post_status($pid, $status)

 {

-    if ($pid) {

-        global $wpdb;

-        $my_post = array();

-        $my_post['post_status'] = $status;

-        $my_post['ID'] = $pid;

-        $last_postid = wp_update_post($my_post);

-    }

+	if ($pid) {

+		global $wpdb;

+		$my_post = array();

+		$my_post['post_status'] = $status;

+		$my_post['ID'] = $pid;

+		$last_postid = wp_update_post($my_post);

+	}

 }

 

 

@@ -2106,384 +2106,384 @@ 
  */

 function geodir_update_poststatus($new_status, $old_status, $post)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {

+	if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {

 

-        geodir_change_post_status($post->ID, $new_status);

-    }

+		geodir_change_post_status($post->ID, $new_status);

+	}

 }

 

 

 if (!function_exists('geodir_update_listing_info')) {

-    /**

-     * Update post info.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $updatingpost The updating post ID.

-     * @param int $temppost The temporary post ID.

-     * @todo fix post_id variable

-     */

-    function geodir_update_listing_info($updatingpost, $temppost)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-        /* Update Attachments*/

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-    }

+	/**

+	 * Update post info.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $updatingpost The updating post ID.

+	 * @param int $temppost The temporary post ID.

+	 * @todo fix post_id variable

+	 */

+	function geodir_update_listing_info($updatingpost, $temppost)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+		/* Update Attachments*/

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+	}

 }

 

 

 if (!function_exists('geodir_delete_listing_info')) {

-    /**

-     * Delete Listing info from details table for the given post id.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param int $deleted_postid The post ID.

-     * @param bool $force Optional. Do you want to force delete it? Default: false.

-     * @return bool|void

-     */

-    function geodir_delete_listing_info($deleted_postid, $force = false)

-    {

-        global $wpdb, $plugin_prefix;

-

-        // check for multisite deletions

-        if (strpos($plugin_prefix, $wpdb->prefix) !== false) {

-        } else {

-            return;

-        }

-

-        $post_type = get_post_type($deleted_postid);

-

-        $all_postypes = geodir_get_posttypes();

-

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

-            return false;

-

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

-

-        /* Delete custom post meta*/

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . $table . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-

-        /* Delete post map icons*/

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-

-        /* Delete Attachments*/

-        $postcurr_images = geodir_get_images($deleted_postid);

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-        geodir_remove_attachments($postcurr_images);

-

-    }

+	/**

+	 * Delete Listing info from details table for the given post id.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param int $deleted_postid The post ID.

+	 * @param bool $force Optional. Do you want to force delete it? Default: false.

+	 * @return bool|void

+	 */

+	function geodir_delete_listing_info($deleted_postid, $force = false)

+	{

+		global $wpdb, $plugin_prefix;

+

+		// check for multisite deletions

+		if (strpos($plugin_prefix, $wpdb->prefix) !== false) {

+		} else {

+			return;

+		}

+

+		$post_type = get_post_type($deleted_postid);

+

+		$all_postypes = geodir_get_posttypes();

+

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

+			return false;

+

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

+

+		/* Delete custom post meta*/

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . $table . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+

+		/* Delete post map icons*/

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+

+		/* Delete Attachments*/

+		$postcurr_images = geodir_get_images($deleted_postid);

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+		geodir_remove_attachments($postcurr_images);

+

+	}

 }

 

 

 if (!function_exists('geodir_add_to_favorite')) {

-    /**

-     * This function would add listing to favorite listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     */

-    function geodir_add_to_favorite($post_id)

-    {

-

-        global $current_user;

-

-        /**

-         * Filter to modify "Unfavorite" text

-         *

-         * You can use this filter to rename "Unfavorite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Remove from Favorites" text

-         *

-         * You can use this filter to rename "Remove from Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        $user_meta_data = array();

-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+	/**

+	 * This function would add listing to favorite listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_add_to_favorite($post_id)

+	{

+

+		global $current_user;

+

+		/**

+		 * Filter to modify "Unfavorite" text

+		 *

+		 * You can use this filter to rename "Unfavorite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Remove from Favorites" text

+		 *

+		 * You can use this filter to rename "Remove from Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		$user_meta_data = array();

+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {

+			$user_meta_data[] = $post_id;

+		}

+

+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

+

+		/**

+		 * Called before adding the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_before_add_from_favorite', $post_id);

+

+		echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-addtofav geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+

+		/**

+		 * Called after adding the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_after_add_from_favorite', $post_id);

 

-        if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {

-            $user_meta_data[] = $post_id;

-        }

-

-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

-

-        /**

-         * Called before adding the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_before_add_from_favorite', $post_id);

-

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-addtofav geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

-

-        /**

-         * Called after adding the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_after_add_from_favorite', $post_id);

-

-    }

+	}

 }

 

 if (!function_exists('geodir_remove_from_favorite')) {

-    /**

-     * This function would remove the favourited property earlier.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     */

-    function geodir_remove_from_favorite($post_id)

-    {

-        global $current_user;

-

-        /**

-         * Filter to modify "Add to Favorites" text

-         *

-         * You can use this filter to rename "Add to Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Favourite" text

-         *

-         * You can use this filter to rename "Favourite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        $user_meta_data = array();

-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (!empty($user_meta_data)) {

-

-            if (($key = array_search($post_id, $user_meta_data)) !== false) {

-                unset($user_meta_data[$key]);

-            }

+	/**

+	 * This function would remove the favourited property earlier.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_remove_from_favorite($post_id)

+	{

+		global $current_user;

+

+		/**

+		 * Filter to modify "Add to Favorites" text

+		 *

+		 * You can use this filter to rename "Add to Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Favourite" text

+		 *

+		 * You can use this filter to rename "Favourite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		$user_meta_data = array();

+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (!empty($user_meta_data)) {

+

+			if (($key = array_search($post_id, $user_meta_data)) !== false) {

+				unset($user_meta_data[$key]);

+			}

 

-        }

+		}

 

-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

 

-        /**

-         * Called before removing the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_before_remove_from_favorite', $post_id);

+		/**

+		 * Called before removing the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_before_remove_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+		echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

 

-        /**

-         * Called after removing the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_after_remove_from_favorite', $post_id);

+		/**

+		 * Called after removing the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_after_remove_from_favorite', $post_id);

 

-    }

+	}

 }

 

 if (!function_exists('geodir_favourite_html')) {

-    /**

-     * This function would display the html content for add to favorite or remove from favorite.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

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

-     * @param int $user_id The user ID.

-     * @param int $post_id The post ID.

-     */

-    function geodir_favourite_html($user_id, $post_id)

-    {

-

-        global $current_user, $post;

-

-        /**

-         * Filter to modify "Add to Favorites" text

-         *

-         * You can use this filter to rename "Add to Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Favourite" text

-         *

-         * You can use this filter to rename "Favourite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Unfavorite" text

-         *

-         * You can use this filter to rename "Unfavorite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Remove from Favorites" text

-         *

-         * You can use this filter to rename "Remove from Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        /**

-         * Filter to modify "fa fa-heart" icon for "remove from favorites" link

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

-

-        $user_meta_data = '';

-        if (isset($current_user->data->ID))

-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+	/**

+	 * This function would display the html content for add to favorite or remove from favorite.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

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

+	 * @param int $user_id The user ID.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_favourite_html($user_id, $post_id)

+	{

+

+		global $current_user, $post;

+

+		/**

+		 * Filter to modify "Add to Favorites" text

+		 *

+		 * You can use this filter to rename "Add to Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Favourite" text

+		 *

+		 * You can use this filter to rename "Favourite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Unfavorite" text

+		 *

+		 * You can use this filter to rename "Unfavorite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Remove from Favorites" text

+		 *

+		 * You can use this filter to rename "Remove from Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		/**

+		 * Filter to modify "fa fa-heart" icon for "remove from favorites" link

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

+

+		$user_meta_data = '';

+		if (isset($current_user->data->ID))

+			$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

                 onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

                 title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

             </a>   </span><?php

 

-        } else {

+		} else {

 

-            if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

-            } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+			if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

+				$script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

+			} else

+				$script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

                                                                                         onclick="<?php echo $script_text;?>"

                                                                                         title="<?php echo $add_favourite_text;?>"><i

                     class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

         <?php }

-    }

+	}

 }

 

 

@@ -2500,54 +2500,54 @@ 
 function geodir_get_cat_postcount($term = array())

 {

 

-    if (!empty($term)) {

+	if (!empty($term)) {

 

-        global $wpdb, $plugin_prefix;

+		global $wpdb, $plugin_prefix;

 

-        $where = '';

-        $join = '';

-        if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {

-            $taxonomy_obj = get_taxonomy($term->taxonomy);

+		$where = '';

+		$join = '';

+		if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {

+			$taxonomy_obj = get_taxonomy($term->taxonomy);

 

-            $post_type = $taxonomy_obj->object_type[0];

+			$post_type = $taxonomy_obj->object_type[0];

 

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

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

 

-            /**

-             * Filter to modify the 'join' query

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object|array $term category / term object that need to be processed.

-             * @param string $join The join query.

-             */

-            $join = apply_filters('geodir_cat_post_count_join', $join, $term);

+			/**

+			 * Filter to modify the 'join' query

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object|array $term category / term object that need to be processed.

+			 * @param string $join The join query.

+			 */

+			$join = apply_filters('geodir_cat_post_count_join', $join, $term);

 

-            /**

-             * Filter to modify the 'where' query

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object|array $term category / term object that need to be processed.

-             * @param string $where The where query.

-             */

-            $where = apply_filters('geodir_cat_post_count_where', $where, $term);

+			/**

+			 * Filter to modify the 'where' query

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object|array $term category / term object that need to be processed.

+			 * @param string $where The where query.

+			 */

+			$where = apply_filters('geodir_cat_post_count_where', $where, $term);

 

-            $count_query = "SELECT count(post_id) FROM

+			$count_query = "SELECT count(post_id) FROM

 							" . $table . " as pd " . $join . "

 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

 

-            $cat_post_count = $wpdb->get_var($count_query);

-            if (empty($cat_post_count) || is_wp_error($cat_post_count))

-                $cat_post_count = 0;

+			$cat_post_count = $wpdb->get_var($count_query);

+			if (empty($cat_post_count) || is_wp_error($cat_post_count))

+				$cat_post_count = 0;

 

-            return $cat_post_count;

+			return $cat_post_count;

 

-        } else

+		} else

 

-            return $term->count;

-    }

-    return false;

+			return $term->count;

+	}

+	return false;

 

 }

 

@@ -2560,17 +2560,17 @@ 
  */

 function geodir_allow_post_type_frontend()

 {

-    $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+	$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

 

-    if (!is_admin() && isset($_REQUEST['listing_type'])

-        && !empty($geodir_allow_posttype_frontend)

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

-    ) {

+	if (!is_admin() && isset($_REQUEST['listing_type'])

+		&& !empty($geodir_allow_posttype_frontend)

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

+	) {

 

-        wp_redirect(home_url());

-        exit;

+		wp_redirect(home_url());

+		exit;

 

-    }

+	}

 

 }

 

@@ -2587,20 +2587,20 @@ 
  */

 function geodir_excerpt_length($length)

 {

-    global $wp_query, $geodir_is_widget_listing;

+	global $wp_query, $geodir_is_widget_listing;

 	if ($geodir_is_widget_listing) {

 		return $length;

 	}

 	

-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

-        $length = get_option('geodir_desc_word_limit');

-    elseif (get_query_var('excerpt_length'))

-        $length = get_query_var('excerpt_length');

+	if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

+		$length = get_option('geodir_desc_word_limit');

+	elseif (get_query_var('excerpt_length'))

+		$length = get_query_var('excerpt_length');

 

-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

-        $length = get_option('geodir_author_desc_word_limit');

+	if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

+		$length = get_option('geodir_author_desc_word_limit');

 

-    return $length;

+	return $length;

 }

 

 /**

@@ -2615,13 +2615,13 @@ 
  */

 function geodir_excerpt_more($more)

 {

-    global $post;

-    $all_postypes = geodir_get_posttypes();

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

-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

-    }

+	global $post;

+	$all_postypes = geodir_get_posttypes();

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

+		return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

+	}

 

-    return $more;

+	return $more;

 }

 

 

@@ -2638,63 +2638,63 @@ 
  */

 function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy)

 {

-    global $plugin_prefix, $wpdb;

+	global $plugin_prefix, $wpdb;

 

-    $gd_taxonomies = geodir_get_taxonomies();

+	$gd_taxonomies = geodir_get_taxonomies();

 

-    if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

+	if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

 

-        $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+		$geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

+		$table = $plugin_prefix . $geodir_post_type . '_detail';

 

-        $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

+		$path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

+		$term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

 

-        $posts = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

-                array($term_id, $taxonomy)

-            )

-        );

+		$posts = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

+				array($term_id, $taxonomy)

+			)

+		);

 

-        if (!empty($posts)):

-            foreach ($posts as $post_obj) {

+		if (!empty($posts)):

+			foreach ($posts as $post_obj) {

 

-                $lat = $post_obj->post_latitude;

-                $lng = $post_obj->post_longitude;

+				$lat = $post_obj->post_latitude;

+				$lng = $post_obj->post_longitude;

 

-                $json = '{';

-                $json .= '"id":"' . $post_obj->post_id . '",';

-                $json .= '"lat_pos": "' . $lat . '",';

-                $json .= '"long_pos": "' . $lng . '",';

-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

-                $json .= '"icon":"' . $term_icon . '",';

-                $json .= '"group":"catgroup' . $term_id . '"';

-                $json .= '}';

+				$json = '{';

+				$json .= '"id":"' . $post_obj->post_id . '",';

+				$json .= '"lat_pos": "' . $lat . '",';

+				$json .= '"long_pos": "' . $lng . '",';

+				$json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

+				$json .= '"icon":"' . $term_icon . '",';

+				$json .= '"group":"catgroup' . $term_id . '"';

+				$json .= '}';

 

-                if ($post_obj->default_category == $term_id) {

+				if ($post_obj->default_category == $term_id) {

 

-                    $wpdb->query(

-                        $wpdb->prepare(

-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",

-                            array($json, $post_obj->post_id)

-                        )

-                    );

-                }

+					$wpdb->query(

+						$wpdb->prepare(

+							"UPDATE " . $table . " SET marker_json = %s where post_id = %d",

+							array($json, $post_obj->post_id)

+						)

+					);

+				}

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

-                        array($json, $post_obj->post_id, $term_id)

-                    )

-                );

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

+						array($json, $post_obj->post_id, $term_id)

+					)

+				);

 

-            }

+			}

 

 

-        endif;

+		endif;

 

-    }

+	}

 

 }

 

@@ -2708,14 +2708,14 @@ 
  */

 function geodir_get_listing_author($listing_id = '')

 {

-    if ($listing_id == '') {

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

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

-        }

-    }

-    $listing = get_post(strip_tags($listing_id));

-    $listing_author_id = $listing->post_author;

-    return $listing_author_id;

+	if ($listing_id == '') {

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

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

+		}

+	}

+	$listing = get_post(strip_tags($listing_id));

+	$listing_author_id = $listing->post_author;

+	return $listing_author_id;

 }

 

 

@@ -2730,11 +2730,11 @@ 
  */

 function geodir_lisiting_belong_to_user($listing_id, $user_id)

 {

-    $listing_author_id = geodir_get_listing_author($listing_id);

-    if ($listing_author_id == $user_id)

-        return true;

-    else

-        return false;

+	$listing_author_id = geodir_get_listing_author($listing_id);

+	if ($listing_author_id == $user_id)

+		return true;

+	else

+		return false;

 

 }

 

@@ -2750,17 +2750,17 @@ 
  */

 function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true)

 {

-    global $current_user;

-    if ($exclude_admin) {

-        foreach ($current_user->caps as $key => $caps) {

-            if (geodir_strtolower($key) == 'administrator') {

-                return true;

-                break;

-            }

-        }

-    }

-

-    return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);

+	global $current_user;

+	if ($exclude_admin) {

+		foreach ($current_user->caps as $key => $caps) {

+			if (geodir_strtolower($key) == 'administrator') {

+				return true;

+				break;

+			}

+		}

+	}

+

+	return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);

 }

 

 

@@ -2776,17 +2776,17 @@ 
 function geodir_only_supportable_attachments_remove($file)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $matches = array();

+	$matches = array();

 

-    $pattern = '/-\d+x\d+\./';

-    preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

+	$pattern = '/-\d+x\d+\./';

+	preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

 

-    if (empty($matches))

-        return '';

-    else

-        return $file;

+	if (empty($matches))

+		return '';

+	else

+		return $file;

 

 }

 

@@ -2803,78 +2803,78 @@ 
 function geodir_set_wp_featured_image($post_id)

 {

 

-    global $wpdb, $plugin_prefix;

-    $uploads = wp_upload_dir();

+	global $wpdb, $plugin_prefix;

+	$uploads = wp_upload_dir();

 //	print_r($uploads ) ;

-    $post_first_image = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

-        )

-    );

+	$post_first_image = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

+		)

+	);

 

-    $old_attachment_name = '';

-    $post_thumbnail_id = '';

-    if (has_post_thumbnail($post_id)) {

+	$old_attachment_name = '';

+	$post_thumbnail_id = '';

+	if (has_post_thumbnail($post_id)) {

 

-        if (has_post_thumbnail($post_id)) {

+		if (has_post_thumbnail($post_id)) {

 

-            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+			$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-            $old_attachment_name = basename(get_attached_file($post_thumbnail_id));

+			$old_attachment_name = basename(get_attached_file($post_thumbnail_id));

 

-        }

-    }

-

-    if (!empty($post_first_image)) {

+		}

+	}

 

-        $post_type = get_post_type($post_id);

+	if (!empty($post_first_image)) {

 

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

+		$post_type = get_post_type($post_id);

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

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

 

-        $new_attachment_name = basename($post_first_image[0]->file);

+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

 

-        if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {

+		$new_attachment_name = basename($post_first_image[0]->file);

 

-            if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {

+		if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {

 

-                add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');

+			if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {

 

-                wp_delete_attachment($post_thumbnail_id);

+				add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');

 

-            }

-            $filename = $uploads['basedir'] . $post_first_image[0]->file;

+				wp_delete_attachment($post_thumbnail_id);

 

-            $attachment = array(

-                'post_mime_type' => $post_first_image[0]->mime_type,

-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

-                'post_parent' => $post_id,

-                'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

-                'post_content' => ''

-            );

+			}

+			$filename = $uploads['basedir'] . $post_first_image[0]->file;

+

+			$attachment = array(

+				'post_mime_type' => $post_first_image[0]->mime_type,

+				'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

+				'post_parent' => $post_id,

+				'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

+				'post_content' => ''

+			);

 

 

-            $id = wp_insert_attachment($attachment, $filename, $post_id);

+			$id = wp_insert_attachment($attachment, $filename, $post_id);

 

-            if (!is_wp_error($id)) {

+			if (!is_wp_error($id)) {

 

-                set_post_thumbnail($post_id, $id);

+				set_post_thumbnail($post_id, $id);

 

-                require_once(ABSPATH . 'wp-admin/includes/image.php');

-                wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

+				require_once(ABSPATH . 'wp-admin/includes/image.php');

+				wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

 

-            }

+			}

 

-        }

+		}

 

-    } else {

-        //set_post_thumbnail($post_id,-1);

+	} else {

+		//set_post_thumbnail($post_id,-1);

 

-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

-            wp_delete_attachment($post_thumbnail_id);

+		if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

+			wp_delete_attachment($post_thumbnail_id);

 

-    }

+	}

 }

 

 

@@ -2889,53 +2889,53 @@ 
  */

 function gd_copy_original_translation()

 {

-    if (function_exists('icl_object_id')) {

-        global $wpdb, $table_prefix, $plugin_prefix;

-        $post_id = absint($_POST['post_id']);

-        $upload_dir = wp_upload_dir();

-        $post_type = get_post_type($_POST['post_id']);

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

-

-        $post_arr = $wpdb->get_results($wpdb->prepare(

-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

-            array($post_id)

-        )

-            , ARRAY_A);

-

-        $arrImages = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

-                array('%image%', $post_id)

-            )

-        );

-        if ($arrImages) {

-            $image_arr = array();

-            foreach ($arrImages as $img) {

-                $image_arr[] = $upload_dir['baseurl'] . $img->file;

-            }

-            $comma_separated = implode(",", $image_arr);

-            $post_arr[0]['post_images'] = $comma_separated;

-        }

-

-

-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

-        $cat_arr = array_filter(explode(",", $cats));

-        $trans_cat = array();

-        foreach ($cat_arr as $cat) {

-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

-        }

-

-

-        $post_arr[0]['categories'] = array_filter($trans_cat);

+	if (function_exists('icl_object_id')) {

+		global $wpdb, $table_prefix, $plugin_prefix;

+		$post_id = absint($_POST['post_id']);

+		$upload_dir = wp_upload_dir();

+		$post_type = get_post_type($_POST['post_id']);

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

+

+		$post_arr = $wpdb->get_results($wpdb->prepare(

+			"SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

+			array($post_id)

+		)

+			, ARRAY_A);

+

+		$arrImages = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

+				array('%image%', $post_id)

+			)

+		);

+		if ($arrImages) {

+			$image_arr = array();

+			foreach ($arrImages as $img) {

+				$image_arr[] = $upload_dir['baseurl'] . $img->file;

+			}

+			$comma_separated = implode(",", $image_arr);

+			$post_arr[0]['post_images'] = $comma_separated;

+		}

+

+

+		$cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

+		$cat_arr = array_filter(explode(",", $cats));

+		$trans_cat = array();

+		foreach ($cat_arr as $cat) {

+			$trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

+		}

+

+

+		$post_arr[0]['categories'] = array_filter($trans_cat);

 //print_r($image_arr);

-        //print_r($arrImages);

-        //echo $_REQUEST['lang'];

+		//print_r($arrImages);

+		//echo $_REQUEST['lang'];

 //print_r($post_arr);

 //print_r($trans_cat);

-        echo json_encode($post_arr[0]);

+		echo json_encode($post_arr[0]);

 

-    }

-    die();

+	}

+	die();

 }

 

 

@@ -2955,54 +2955,54 @@ 
 function geodir_get_custom_fields_type($listing_type = '')

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

+	if ($listing_type == '')

+		$listing_type = 'gd_place';

 

-    $fields_info = array();

+	$fields_info = array();

 

-    $get_data = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

-            array($listing_type)

-        )

-    );

+	$get_data = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

+			array($listing_type)

+		)

+	);

 

-    if (!empty($get_data)) {

+	if (!empty($get_data)) {

 

-        foreach ($get_data as $data) {

+		foreach ($get_data as $data) {

 

-            if ($data->field_type == 'address') {

+			if ($data->field_type == 'address') {

 

-                $extra_fields = unserialize($data->extra_fields);

+				$extra_fields = unserialize($data->extra_fields);

 

-                $prefix = $data->htmlvar_name . '_';

+				$prefix = $data->htmlvar_name . '_';

 

-                $fields_info[$prefix . 'address'] = $data->field_type;

+				$fields_info[$prefix . 'address'] = $data->field_type;

 

-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

+					$fields_info[$prefix . 'zip'] = $data->field_type;

 

-            } else {

+			} else {

 

-                $fields_info[$data->htmlvar_name] = $data->field_type;

+				$fields_info[$data->htmlvar_name] = $data->field_type;

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

-    /**

-     * Filter to modify custom fields info using listing post type.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return array $fields_info Custom fields info.

-     * @param string $listing_type The listing post type.

-     */

-    return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);

+	/**

+	 * Filter to modify custom fields info using listing post type.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return array $fields_info Custom fields info.

+	 * @param string $listing_type The listing post type.

+	 */

+	return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);

 }

 

 

@@ -3017,58 +3017,58 @@ 
  */

 function geodir_function_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {

-        // send notification to client when post moves from draft to publish

-        if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {

-            $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;

-            $post_author_data = get_userdata($post_author_id);

+	if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {

+		// send notification to client when post moves from draft to publish

+		if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {

+			$post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;

+			$post_author_data = get_userdata($post_author_id);

 

-            $to_name = geodir_get_client_name($post_author_id);

+			$to_name = geodir_get_client_name($post_author_id);

 

-            $from_email = geodir_get_site_email_id();

-            $from_name = get_site_emailName();

-            $to_email = $post_author_data->user_email;

+			$from_email = geodir_get_site_email_id();

+			$from_name = get_site_emailName();

+			$to_email = $post_author_data->user_email;

 

-            if (!is_email($to_email) && !empty($post_author_data->user_email)) {

-                $to_email = $post_author_data->user_email;

-            }

+			if (!is_email($to_email) && !empty($post_author_data->user_email)) {

+				$to_email = $post_author_data->user_email;

+			}

 

-            $message_type = 'listing_published';

+			$message_type = 'listing_published';

 

-            if (get_option('geodir_post_published_email_subject') == '') {

-                update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));

-            }

+			if (get_option('geodir_post_published_email_subject') == '') {

+				update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));

+			}

 

-            if (get_option('geodir_post_published_email_content') == '') {

-                update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));

-            }

+			if (get_option('geodir_post_published_email_content') == '') {

+				update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));

+			}

 

-            /**

-             * Called before sending the email when listing gets published.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object $post_after The post object after update.

-             * @param object $post_before The post object before update.

-             */

-            do_action('geodir_before_listing_published_email', $post_after, $post_before);

-            if (is_email($to_email)) {

-                geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

-            }

+			/**

+			 * Called before sending the email when listing gets published.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object $post_after The post object after update.

+			 * @param object $post_before The post object before update.

+			 */

+			do_action('geodir_before_listing_published_email', $post_after, $post_before);

+			if (is_email($to_email)) {

+				geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

+			}

 

-            /**

-             * Called after sending the email when listing gets published.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object $post_after The post object after update.

-             * @param object $post_before The post object before update.

-             */

-            do_action('geodir_after_listing_published_email', $post_after, $post_before);

-        }

-    }

+			/**

+			 * Called after sending the email when listing gets published.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object $post_after The post object after update.

+			 * @param object $post_before The post object before update.

+			 */

+			do_action('geodir_after_listing_published_email', $post_after, $post_before);

+		}

+	}

 }

 

 add_action('wp_head', 'geodir_fb_like_thumbnail');

@@ -3082,14 +3082,14 @@ 
  */

 function geodir_fb_like_thumbnail(){

 

-    // return if not a single post

-    if(!is_single()){return;}

+	// return if not a single post

+	if(!is_single()){return;}

 

-    global $post;

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

-        $upload_dir = wp_upload_dir();

-        $thumb = $upload_dir['baseurl'].$post->featured_image;

-        echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

+	global $post;

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

+		$upload_dir = wp_upload_dir();

+		$thumb = $upload_dir['baseurl'].$post->featured_image;

+		echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

 

-    }

+	}

 }
\ No newline at end of file

geodirectory-admin/option-pages/create_field.php

Braces +12 added lines, -8 removed lines

@@ -35,23 +35,26 @@ 
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {
@@ -77,8 +80,9 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {

Indentation +65 added lines, -65 removed lines

@@ -15,100 +15,100 @@
 
 $field_ids = array();
 if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) {
-    foreach ($_REQUEST['licontainer'] as $lic_id) {
-        $field_ids[] = sanitize_text_field($lic_id);
-    }
+	foreach ($_REQUEST['licontainer'] as $lic_id) {
+		$field_ids[] = sanitize_text_field($lic_id);
+	}
 }
 
 /* ------- check nonce field ------- */
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    echo godir_set_field_order($field_ids);
+	echo godir_set_field_order($field_ids);
 }
 
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    $response = godir_set_sort_field_order($field_ids);
-    if (is_array($response)) {
-        wp_send_json($response);
-    } else {
-        echo $response;
-    }
+	$response = godir_set_sort_field_order($field_ids);
+	if (is_array($response)) {
+		wp_send_json($response);
+	} else {
+		echo $response;
+	}
 }
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action);
+	geodir_custom_field_adminhtml($field_type, $field_id, $field_action);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action);
+	geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_field_delete($field_id);
+	echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_sort_field_delete($field_id);
+	echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit');
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		geodir_custom_field_adminhtml($field_type, $lastid, 'submit');
+	} else {
+		echo $return;
+	}
 }
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_sort_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        $default = false;
-        geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_sort_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		$default = false;
+		geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
+	} else {
+		echo $return;
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -45,14 +45,14 @@ 
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_sort_field_delete($field_id);
@@ -60,7 +60,7 @@ 
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {
@@ -87,7 +87,7 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {