GeoDirectory / geodirectory

geodirectory-functions/map-functions/map_template_tags.php

Braces +8 added lines, -6 removed lines

@@ -223,10 +223,11 @@ 
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

                 <?php }

 

-                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

+                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters']) {
+                                    $show_entire_cat_panel = "none";
+                } else {
+                                    $show_entire_cat_panel = "''";
+                }
                 ?>

 

                 <?php if ($geodir_map_options['enable_map_direction']) { ?>

@@ -288,8 +289,9 @@ 
 				}

 				

 				$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-				if (empty($geodir_default_map_search_pt))

-					$geodir_default_map_search_pt = 'gd_place';

+				if (empty($geodir_default_map_search_pt)) {
+									$geodir_default_map_search_pt = 'gd_place';
+				}
 

 				/**

 				 * Filter the post type to retrive data for map

Indentation +58 added lines, -58 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * All map related templates used by the plugin

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * All map related templates used by the plugin

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

  

 /**

  * Contains all map related functions.

@@ -138,33 +138,33 @@ 
     }

 

     /**

-	 * Filter the options to use in google map.

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param array $geodir_map_options {@see geodir_draw_map()} docblock.

-	 */

-	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

+     * Filter the options to use in google map.

+     *

+     * @since 1.0.0

+     *

+     * @param array $geodir_map_options {@see geodir_draw_map()} docblock.

+     */

+    $geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

 

     $map_canvas_arr[$map_canvas_name] = array();

 

     /**

-	 * Filter the post types to display data on map.

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param object $object Objects of post types.

-	 */

-	$post_types = apply_filters("geodir_map_post_type_list_{$map_canvas_name}", geodir_get_posttypes('object'));

+     * Filter the post types to display data on map.

+     *

+     * @since 1.0.0

+     *

+     * @param object $object Objects of post types.

+     */

+    $post_types = apply_filters("geodir_map_post_type_list_{$map_canvas_name}", geodir_get_posttypes('object'));

     

-	/**

-	 * Filter the post types to exclude to display data on map.

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param array Array of post types to exclude to display data on map.

-	 */

-	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

+    /**

+     * Filter the post types to exclude to display data on map.

+     *

+     * @since 1.0.0

+     *

+     * @param array Array of post types to exclude to display data on map.

+     */

+    $exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

     if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

         // Set default map options

@@ -180,13 +180,13 @@ 
         }

 

         /**

-		 * Filter the width of map.

-		 *

-		 * @since 1.0.0

-		 *

-		 * @param int $map_width Width of map box, eg: gd_place.

-		 */

-		$map_width = apply_filters('geodir_change_map_width', $map_width);

+         * Filter the width of map.

+         *

+         * @since 1.0.0

+         *

+         * @param int $map_width Width of map box, eg: gd_place.

+         */

+        $map_width = apply_filters('geodir_change_map_width', $map_width);

         ?>

         <div id="catcher_<?php echo $map_canvas_name;?>"></div>

         <div class="stick_trigger_container">

@@ -285,29 +285,29 @@ 
 

                     <div id="<?php echo $map_canvas_name; ?>_directionsPanel" style="width:auto;"></div>

                 <?php 

-				}

+                }

 				

-				$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-				if (empty($geodir_default_map_search_pt))

-					$geodir_default_map_search_pt = 'gd_place';

-

-				/**

-				 * Filter the post type to retrive data for map

-				 *

-				 * @since 1.0.0

-				 *

-				 * @param string $geodir_default_map_search_pt Post type, eg: gd_place.

-				 */

-				$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

-				?>

+                $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+                if (empty($geodir_default_map_search_pt))

+                    $geodir_default_map_search_pt = 'gd_place';

+

+                /**

+                 * Filter the post type to retrive data for map

+                 *

+                 * @since 1.0.0

+                 *

+                 * @param string $geodir_default_map_search_pt Post type, eg: gd_place.

+                 */

+                $map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

+                ?>

                 <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

                     <?php

                     $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

                     $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

-					$map_cat_class = '';

-					if ($geodir_map_options['enable_post_type_filters']) {

-						$map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

-					}

+                    $map_cat_class = '';

+                    if ($geodir_map_options['enable_post_type_filters']) {

+                        $map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

+                    }

                     ?>

                     <div

                         class="map-category-listing<?php echo $map_cat_class;?>">

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

                 <?php

                 if ($geodir_map_options['enable_location_filters']) {

-					$country = get_query_var('gd_country');

-					$region = get_query_var('gd_region');

-					$city = get_query_var('gd_city');

+                    $country = get_query_var('gd_country');

+                    $region = get_query_var('gd_region');

+                    $city = get_query_var('gd_city');

                     

                     //fix for location/me page

                     $country = $country != 'me' ? $country : '';

-					$region = $region != 'me' ? $region : '';

-					$city = $country != 'me' ? $city : '';

+                    $region = $region != 'me' ? $region : '';

+                    $city = $country != 'me' ? $city : '';

                     $gd_neighbourhood = isset($_REQUEST['gd_neighbourhood']) ? sanitize_text_field($_REQUEST['gd_neighbourhood']) : '';

                     ?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

@@ -396,7 +396,7 @@ 
                                     foreach ($post_types as $post_type => $args) {

                                         if (!in_array($post_type, $exclude_post_types)) {

                                             $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

-											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __(ucfirst($args->labels->name), 'geodirectory') . '</a></li>';

+                                            echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __(ucfirst($args->labels->name), 'geodirectory') . '</a></li>';

                                         }

                                     }

                                     ?>

Spacing +58 added lines, -58 removed lines

@@ -166,10 +166,10 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+    if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

         // Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);

 

         wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

@@ -188,39 +188,39 @@ 
 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

         ?>

-        <div id="catcher_<?php echo $map_canvas_name;?>"></div>

+        <div id="catcher_<?php echo $map_canvas_name; ?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

-            <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>"

-                 id="sticky_map_<?php echo $map_canvas_name;?>"

-                 style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+            <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>"

+                 id="sticky_map_<?php echo $map_canvas_name; ?>"

+                 style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

 

                 <div class="map_background">

                     <div class="top_banner_section_in clearfix">

-                        <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>

-                        <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div>

-                        <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper"

-                             style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+                        <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>

+                        <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div>

+                        <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper"

+                             style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

                             <!-- new map start -->

                             <div class="iprelative">

-                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>"

-                                     style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

-                                <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div"

-                                     style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

+                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>"

+                                     style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

+                                <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div"

+                                     style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

                                 <!--<div id="home_map_counter"></div>        -->

-                                <div id="<?php echo $map_canvas_name;?>_map_nofound"

+                                <div id="<?php echo $map_canvas_name; ?>_map_nofound"

                                      class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

                             </div>

                             <!-- new map end -->

                         </div>

-                        <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div>

+                        <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div>

                     </div>

                 </div>

                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/>

                 <?php } else {

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/>

                 <?php }

 

                 if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

@@ -240,7 +240,7 @@ 
                            onclick="calcRoute('<?php echo $map_canvas_name; ?>')"/>

 

                     <script>

-                        <?php if(geodir_is_page('detail')){?>

+                        <?php if (geodir_is_page('detail')) {?>

                         jQuery(function () {

                             gd_initialize_ac();

                         });

@@ -250,7 +250,7 @@ 
                             // Create the autocomplete object, restricting the search

                             // to geographical location types.

                             autocomplete = new google.maps.places.Autocomplete(

-                                /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),

+                                /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),

                                 {types: ['geocode']});

                             // When the user selects an address from the dropdown,

                             // populate the address fields in the form.

@@ -300,7 +300,7 @@ 
 				 */

 				$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

 				?>

-                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

+                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>">

                     <?php

                     $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

                     $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

@@ -310,12 +310,12 @@ 
 					}

                     ?>

                     <div

-                        class="map-category-listing<?php echo $map_cat_class;?>">

+                        class="map-category-listing<?php echo $map_cat_class; ?>">

                         <div class="trigger triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div>

-                        <div id="<?php echo $map_canvas_name;?>_cat"

-                             class="<?php echo $map_canvas_name;?>_map_category  map_category"

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

-                             style="max-height:<?php echo $geodir_map_options['height'];?>;">

+                        <div id="<?php echo $map_canvas_name; ?>_cat"

+                             class="<?php echo $map_canvas_name; ?>_map_category  map_category"

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

+                             style="max-height:<?php echo $geodir_map_options['height']; ?>;">

                             <input

                                 onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"

                                 type="text"

@@ -327,11 +327,11 @@ 
                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

                                     ?>

-                                    <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

+                                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

                                 <div class="toggle">

-                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?>

+                                    <?php echo home_map_taxonomy_walker(array($map_search_pt . 'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?>

                                     <script>jQuery( document ).ready(function() {

                                             geodir_show_sub_cat_collapse_button();

                                         });</script>

@@ -360,21 +360,21 @@ 
 					$city = $country != 'me' ? $city : '';

                     $gd_neighbourhood = isset($_REQUEST['gd_neighbourhood']) ? sanitize_text_field($_REQUEST['gd_neighbourhood']) : '';

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

-                           value="<?php echo $country;?>"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region"

-                           value="<?php echo $region;?>"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city"

-                           value="<?php echo $city;?>"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

-                           value="<?php echo $gd_neighbourhood;?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country"

+                           value="<?php echo $country; ?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region"

+                           value="<?php echo $region; ?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city"

+                           value="<?php echo $city; ?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood"

+                           value="<?php echo $gd_neighbourhood; ?>"/>

                 <?php } else { //end of location filter

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/>

                 <?php }?>

 

-                <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/>

+                <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/>

 

                 <input type="hidden" name="limitstart" value=""/>

 

@@ -382,10 +382,10 @@ 
 

                 <?php if ($geodir_map_options['enable_post_type_filters']) {

                     $post_types = geodir_get_posttypes('object');

-                    if (count((array)($post_types)) > 1) {

+                    if (count((array) ($post_types)) > 1) {

                         ?>

-                        <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

-                             style="max-width:<?php echo $map_width;?>!important;">

+                        <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu"

+                             style="max-width:<?php echo $map_width; ?>!important;">

 

                             <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             <div class="geodir-map-posttype-list"><?php } ?>

@@ -421,9 +421,9 @@ 
         <script type="text/javascript">

 

             jQuery(document).ready(function () {

-                //initMap('<?php echo $map_canvas_name;?>'); // depreciated, no need to load this twice

-                build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);

-                map_sticky('<?php echo $map_canvas_name;?>');

+                //initMap('<?php echo $map_canvas_name; ?>'); // depreciated, no need to load this twice

+                build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);

+                map_sticky('<?php echo $map_canvas_name; ?>');

             });

 

         </script>

@@ -434,18 +434,18 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";

 

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

+                    jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

 

                 }());

             </script>

@@ -457,13 +457,13 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');

 

                 }());

             </script>

@@ -478,7 +478,7 @@ 
          * @param array $geodir_map_options Array of map settings.

          * @param string $map_canvas_name The canvas name and ID for the map.

          */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+        do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);

 

 

     endif; // Exclude posttypes if end

geodirectory-functions/post_functions.php

Indentation +4 added lines, -4 removed lines

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

+     * @global object $gd_session GeoDirectory Session object.

      * @param array $request_info {

      *    Array of request info arguments.

      *

@@ -2554,9 +2554,9 @@ 
 function geodir_excerpt_length($length)

 {

     global $wp_query, $geodir_is_widget_listing;

-	if ($geodir_is_widget_listing) {

-		return $length;

-	}

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

Braces +176 added lines, -125 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);

@@ -428,15 +430,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);

@@ -454,11 +458,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)) {

@@ -545,15 +551,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';

 

@@ -703,8 +711,9 @@ 
             do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

 

             return true;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -758,8 +767,9 @@ 
             }

 

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -790,8 +800,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, ", ");

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

             }

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -852,8 +864,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';

 

@@ -862,11 +875,13 @@ 
             if ($meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)))) {

                 $meta_value = maybe_serialize($meta_value);

                 return $meta_value;

-            } else

-                return false;

+            } else {
+                            return false;
+            }
 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -997,7 +1012,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;

@@ -1022,8 +1037,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)) {

@@ -1052,8 +1068,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, ", ");

@@ -1078,8 +1095,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)));
+                    }
 

                 }

 

@@ -1120,8 +1138,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);
+        }
     }

 

 }

@@ -1174,16 +1193,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);

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

@@ -1267,8 +1290,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'];

@@ -1312,9 +1336,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');

             }

 

@@ -1343,10 +1367,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;
+        }
 

     }

 }

@@ -1376,8 +1403,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -1407,8 +1435,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(

@@ -1430,8 +1459,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'];

@@ -1473,9 +1503,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');

             }

 

@@ -1506,8 +1536,9 @@ 
 

                 return $return_arr;

 

-            } else

-                return false;

+            } else {
+                            return false;
+            }
 

         }

 

@@ -1567,14 +1598,14 @@ 
                         $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

                     } elseif ($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'])){

                     $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

-                }

-                else{

+                } else{

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

                 }

 

@@ -1586,8 +1617,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -1626,8 +1658,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)) {

@@ -1684,8 +1717,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)))) {

@@ -1716,10 +1750,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)))) {

 

@@ -1758,8 +1795,9 @@ 
 

                                 }

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

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

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

 

@@ -1903,7 +1941,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 {

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

                             }

                         }

@@ -2002,10 +2040,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';
+        }
 

     }

 }

@@ -2156,8 +2195,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';

 

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

@@ -2440,8 +2481,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);"

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

 

@@ -2558,13 +2602,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;

 }

@@ -2697,10 +2743,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;
+    }
 

 }

 

@@ -2749,10 +2796,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;
+    }
 

 }

 

@@ -2837,8 +2885,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);
+        }
 

     }

 }

@@ -2923,8 +2972,9 @@ 
 

     global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

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

     $fields_info = array();

 

@@ -2947,8 +2997,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 {

 

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

  */

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

             }

         }

 

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

 

         // 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'])) {

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

 

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

             }

 

@@ -658,7 +658,7 @@ 
 

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

@@ -928,7 +928,7 @@ 
                 $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] : '';

 

@@ -985,20 +985,20 @@ 
                         }

 

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

@@ -1031,7 +1031,7 @@ 
                                 $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) {

 

@@ -1069,7 +1069,7 @@ 
                 } 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(

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

 

                     }

 

@@ -1113,7 +1113,7 @@ 
 

             }

 

-            $invalid_files = (object)$invalid_files;

+            $invalid_files = (object) $invalid_files;

         }

 

         $remove_files[] = $post_id;

@@ -1247,7 +1247,7 @@ 
         }

 

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

@@ -1284,7 +1284,7 @@ 
              * @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['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;

             $imagesize = getimagesize($img_arr['path']);

             $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : 0;

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

     }

@@ -1436,7 +1436,7 @@ 
                 * @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['src'] = apply_filters('geodir_get_images_src', $uploads_url . '/' . $file_name, $file_name, $uploads_url, $uploads_baseurl);

                 $img_arr['path'] = $uploads_path . '/' . $file_name;

                 $imagesize = getimagesize($img_arr['path']);

                 $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : 0;

@@ -1450,11 +1450,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);

@@ -1489,7 +1489,7 @@ 
                 $img_arr['title'] = $file_name; // add the title to the array

                 $img_arr['content'] = $file_name; // add the description to the array

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 return $return_arr;

             } else

@@ -1516,8 +1516,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)) {

@@ -1528,10 +1528,10 @@ 
              * 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);

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

             }

 

             $imagesize = getimagesize($request->path);

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

 

@@ -1555,10 +1555,10 @@ 
                         $width_per = 100;

                 }

 

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

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

+                else {

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

                 }

 

@@ -1887,7 +1887,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 {

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

                             }

                         }

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

@@ -1941,10 +1941,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); ?>

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

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

@@ -2413,10 +2413,10 @@ 
             $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 {

@@ -2426,11 +2426,11 @@ 
             } 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>

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

     }

 }

@@ -3029,15 +3029,15 @@ 
  * @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;

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

 

     }

geodirectory-functions/reviews.php

Indentation +10 added lines, -10 removed lines

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

 /**

- * The template for displaying Comments.

- *

- * The area of the page that contains both current comments

- * and the comment form.

- *

- * @since 1.0.0

- * @since 1.5.4 Modified to fix review sorting.

- *

- * @package GeoDirectory

- */

+     * The template for displaying Comments.

+     *

+     * The area of the page that contains both current comments

+     * and the comment form.

+     *

+     * @since 1.0.0

+     * @since 1.5.4 Modified to fix review sorting.

+     *

+     * @package GeoDirectory

+     */

 

 /*

  * If the current post is protected by a password and

Braces +3 added lines, -2 removed lines

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

  * return early without loading the comments.

  */

-if (post_password_required())

-    return;

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

 

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

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

Indentation +63 added lines, -63 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * WordPress session managment.
- *
- * Standardizes WordPress session data and uses either database transients or in-memory caching
- * for storing user session information.
- *
- * @package WordPress
- * @subpackage Session
- * @since   3.7.0
- */
+     * WordPress session managment.
+     *
+     * Standardizes WordPress session data and uses either database transients or in-memory caching
+     * for storing user session information.
+     *
+     * @package WordPress
+     * @subpackage Session
+     * @since   3.7.0
+     */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
@@ -19,16 +19,16 @@ 
  * @return int
  */
 function wp_session_cache_expire() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->cache_expiration();
+    return $wp_session->cache_expiration();
 }
 
 /**
  * Alias of wp_session_write_close()
  */
 function wp_session_commit() {
-	wp_session_write_close();
+    wp_session_write_close();
 }
 
 /**
@@ -37,9 +37,9 @@ 
  * @param string $data
  */
 function wp_session_decode( $data ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+    return $wp_session->json_in( $data );
 }
 
 /**
@@ -48,9 +48,9 @@ 
  * @return string
  */
 function wp_session_encode() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_out();
+    return $wp_session->json_out();
 }
 
 /**
@@ -61,11 +61,11 @@ 
  * @return bool
  */
 function wp_session_regenerate_id( $delete_old_session = false ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+    $wp_session->regenerate_id( $delete_old_session );
 
-	return true;
+    return true;
 }
 
 /**
@@ -76,10 +76,10 @@ 
  * @return bool
  */
 function wp_session_start() {
-	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+    $wp_session = WP_Session::get_instance();
+    do_action( 'wp_session_start' );
 
-	return $wp_session->session_started();
+    return $wp_session->session_started();
 }
 add_action( 'plugins_loaded', 'wp_session_start' );
 
@@ -89,32 +89,32 @@ 
  * @return int
  */
 function wp_session_status() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
-		return PHP_SESSION_ACTIVE;
-	}
+    if ( $wp_session->session_started() ) {
+        return PHP_SESSION_ACTIVE;
+    }
 
-	return PHP_SESSION_NONE;
+    return PHP_SESSION_NONE;
 }
 
 /**
  * Unset all session variables.
  */
 function wp_session_unset() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->reset();
+    $wp_session->reset();
 }
 
 /**
  * Write session data and end session
  */
 function wp_session_write_close() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+    $wp_session->write_data();
+    do_action( 'wp_session_commit' );
 }
 add_action( 'shutdown', 'wp_session_write_close' );
 
@@ -126,44 +126,44 @@ 
  * of a scheduled task or cron job.
  */
 function wp_session_cleanup() {
-	global $wpdb;
+    global $wpdb;
 
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
-		return;
-	}
+    if ( defined( 'WP_SETUP_CONFIG' ) ) {
+        return;
+    }
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		$expiration_keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'" );
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        $expiration_keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'" );
 
-		$now = current_time( 'timestamp' );
-		$expired_sessions = array();
+        $now = current_time( 'timestamp' );
+        $expired_sessions = array();
 
-		foreach( $expiration_keys as $expiration ) {
+        foreach( $expiration_keys as $expiration ) {
 
-			// If the session has expired
-			if ( $now > intval( $expiration->option_value ) ) {
+            // If the session has expired
+            if ( $now > intval( $expiration->option_value ) ) {
 
-				// Get the session ID by parsing the option_name
-				$session_id = substr( $expiration->option_name, 20 );
+                // Get the session ID by parsing the option_name
+                $session_id = substr( $expiration->option_name, 20 );
 
-				if( (int) -1 === (int) $session_id || ! preg_match( '/^[a-f0-9]{32}$/', $session_id ) ) {
-					continue;
-				}
+                if( (int) -1 === (int) $session_id || ! preg_match( '/^[a-f0-9]{32}$/', $session_id ) ) {
+                    continue;
+                }
 
-				$expired_sessions[] = $expiration->option_name;
-				$expired_sessions[] = esc_sql( "_wp_session_$session_id" );
-			}
-		}
+                $expired_sessions[] = $expiration->option_name;
+                $expired_sessions[] = esc_sql( "_wp_session_$session_id" );
+            }
+        }
 
-		// Delete all expired sessions in a single query
-		if ( ! empty( $expired_sessions ) ) {
-			$option_names = implode( "','", $expired_sessions );
-			$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name IN ('$option_names')"  );
-		}
-	}
+        // Delete all expired sessions in a single query
+        if ( ! empty( $expired_sessions ) ) {
+            $option_names = implode( "','", $expired_sessions );
+            $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name IN ('$option_names')"  );
+        }
+    }
 
-	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+    // Allow other plugins to hook in to the garbage collection process.
+    do_action( 'wp_session_cleanup' );
 }
 add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
 
@@ -171,8 +171,8 @@ 
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wp_session_garbage_collection' );
-	}
+    if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
+        wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wp_session_garbage_collection' );
+    }
 }
 add_action( 'wp', 'wp_session_register_garbage_collection' );

Spacing +27 added lines, -27 removed lines

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

Braces +3 added lines, -1 removed lines

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

geodirectory-templates/add-listing.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Template for add listings page
- *
- * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
- *
- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
- * @since 1.0.0
- * @package GeoDirectory
- */
+     * Template for add listings page
+     *
+     * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
+     *
+     * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
+     * @since 1.0.0
+     * @package GeoDirectory
+     */
  
 global $gd_session;
 

geodirectory-templates/geodir-listing.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Template for the listings (category) page
- *
- * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
- *
- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
- * @since 1.0.0
- * @package GeoDirectory
- */
+                         * Template for the listings (category) page
+                         *
+                         * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
+                         *
+                         * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
+                         * @since 1.0.0
+                         * @package GeoDirectory
+                         */
 
 // call header
 get_header();

geodirectory-templates/listing-filter-form.php

Indentation +9 added lines, -9 removed lines

@@ -25,11 +25,11 @@ 
 

 <form class="<?php

 /**

- * Filters the GD search form class.

- *

- * @since 1.0.0

- * @param string $class The class for the search form, default: 'geodir-listing-search'.

- */

+     * Filters the GD search form class.

+     *

+     * @since 1.0.0

+     * @param string $class The class for the search form, default: 'geodir-listing-search'.

+     */

 echo apply_filters('geodir_search_form_class', 'geodir-listing-search'); ?>"

       name="geodir-listing-search" action="<?php echo $search_url ?>" method="get">

     <input type="hidden" name="geodir_search" value="1"/>

@@ -92,10 +92,10 @@ 
 

                 <input class="search_text" name="s"

                        value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {

-                           echo esc_attr($_REQUEST['s']);

-                       } else {

-                           echo $default_search_for_text;

-                       } ?>" type="text"

+                            echo esc_attr($_REQUEST['s']);

+                        } else {

+                            echo $default_search_for_text;

+                        } ?>" type="text"

                        onblur="if (this.value == '') {this.value = '<?php echo $default_search_for_text; ?>';}"

                        onfocus="if (this.value == '<?php echo $default_search_for_text; ?>') {this.value = '';}"

                        onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 

                 $post_types = geodir_get_posttypes('object');

 

-                if (!empty($post_types) && count((array)$post_types) > 1):

+                if (!empty($post_types) && count((array) $post_types) > 1):

                     ?>

                     <select name="stype" class="search_by_post">

                         <?php foreach ($post_types as $post_type => $info):

@@ -75,14 +75,14 @@ 
                             }

                             ?>

 

-                            <option data-label="<?php echo get_post_type_archive_link($post_type);?>"

-                                    value="<?php echo $post_type;?>" <?php if (isset($_REQUEST['stype'])) {

+                            <option data-label="<?php echo get_post_type_archive_link($post_type); ?>"

+                                    value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {

                                 if ($post_type == $_REQUEST['stype']) {

                                     echo 'selected="selected"';

                                 }

                             } elseif ($curr_post_type == $post_type) {

                                 echo 'selected="selected"';

-                            }?>><?php _e(ucfirst($info->labels->name), 'geodirectory');?></option>

+                            }?>><?php _e(ucfirst($info->labels->name), 'geodirectory'); ?></option>

 

                         <?php endforeach; ?>

                     </select>

@@ -157,7 +157,7 @@ 
                  * @since 1.5.5

                  * @param string $default_search_button_label The current search button text.

                  */

-                $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);?>

+                $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label); ?>

 				<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>" class="geodir_submit_search" />

                 <?php

                 /**

Braces +9 added lines, -6 removed lines

@@ -50,16 +50,19 @@
                 <?php

 

                 $default_search_for_text = SEARCH_FOR_TEXT;

-                if (get_option('geodir_search_field_default_text'))

-                    $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+                if (get_option('geodir_search_field_default_text')) {
+                                    $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+                }
 

                 $default_near_text = NEAR_TEXT;

-                if (get_option('geodir_near_field_default_text'))

-                    $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+                if (get_option('geodir_near_field_default_text')) {
+                                    $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+                }
 

                 $default_search_button_label = __('Search', 'geodirectory');

-                if (get_option('geodir_search_button_label'))

-                    $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

+                if (get_option('geodir_search_button_label')) {
+                                    $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');
+                }
 

                 $post_types = geodir_get_posttypes('object');

 

geodirectory-templates/listing-listview.php

Indentation +25 added lines, -25 removed lines

@@ -1,19 +1,19 @@ 
 <?php

 /**

- * Template for the list of places

- *

- * This is used mostly on the listing (category) pages and outputs the actual grid or list of listings.

- * See the link below for info on how to replace the template in your theme.

- *

- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/

- * @since 1.0.0

- * @package GeoDirectory

- * @global object $wpdb WordPress Database object.

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

- * @global object $wp_query WordPress Query object.

- * @global string $gridview_columns The girdview style of the listings.

- * @global object $gd_session GeoDirectory Session object.

- */

+         * Template for the list of places

+         *

+         * This is used mostly on the listing (category) pages and outputs the actual grid or list of listings.

+         * See the link below for info on how to replace the template in your theme.

+         *

+         * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/

+         * @since 1.0.0

+         * @package GeoDirectory

+         * @global object $wpdb WordPress Database object.

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

+         * @global object $wp_query WordPress Query object.

+         * @global string $gridview_columns The girdview style of the listings.

+         * @global object $gd_session GeoDirectory Session object.

+         */

 

 /**

  * Called before the listing template used to list listing of places.

@@ -36,7 +36,7 @@ 
  */

 $grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns);

 if ($gd_session->get('gd_listing_view') && !isset($before_widget) && !isset($related_posts)) {

-	$grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));

+    $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));

 }

 ?>

 

@@ -320,8 +320,8 @@ 
                                     ?>

                                     <span class="geodir-pinpoint"

                                           style=" background:url('<?php if (isset($marker_icon)) {

-                                              echo $marker_icon;

-                                          } ?>') no-repeat scroll left top transparent; background-size:auto 100%; -webkit-background-size:auto 100%; -moz-background-size:auto 100%; height:9px; width:14px; ">

+                                                echo $marker_icon;

+                                            } ?>') no-repeat scroll left top transparent; background-size:auto 100%; -webkit-background-size:auto 100%; -moz-background-size:auto 100%; height:9px; width:14px; ">

                                         <?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?>

                                     </span>

                                     <a class="geodir-pinpoint-link" href="javascript:void(0)"

@@ -411,14 +411,14 @@ 
             do_action('geodir_after_listing_post_listview');

 

         else:

-			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

+            $favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

             

-			/**

+            /**

              * Called inside the `ul` of the listings template, when no listing found.

              *

              * @since 1.5.5

-			 * @param string 'listing-listview' Listing listview template.

-			 * @param bool $favorite Are favorite listings results?

+             * @param string 'listing-listview' Listing listview template.

+             * @param bool $favorite Are favorite listings results?

              */

             do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);

         endif;

@@ -429,8 +429,8 @@ 
     <div class="clear"></div>

 <?php

 /**

- * Called after the listings list view template, after all the wrapper at the very end.

- *

- * @since 1.0.0

- */

+         * Called after the listings list view template, after all the wrapper at the very end.

+         *

+         * @since 1.0.0

+         */

 do_action('geodir_after_listing_listview');

Spacing +10 added lines, -10 removed lines

@@ -105,7 +105,7 @@ 
                                     echo geodir_show_badges_on_image('featured', $post, get_permalink());

                                 }

 

-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');

+                                $geodir_days_new = (int) get_option('geodir_listing_new_days');

 

                                 if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

                                     echo geodir_show_badges_on_image('new', $post, get_permalink());

@@ -220,12 +220,12 @@ 
                                  */

                                 $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

                                 if ($show_listing_excerpt) {

-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                        $content_out = geodir_max_excerpt( $character_count );

+                                    if (isset($character_count) && ($character_count || $character_count == '0')) {

+                                        $content_out = geodir_max_excerpt($character_count);

                                     } else {

                                         $content_out = get_the_excerpt();

                                     }

-                                    if ( ! empty( $content_out ) ) {

+                                    if (!empty($content_out)) {

                                         echo "<p>" . $content_out . "</p>";

                                     }

                                 }

@@ -250,7 +250,7 @@ 
                          * @param object $post The post object.

                          * @param string $view The view type, default 'listing'.

                          */

-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

+                        do_action('geodir_after_listing_content', $post, 'listing'); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">

 

@@ -262,7 +262,7 @@ 
                                  * @param object $post The post object.

                                  * @param string $view The view type, default 'listing'.

                                  */

-                                do_action( 'geodir_before_review_html', $post, 'listing' );

+                                do_action('geodir_before_review_html', $post, 'listing');

 

                                 $review_show = geodir_is_reviews_show('listview');

 

@@ -305,7 +305,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

+                                do_action('geodir_after_favorite_html', $post->ID, 'listing');

 

                                 global $wp_query;

 

@@ -335,7 +335,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID );

+                                do_action('geodir_listing_after_pinpoint', $post->ID);

 

                                 if ($post->post_author == get_current_user_id()) { ?>

                                     <?php

@@ -364,7 +364,7 @@ 
                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                                                    echo '<i class="' . $geodir_listing_edit_icon . '"></i>';

                                                     ?>

                                                     <?php _e('Edit', 'geodirectory'); ?>

                                                 </a>

@@ -372,7 +372,7 @@ 
                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                                                    echo '<i class="' . $geodir_listing_delete_icon . '"></i>';

                                                     ?>

                                                     <?php _e('Delete', 'geodirectory'); ?>

                                                 </a>

Braces +8 added lines, -3 removed lines

@@ -80,7 +80,10 @@ 
                     echo ' geodir-listview ';

                 } ?> <?php if ($post_view_class) {

                     echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing ?> >

+                } ?>" <?php if (isset($listing_width) && $listing_width) {
+                    echo "style='width:{$listing_width}%;'";
+                }
+                // Width for widget listing ?> >

                     <article class="geodir-category-listing <?php if ($post_view_article_class) {

                         echo $post_view_article_class;

                     } ?>">

@@ -410,8 +413,10 @@ 
              */

             do_action('geodir_after_listing_post_listview');

 

-        else:

-			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

+        else {
+            :

+			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
+        }
             

 			/**

              * Called inside the `ul` of the listings template, when no listing found.

geodirectory-templates/listing-success.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Template for the success page after submitting a listing
- *
- * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
- *
- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
- * @since 1.0.0
- * @package GeoDirectory
- */
+         * Template for the success page after submitting a listing
+         *
+         * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
+         *
+         * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
+         * @since 1.0.0
+         * @package GeoDirectory
+         */
 
 // call header
 get_header();