GeoDirectory / geodirectory

geodirectory-functions/taxonomy_functions.php

Indentation +56 added lines, -56 removed lines

@@ -445,16 +445,16 @@ 
             case 'Array':

                 $post_types = (array)$post_types;

                 break;

-			case 'options':

+            case 'options':

                 $post_types = (array)$post_types;

 				

-				$options = array();

-				if (!empty($post_types)) {

-					foreach ($post_types as $key => $info) {

-						$options[$key] = __($info['labels']['singular_name'], 'geodirectory');

-					}

-				}

-				$post_types = $options;

+                $options = array();

+                if (!empty($post_types)) {

+                    foreach ($post_types as $key => $info) {

+                        $options[$key] = __($info['labels']['singular_name'], 'geodirectory');

+                    }

+                }

+                $post_types = $options;

                 break;

             default:

                 $post_types = array_keys($post_types);

@@ -1064,7 +1064,7 @@ 
         if (is_array($post_cat_array)) {

             $post_cat_array = array_unique( $post_cat_array );

 

-			foreach ($post_cat_array as $post_cat_html) {

+            foreach ($post_cat_array as $post_cat_html) {

 

                 $post_cat_info = explode(":", $post_cat_html);

                 $post_maincat_str = $post_cat_info[0];

@@ -1429,21 +1429,21 @@ 
             }

         }

 

-		// Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

+        // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

         $site_url = trailingslashit(get_bloginfo('url'));

 

-		$fix_url = strpos($post_link, $site_url) === 0 ? true : false;

-		if ($fix_url) {

-			$post_link = str_replace($site_url, '', $post_link);

-		}

+        $fix_url = strpos($post_link, $site_url) === 0 ? true : false;

+        if ($fix_url) {

+            $post_link = str_replace($site_url, '', $post_link);

+        }

 		

         $post_link = trailingslashit(

             preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

         );

 

-		if ($fix_url) {

-			$post_link = $site_url . $post_link;

-		}

+        if ($fix_url) {

+            $post_link = $site_url . $post_link;

+        }

 

         if (isset($comment_post_cache[$post->ID])) {

             $post = $comment_post_cache[$post->ID];

@@ -1531,23 +1531,23 @@ 
 

                 if (!empty($post_location)) {

                     $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';

-					$region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';

-					$city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';

+                    $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';

+                    $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';

 					

-					$geodir_show_location_url = get_option('geodir_show_location_url');

+                    $geodir_show_location_url = get_option('geodir_show_location_url');

 					

-					$location_slug = array();

-					if ($geodir_show_location_url == 'all') {

-						$location_slug[] = $country_slug;

-						$location_slug[] = $region_slug;

-					} else if ($geodir_show_location_url == 'country_city') {

-						$location_slug[] = $country_slug;

-					} else if ($geodir_show_location_url == 'region_city') {

-						$location_slug[] = $region_slug;

-					}

-					$location_slug[] = $city_slug;

+                    $location_slug = array();

+                    if ($geodir_show_location_url == 'all') {

+                        $location_slug[] = $country_slug;

+                        $location_slug[] = $region_slug;

+                    } else if ($geodir_show_location_url == 'country_city') {

+                        $location_slug[] = $country_slug;

+                    } else if ($geodir_show_location_url == 'region_city') {

+                        $location_slug[] = $region_slug;

+                    }

+                    $location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+                    $location_request .= implode('/', $location_slug) . '/';

                 }

             }

 

@@ -1655,19 +1655,19 @@ 
         if ($include_location) {

             global $post;

 			

-			$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

-			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+            $location_manager = defined('POST_LOCATION_TABLE') ? true : false;

+            $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

             

-			if(geodir_is_page('detail') && isset($post->country_slug)){

+            if(geodir_is_page('detail') && isset($post->country_slug)){

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

                     'gd_city' => $post->city_slug

                 );

 				

-				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

-					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

-				}

+                if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

+                    $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

+                }

             } else {

                 $location_terms = geodir_get_current_location_terms('query_vars');

             }

@@ -1703,7 +1703,7 @@ 
         if(function_exists('icl_object_id')){

             $post_types = get_option('geodir_post_types');

             $post_type = str_replace("category","",$taxonomy);

-			$post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("_tags","",$post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

             if ( gd_wpml_slug_translation_turned_on( $post_type )) {

 

@@ -1751,13 +1751,13 @@ 
  * @return string The modified link.

  */

 function geodir_posttype_link($link, $post_type) {

-	global $geodir_add_location_url, $post, $gd_session;

+    global $geodir_add_location_url, $post, $gd_session;

 	

-	$location_terms = array();

+    $location_terms = array();

 	

-	if (in_array($post_type, geodir_get_posttypes())) {

-		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

+    if (in_array($post_type, geodir_get_posttypes())) {

+        if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

+            if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1767,22 +1767,22 @@ 
                 $location_terms = geodir_get_current_location_terms('query_vars');

             }

 			

-			$location_terms = geodir_remove_location_terms($location_terms);

+            $location_terms = geodir_remove_location_terms($location_terms);

 			

-			if (!empty($location_terms)) {

-				if (get_option('permalink_structure') != '') {

-					$location_terms = implode("/", $location_terms);

-					$location_terms = rtrim($location_terms, '/');

+            if (!empty($location_terms)) {

+                if (get_option('permalink_structure') != '') {

+                    $location_terms = implode("/", $location_terms);

+                    $location_terms = rtrim($location_terms, '/');

 					

-					$link .= urldecode($location_terms) . '/';

-				} else {

-					$link = geodir_getlink($link, $location_terms);

-				}

-			}

-		}

-	}

+                    $link .= urldecode($location_terms) . '/';

+                } else {

+                    $link = geodir_getlink($link, $location_terms);

+                }

+            }

+        }

+    }

 	

-	return $link;

+    return $link;

 }

 

 /**

Spacing +62 added lines, -62 removed lines

@@ -188,7 +188,7 @@ 
                                     $cpt_name = __($args->labels->singular_name, 'geodirectory');

                                     $items .= '<li class="' . $li_class . '">

 											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">

-												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+												' . sprintf(__('Add %s', 'geodirectory'), $cpt_name) . '

 											</a>

 										</li>';

                                 }

@@ -267,7 +267,7 @@ 
                                         $cpt_name = __($args->labels->singular_name, 'geodirectory');

                                         $items .= '<li class="' . $li_class . '">

 														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">

-															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+															' . sprintf(__('Add %s', 'geodirectory'), $cpt_name) . '

 														</a>

 													</li>';

                                     }

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

     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

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

-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);

+            $geodir_post_type = get_post_type((int) $_REQUEST['pid']);

         elseif (isset($_REQUEST['listing_type']))

             $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

     }

@@ -439,14 +439,14 @@ 
         switch ($output):

             case 'object':

             case 'Object':

-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

+                $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types;

                 break;

             case 'array':

             case 'Array':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

                 break;

 			case 'options':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -640,7 +640,7 @@ 
     } elseif (isset($wp_query->tax_query->queries)) {

         $tax_arr = $wp_query->tax_query->queries;

         //if tax query has 'relation' set then it will break wp_list_pluck so we remove it

-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

+        if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }

         $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

     }

 

@@ -763,7 +763,7 @@ 
             $cat_exclude = serialize($exclude_cats);

 

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

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

 

             if (!is_array($post->post_category[$cat_taxonomy]))

                 $post_category = $post->post_category[$cat_taxonomy];

@@ -841,14 +841,14 @@ 
 

             function show_subcatlist(main_cat, catObj) {

                 if (main_cat != '') {

-					var url = '<?php echo geodir_get_ajax_url();?>';

-                    var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

-                    var cat_exclude = '<?php echo base64_encode($cat_exclude);?>';

+					var url = '<?php echo geodir_get_ajax_url(); ?>';

+                    var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

+                    var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>';

                     var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();

-					<?php if ((int)$cat_limit > 0) { ?>

+					<?php if ((int) $cat_limit > 0) { ?>

 					var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);

 					if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {

-						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");

+						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");

 						return false;

 					}

 					<?php } ?>

@@ -887,7 +887,7 @@ 
             }

 

             function update_listing_cat(el) {

-                var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

+                var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

                 var cat_ids = '';

                 var main_cat = '';

                 var sub_cat = '';

@@ -968,7 +968,7 @@ 
         <div class="main_cat_list" style=" <?php if (isset($style)) {

             echo $style;

         }?> ">

-            <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

+            <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list

             ?>

         </div>

     <?php

@@ -995,9 +995,9 @@ 
     if ($exclude != '') {

         $exclude_cats = maybe_unserialize(base64_decode($exclude));

         print_r($exclude_cats);

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        if (is_array($exclude_cats)) {

+            $exclude_cats = array_map('intval', $exclude_cats);

+        } else {

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1011,25 +1011,25 @@ 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

         <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;">

-            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>"

+            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png'; ?>"

                  onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>

             <?php /* ?>

 		<img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" /> 

 		<?php */ ?>

 

-            <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat"

+            <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat"

                    onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"

                    checked="checked" disabled="disabled"/>

        <span> 

-        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             <br/>

 

             <div class="post_default_category">

-                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"

+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />

         <span> 

-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             </div>

 

@@ -1062,7 +1062,7 @@ 
         $post_cat_str = $post_categories[$request_taxonomy];

         $post_cat_array = explode("#", $post_cat_str);

         if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+            $post_cat_array = array_unique($post_cat_array);

 

 			foreach ($post_cat_array as $post_cat_html) {

 

@@ -1077,7 +1077,7 @@ 
                 }

                 $post_sub_catid = '';

                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

+                    $post_sub_catid = (int) $post_cat_info[1];

                 }

 

                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1098,7 +1098,7 @@ 
             }

 

             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

+                $post_sub_catid = (int) $post_cat_info[1];

             }

 

             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1140,8 +1140,8 @@ 
                 $option_selected = ' selected="selected" ';

 

             // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));

+            $has_child = !empty($child_terms) ? 't' : 'f';

 

             echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>';

         }

@@ -1174,7 +1174,7 @@ 
             2 => __('Custom field updated.', 'geodirectory'),

             3 => __('Custom field deleted.', 'geodirectory'),

             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,

             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1311,7 +1311,7 @@ 
             'menu_icon' => $menu_icon,

             'public' => true,

             'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true),

+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),

             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

 

@@ -1333,25 +1333,25 @@ 
 }

 

 $gd_wpml_get_languages = "";

-function gd_wpml_get_lang_from_url($url){

+function gd_wpml_get_lang_from_url($url) {

 

     global $gd_wpml_get_languages;

-    if(isset($_REQUEST['lang']) && $_REQUEST['lang']){return $_REQUEST['lang'];}

+    if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {return $_REQUEST['lang']; }

 

 

     //

-    $url = str_replace(array("http://","https://"),"",$url);

-    $site_url = str_replace(array("http://","https://"),"",get_bloginfo('url'));

+    $url = str_replace(array("http://", "https://"), "", $url);

+    $site_url = str_replace(array("http://", "https://"), "", get_bloginfo('url'));

 

-    $url = str_replace($site_url,"",$url);

+    $url = str_replace($site_url, "", $url);

 

 

     $segments = explode('/', trim($url, '/'));

 

     //print_r( $segments);

-    if($gd_wpml_get_languages){

+    if ($gd_wpml_get_languages) {

         $langs = $gd_wpml_get_languages;

-    }else{

+    } else {

         global $sitepress;

         $gd_wpml_get_languages = $sitepress->get_active_languages();

     }

@@ -1414,17 +1414,17 @@ 
         $slug = $post_types[$post->post_type]['rewrite']['slug'];

 

         // Alter the CPT slug if WPML is set to do so

-        if(function_exists('icl_object_id')){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+        if (function_exists('icl_object_id')) {

+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

                     'URL slug: ' . $slug,

                     $language_code);

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

             }

         }

@@ -1438,7 +1438,7 @@ 
 		}

 		

         $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+            preg_replace("/" . preg_quote($slug, "/") . "/", $slug . "/%gd_taxonomy%", $post_link, 1)

         );

 

 		if ($fix_url) {

@@ -1466,7 +1466,7 @@ 
                 )

             );

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+            $post = (object) array_merge((array) $post, (array) $post2);

 

             $comment_post_cache[$post->ID] = $post;

         }

@@ -1475,7 +1475,7 @@ 
 

         if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {

                 $location_request = '';

 

 

@@ -1489,7 +1489,7 @@ 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                         $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

+                        $post_location = (object) array('country_slug' => $post->country_slug,

                             'region_slug' => $post->region_slug,

                             'city_slug' => $post->city_slug

                         );

@@ -1518,7 +1518,7 @@ 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                             $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                            $post_location = (object)array('country_slug' => $post->country_slug,

+                            $post_location = (object) array('country_slug' => $post->country_slug,

                                 'region_slug' => $post->region_slug,

                                 'city_slug' => $post->city_slug

                             );

@@ -1658,7 +1658,7 @@ 
 			$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

             

-			if(geodir_is_page('detail') && isset($post->country_slug)){

+			if (geodir_is_page('detail') && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1677,7 +1677,7 @@ 
 

             if (!empty($location_terms)) {

 

-                $url_separator = '';//get_option('geodir_listingurl_separator');

+                $url_separator = ''; //get_option('geodir_listingurl_separator');

 

                 if (get_option('permalink_structure') != '') {

                     $old_listing_slug = '/' . $listing_slug . '/';

@@ -1700,31 +1700,31 @@ 
         }*/

 

         // Alter the CPT slug if WPML is set to do so

-        if(function_exists('icl_object_id')){

+        if (function_exists('icl_object_id')) {

             $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-			$post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("category", "", $taxonomy);

+			$post_type = str_replace("_tags", "", $post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

-            if ( gd_wpml_slug_translation_turned_on( $post_type )) {

+            if (gd_wpml_slug_translation_turned_on($post_type)) {

 

                 global $sitepress;

                 $default_lang = $sitepress->get_default_language();

                 $language_code = gd_wpml_get_lang_from_url($termlink);

-                if(!$language_code ){$language_code  = $default_lang;}

+                if (!$language_code) {$language_code = $default_lang; }

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

                     'URL slug: ' . $slug,

                     $language_code);

 

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

                 $termlink = trailingslashit(

 

-                    preg_replace(  "/" . preg_quote( $org_slug, "/" ) . "/", $slug  ,$termlink, 1 )

+                    preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug, $termlink, 1)

                 );

 

             }

@@ -1757,7 +1757,7 @@ 
 	

 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

+			if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1870,7 +1870,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -1939,7 +1939,7 @@ 
         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

         //$terms = get_terms( $taxonomy );

 

-        if($terms) {

+        if ($terms) {

             foreach ($terms as $term) {

                 $post_type = str_replace("category", "", $term->taxonomy);

                 $a_terms[$post_type][] = $term;

@@ -1947,7 +1947,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

             foreach ($a_terms as $pt => $t2) {

 

                 foreach ($t2 as $term) {

@@ -1972,7 +1972,7 @@ 
     }

 

     if (is_ssl()) {

-        $terms_icons = str_replace("http:","https:",$terms_icons );

+        $terms_icons = str_replace("http:", "https:", $terms_icons);

     }

 

     return $terms_icons;

Braces +170 added lines, -121 removed lines

@@ -39,8 +39,9 @@ 
     if (get_option('geodir_show_listing_nav')) {

 

         $menu_class = '';

-        if (geodir_is_page('listing'))

-            $menu_class = 'current-menu-item';

+        if (geodir_is_page('listing')) {
+                    $menu_class = 'current-menu-item';
+        }
 

 

         //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

@@ -52,8 +53,9 @@ 
                     if (in_array($post_type, $show_post_type_main_nav)) {

                         if (get_post_type_archive_link($post_type)) {

                             $menu_class = '';

-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                $menu_class = 'current-menu-item';

+                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
+                                                            $menu_class = 'current-menu-item';
+                            }
                             /**

                              * Filter the menu li class.

                              *

@@ -130,8 +132,9 @@ 
                             if (get_post_type_archive_link($post_type)) {

 

                                 $menu_class = '';

-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                    $menu_class = 'current-menu-item';

+                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
+                                                                    $menu_class = 'current-menu-item';
+                                }
 

                                 $items .= '<li class="' . $sub_li_class . '">

 														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

@@ -153,8 +156,9 @@ 
     if (get_option('geodir_show_addlisting_nav')) {

 

         $menu_class = '';

-        if (geodir_is_page('add-listing'))

-            $menu_class = 'current-menu-item';

+        if (geodir_is_page('add-listing')) {
+                    $menu_class = 'current-menu-item';
+        }
 

         //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

         $post_types = geodir_get_posttypes('object');

@@ -170,8 +174,9 @@ 
                                 if (geodir_get_addlisting_link($post_type)) {

 

                                     $menu_class = '';

-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                        $menu_class = 'current-menu-item';

+                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
+                                                                            $menu_class = 'current-menu-item';
+                                    }
                                     /**

                                      * Filter the menu li class.

                                      *

@@ -255,8 +260,9 @@ 
                                     if (geodir_get_addlisting_link($post_type)) {

 

                                         $menu_class = '';

-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                            $menu_class = 'current-menu-item';

+                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
+                                                                                    $menu_class = 'current-menu-item';
+                                        }
                                         /**

                                          * Filter the menu li class.

                                          *

@@ -311,8 +317,9 @@ 
     }

     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

-    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) {
+            $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
+    }
 

     return $menu;

 

@@ -398,24 +405,28 @@ 
     $geodir_post_type = get_query_var('post_type');

 

     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

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

-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);

-        elseif (isset($_REQUEST['listing_type']))

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

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
+        } elseif (isset($_REQUEST['listing_type'])) {
+                    $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
+        }
     }

 

-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

+    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype'])) {
+            $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
+    }
 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+    if (is_tax()) {
+            $geodir_post_type = geodir_get_taxonomy_posttype();
+    }
 

 

     $all_postypes = geodir_get_posttypes();

     $all_postypes = stripslashes_deep($all_postypes);

 

-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

-        $geodir_post_type = '';

+    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) {
+            $geodir_post_type = '';
+    }
 

 

     return $geodir_post_type;

@@ -462,11 +473,12 @@ 
         endswitch;

     }

 

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

-}

+    if (!empty($post_types)) {
+            return $post_types;
+    } else {
+            return array();
+    }
+    }

 

 /**

  * Get Custom Post Type info.

@@ -483,9 +495,10 @@ 
     $post_types = stripslashes_deep($post_types);

     if (!empty($post_types) && $post_type != '') {

         return $post_types[$post_type];

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_get_taxonomies')) {

     /**

@@ -509,18 +522,21 @@ 
             $gd_taxonomies = array_keys($taxonomies);

 

 

-            if ($post_type != '')

-                $gd_taxonomies = array();

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

             $i = 0;

             foreach ($taxonomies as $taxonomy => $args) {

 

-                if ($post_type != '' && $args['object_type'] == $post_type)

-                    $gd_taxonomies[] = $taxonomy;

+                if ($post_type != '' && $args['object_type'] == $post_type) {
+                                    $gd_taxonomies[] = $taxonomy;
+                }
 

                 if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

-                    if (array_search($taxonomy, $gd_taxonomies) !== false)

-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

+                    if (array_search($taxonomy, $gd_taxonomies) !== false) {
+                                            unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
+                    }
                 }

 

             }

@@ -575,10 +591,11 @@ 
                 . ucfirst($category_obj->name) . '</option>';

         }

 

-        if ($echo)

-            echo $html;

-        else

-            return $html;

+        if ($echo) {
+                    echo $html;
+        } else {
+                    return $html;
+        }
     }

 }

 

@@ -612,11 +629,12 @@ 
 

     }

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

-}

+    if (!empty($listing_slug)) {
+            return $listing_slug;
+    } else {
+            return false;
+    }
+    }

 

 

 /**

@@ -647,16 +665,18 @@ 
     if (!empty($taxonomies)) {

         foreach (geodir_get_posttypes() as $pt) {

             $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

-            if (array_intersect($taxonomies, $object_taxonomies))

-                $post_type[] = $pt;

+            if (array_intersect($taxonomies, $object_taxonomies)) {
+                            $post_type[] = $pt;
+            }
         }

     }

 

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

-}

+    if (!empty($post_type)) {
+            return $post_type[0];
+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

     /**

@@ -712,18 +732,18 @@ 
                 $checked = '';

 

                 if (in_array($cat_term->term_id, $search_terms)) {

-                    if ($cat_display == 'select' || $cat_display == 'multiselect')

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

-                    else

-                        $checked = 'checked="checked"';

+                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                            $checked = 'selected="selected"';
+                    } else {
+                                            $checked = 'checked="checked"';
+                    }
                 }

 

-                if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

-                elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';

-

-                else {

+                if ($cat_display == 'radio') {
+                                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';
+                } elseif ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';
+                } else {

                     $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

                 }

 

@@ -732,8 +752,9 @@ 
 

             }

 

-            if ($cat_display == 'checkbox' || $cat_display == 'radio')

-                $out .= '</div>';

+            if ($cat_display == 'checkbox' || $cat_display == 'radio') {
+                            $out .= '</div>';
+            }
 

             return $out;

         }

@@ -759,18 +780,21 @@ 
         global $exclude_cats, $gd_session;

 

         $cat_exclude = '';

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

-            $cat_exclude = serialize($exclude_cats);

+        if (is_array($exclude_cats) && !empty($exclude_cats)) {
+                    $cat_exclude = serialize($exclude_cats);
+        }
 

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

             $post = (object)$gd_session->get('listing');

 

-            if (!is_array($post->post_category[$cat_taxonomy]))

-                $post_category = $post->post_category[$cat_taxonomy];

+            if (!is_array($post->post_category[$cat_taxonomy])) {
+                            $post_category = $post->post_category[$cat_taxonomy];
+            }
 

             $post_categories = $post->post_category_str;

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

-                $post_category_str = $post_categories[$cat_taxonomy];

+            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
+                            $post_category_str = $post_categories[$cat_taxonomy];
+            }
 

         } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

             global $post;

@@ -961,8 +985,9 @@ 
         if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

             $post_cat_str = $post_categories[$cat_taxonomy];

             $post_cat_array = explode("#", $post_cat_str);

-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

-                $style = "display:none;";

+            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) {
+                            $style = "display:none;";
+            }
         }

         ?>

         <div class="main_cat_list" style=" <?php if (isset($style)) {

@@ -997,7 +1022,7 @@ 
         print_r($exclude_cats);

         if(is_array( $exclude_cats)){

             $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        } else{

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1027,7 +1052,10 @@ 
 

             <div class="post_default_category">

                 <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                       onchange="update_listing_cat()" <?php if ($default) {
+    echo ' checked="checked" ';
+}
+?>   />

         <span> 

         <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

         </span>

@@ -1127,8 +1155,9 @@ 
         $onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

         $option_selected = '';

-        if (!$selected)

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

+        if (!$selected) {
+                    $option_slected = ' selected="selected" ';
+        }
 

         echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

 

@@ -1136,8 +1165,9 @@ 
 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

-            if ($selected == $cat_term->term_id)

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

+            if ($selected == $cat_term->term_id) {
+                            $option_selected = ' selected="selected" ';
+            }
 

             // Count child terms

             $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

@@ -1202,8 +1232,9 @@ 
 

     $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

 

-    if (!$listing_slug = get_option('geodir_listing_prefix'))

-        $listing_slug = 'places';

+    if (!$listing_slug = get_option('geodir_listing_prefix')) {
+            $listing_slug = 'places';
+    }
 

     /**

      * Taxonomies

@@ -1351,7 +1382,7 @@ 
     //print_r( $segments);

     if($gd_wpml_get_languages){

         $langs = $gd_wpml_get_languages;

-    }else{

+    } else{

         global $sitepress;

         $gd_wpml_get_languages = $sitepress->get_active_languages();

     }

@@ -1494,8 +1525,9 @@ 
                             'city_slug' => $post->city_slug

                         );

 

-                    } else

-                        $post_location = geodir_get_location();

+                    } else {
+                                            $post_location = geodir_get_location();
+                    }
 

 

                 } else {

@@ -1524,8 +1556,9 @@ 
                             );

 

                         }

-                    } else

-                        $post_location = geodir_get_location();

+                    } else {
+                                            $post_location = geodir_get_location();
+                    }
                 }

 

 

@@ -1568,8 +1601,9 @@ 
                         $post_terms = $post_terms[0];

                     }

 

-                    if (!$post_terms)

-                        $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

+                    if (!$post_terms) {
+                                            $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
+                    }
 

                     if (!$post_terms) {

                         $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

@@ -1583,8 +1617,9 @@ 
 

                 $term = get_term_by('id', $post_terms, $taxonomies);

 

-                if (!empty($term))

-                    $term_request = $term->slug;

+                if (!empty($term)) {
+                                    $term_request = $term->slug;
+                }
                 //$term_request = $term->slug.'/';

             }

 

@@ -1599,15 +1634,20 @@ 
                 $request_term .= $term_request;

 

             } else {

-                if (isset($location_request) && $location_request != '') $request_term = $location_request;

+                if (isset($location_request) && $location_request != '') {
+                    $request_term = $location_request;
+                }
 

-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;

+                if (isset($term_request) && $term_request != '') {
+                    $request_term .= $term_request;
+                }
             }

             $request_term = trim($request_term, '/');

-            if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

-            else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+            if (!empty($request_term)) {
+                            $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
+            } else {
+                            $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
+            }
             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1649,8 +1689,9 @@ 
             if ($geodir_add_location_url && get_option('geodir_add_location_url')) {

                 $include_location = true;

             }

-        } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)

-            $include_location = true;

+        } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
+                    $include_location = true;
+        }
 

         if ($include_location) {

             global $post;

@@ -1800,10 +1841,11 @@ 
     if (!is_object($obj_post_type)) {

         return;

     }

-    if ($echo)

-        echo $obj_post_type->labels->singular_name;

-    else

-        return $obj_post_type->labels->singular_name;

+    if ($echo) {
+            echo $obj_post_type->labels->singular_name;
+    } else {
+            return $obj_post_type->labels->singular_name;
+    }
 

 }

 

@@ -1820,14 +1862,16 @@ 
 {

     $all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

     $obj_post_type = get_post_type_object($post_type);

-    if ($echo)

-        echo $obj_post_type->labels->name;

-    else

-        return $obj_post_type->labels->name;

+    if ($echo) {
+            echo $obj_post_type->labels->name;
+    } else {
+            return $obj_post_type->labels->name;
+    }
 

 }

 

@@ -1852,19 +1896,22 @@ 
     $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

 

     if (is_int($term)) {

-        if (0 == $term)

-            return 0;

+        if (0 == $term) {
+                    return 0;
+        }
         $where = 't.term_id = %d';

-        if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

-        else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+        if (!empty($taxonomy)) {
+                    return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
+        } else {
+                    return $wpdb->get_var($wpdb->prepare($select . $where, $term));
+        }
     }

 

     $term = trim(wp_unslash($term));

 

-    if ('' === $slug = sanitize_title($term))

-        return 0;

+    if ('' === $slug = sanitize_title($term)) {
+            return 0;
+    }
 

     $where = 't.slug = %s';

 

@@ -1881,14 +1928,16 @@ 
         $where_fields[] = $taxonomy;

 

 

-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

-            return $result;

+        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A)) {
+                    return $result;
+        }
 

         return false;

     }

 

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

-        return $result;

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields))) {
+            return $result;
+    }
 

     return false;

 }

geodirectory_template_actions.php

Indentation +8 added lines, -8 removed lines

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

 /**

- * Template functions that affect the output of most GeoDirectory pages

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Template functions that affect the output of most GeoDirectory pages

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 ###############################################

 ########### DYNAMIC CONTENT ###################

 ###############################################

@@ -1197,9 +1197,9 @@ 
         } else {

             $post_term = $post->$post_taxonomy;

 			

-			if ($preview && !$is_backend_preview) {

-				$post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

-			}

+            if ($preview && !$is_backend_preview) {

+                $post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

+            }

         }

 

         $post_term = array_unique($post_term);

Spacing +72 added lines, -72 removed lines

@@ -676,7 +676,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -1019,7 +1019,7 @@ 
                     $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

 

                     if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+                        $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);

                     }

 

                     if (isset($image->src)) {

@@ -1052,9 +1052,9 @@ 
                 } else {

                     $spacer_height = ((400 - $image->height) / 2);

                 }

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+                $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

                 $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />' . $caption . '</li>';

                 $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

@@ -1090,7 +1090,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1168,12 +1168,12 @@ 
                          * @param string $tag_link The tag link html.

                          * @param object $term The tag term object.

                          */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     } else {

                         $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

                         /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     }

                     $terms[] = $term;

@@ -1183,7 +1183,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Tags', 'geodirectory')), $links, (object)$terms);

+            $taxonomies[$post_type . '_tags'] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Tags', 'geodirectory')), $links, (object) $terms);

         endif;

 

     }

@@ -1219,7 +1219,7 @@ 
                          * @param string $term_link The link html to the category.

                          * @param object $term The category term object.

                          */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+                        $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);

                         $links[] = $term_link;

                         $terms[] = $term;

                     }

@@ -1237,7 +1237,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Category', 'geodirectory')), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Category', 'geodirectory')), $links, (object) $terms);

 

     }

 

@@ -1268,11 +1268,11 @@ 
  * @param object $post Optional. The post object or blank.

  * @package GeoDirectory

  */

-function geodir_action_details_micordata($post='')

+function geodir_action_details_micordata($post = '')

 {

 

     global $preview;

-    if(empty($post)){global $post;}

+    if (empty($post)) {global $post; }

     if ($preview || !geodir_is_page('detail')) {

         return;

     }

@@ -1293,7 +1293,7 @@ 
                 "description" => $review->comment_content,

                 "reviewRating" => array(

                     "@type" => "Rating",

-                    "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+                    "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

                     "ratingValue" => geodir_get_commentoverall($review->comment_ID),

                     "worstRating" => "1"

                 )

@@ -1321,13 +1321,13 @@ 
     }

     //print_r($post);

     // external links

-    $external_links =  array();

+    $external_links = array();

     $external_links[] = $post->geodir_website;

     $external_links[] = $post->geodir_twitter;

     $external_links[] = $post->geodir_facebook;

     $external_links = array_filter($external_links);

 

-    if(!empty($external_links)){

+    if (!empty($external_links)) {

         $external_links = array_values($external_links);

     }

 

@@ -1337,16 +1337,16 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

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

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

         $schema_type = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if (!$schema_type && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "http://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_name;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

+    $schema['description'] = wp_strip_all_tags($post->post_content, true);

     $schema['telephone'] = $post->geodir_contact;

     $schema['url'] = $c_url;

     $schema['sameAs'] = $external_links;

@@ -1360,7 +1360,7 @@ 
         "postalCode" => $post->post_zip

     );

 

-    if($post->post_latitude && $post->post_longitude) {

+    if ($post->post_latitude && $post->post_longitude) {

         $schema['geo'] = array(

             "@type" => "GeoCoordinates",

             "latitude" => $post->post_latitude,

@@ -1368,7 +1368,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1387,7 +1387,7 @@ 
      * @param array $schema The array of schema data to be filtered.

      * @param object $post The post object.

      */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

+    $schema = apply_filters('geodir_details_schema', $schema, $post);

 

 

     echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

@@ -1595,26 +1595,26 @@ 
 

 

     $title = $list_title;

-    if(geodir_is_page('pt')){

+    if (geodir_is_page('pt')) {

         $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+        $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

+        if (strpos($current_term->taxonomy, '_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

-        if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

+        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -1628,7 +1628,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

         /**

@@ -1673,7 +1673,7 @@ 
         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1958,7 +1958,7 @@ 
      */

     do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

     $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

-    echo '<div class="clearfix '.$extra_class.'">';

+    echo '<div class="clearfix ' . $extra_class . '">';

     /**

      * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

      *

@@ -2034,11 +2034,11 @@ 
 

     $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

-    if(geodir_is_page('add-listing')){

+    if (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

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

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        }elseif (isset($listing_type)) {

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2052,7 +2052,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

     echo $title;

@@ -2068,7 +2068,7 @@ 
  */

 function geodir_action_add_listing_page_mandatory()

 {?>

-    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p>

+    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p>

 <?php

 }

 

@@ -2103,7 +2103,7 @@ 
 

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

         global $post;

-        $post = (object)$gd_session->get('listing');

+        $post = (object) $gd_session->get('listing');

         $listing_type = $post->listing_type;

         $title = $post->post_title;

         $desc = $post->post_desc;

@@ -2145,10 +2145,10 @@ 
 

 

     ?>

-    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>"

+    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>"

           method="post" enctype="multipart/form-data">

-        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

-        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

+        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/>

+        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/>

         <?php if ($page_id) { ?><input type="hidden" name="add_listing_page_id"

                                        value="<?php echo $page_id; ?>" /><?php }?>

         <?php if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

@@ -2165,9 +2165,9 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_before_detail_fields');?>

+        do_action('geodir_before_detail_fields'); ?>

 

-        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

+        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5>

 

         <?php

         /**

@@ -2177,13 +2177,13 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_before_main_form_fields');?>

+        do_action('geodir_before_main_form_fields'); ?>

 

         <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details">

-            <label><?php echo PLACE_TITLE_TEXT;?><span>*</span> </label>

+            <label><?php echo PLACE_TITLE_TEXT; ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

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

-            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

         </div>

 

         <?php

@@ -2228,20 +2228,20 @@ 
         <div id="geodir_post_desc_row" class="<?php if ($desc_limit != '0') {

             echo 'required_field';

         }?> geodir_form_row clearfix gd-fieldset-details">

-            <label><?php echo PLACE_DESC_TEXT;?><span><?php if ($desc_limit != '0') {

+            <label><?php echo PLACE_DESC_TEXT; ?><span><?php if ($desc_limit != '0') {

                         echo '*';

                     }?></span> </label>

             <?php

             if (!empty($show_editor) && in_array($listing_type, $show_editor)) {

 

-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

+                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

 

                 <div class="editor" field_id="post_desc" field_type="editor">

                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

             <?php if ($desc_limit != '') { ?>

                 <script

-                    type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>

+                    type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } ?>

             <?php } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea"

@@ -2250,7 +2250,7 @@ 
             <?php if ($desc_limit_msg != '') { ?>

                 <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span>

             <?php } ?>

-            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

         /**

@@ -2300,8 +2300,8 @@ 
         <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

-                   maxlength="<?php echo $kw_tags_count;?>"/>

-            <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

+                   maxlength="<?php echo $kw_tags_count; ?>"/>

+            <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span>

         </div>

         <?php

         /**

@@ -2318,7 +2318,7 @@ 
 

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

 

-        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);?>

+        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type); ?>

 

 

         <?php

@@ -2334,7 +2334,7 @@ 
         $thumb_img_arr = array();

         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             if (isset($post->post_images))

                 $curImages = trim($post->post_images, ",");

 

@@ -2347,7 +2347,7 @@ 
             $listing_type = $post->listing_type;

 

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

-            $post = geodir_get_post_info((int)$_REQUEST['pid']);

+            $post = geodir_get_post_info((int) $_REQUEST['pid']);

             $listing_type = $post->post_type;

             $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

 

@@ -2361,7 +2361,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2382,7 +2382,7 @@ 
         if ($show_image_input_box) {

             ?>

 

-            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

+            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?>

                 <?php if ($image_limit == 1) {

                     echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

                 } ?>

@@ -2405,7 +2405,7 @@ 
                 <div

                     class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

                     id="<?php echo $id; ?>plupload-upload-ui">

-                    <h4><?php _e('Drop files to upload', 'geodirectory');?></h4><br/>

+                    <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>

                     <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                            value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>

                     <span class="ajaxnonceplu"

@@ -2422,7 +2422,7 @@ 
                      id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

                 </div>

                 <span

-                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

                 <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

             </div>

 

@@ -2434,7 +2434,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

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

         <noscript>

             <div>

-                <label><?php _e('Type 64 into this box', 'geodirectory');?></label>

+                <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>

                 <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/>

             </div>

         </noscript>

@@ -2455,10 +2455,10 @@ 
         <!-- end captcha code -->

 

         <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;">

-            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>"

-                   class="geodir_button" <?php echo $submit_button;?>/>

+            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>"

+                   class="geodir_button" <?php echo $submit_button; ?>/>

             <span class="geodir_message_note"

-                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>

+                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>

         </div>

 

     </form>

@@ -2520,7 +2520,7 @@ 
         class="<?php

         /** This action is documented in geodirectory_template_actions.php */

         echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

-        <?php dynamic_sidebar('Reg/Login Top Section');?>

+        <?php dynamic_sidebar('Reg/Login Top Section'); ?>

     </div><!-- clearfix ends here-->

 <?php

 }

@@ -2542,7 +2542,7 @@ 
 

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2559,7 +2559,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2697,11 +2697,11 @@ 
     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

     $title = $list_title;

-    if(geodir_is_page('author')){

+    if (geodir_is_page('author')) {

         $gd_page = 'author';

-        if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

+        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2715,7 +2715,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

         /**

@@ -2929,7 +2929,7 @@ 
     $post_type_info = get_post_type_object($gd_post_type);

 

     $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+    if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }

 

     if (is_search()) {

         $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

Braces +36 added lines, -25 removed lines

@@ -714,8 +714,9 @@ 
 

                         if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

                             if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

+                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') {
+                                                                    $term_icon = $term_icon_url['src'];
+                                }
                                 break;

                             }

                         }

@@ -1246,8 +1247,9 @@ 
         echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type . '_tags'])) {
+            echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';
+    }
 

     ?>

     </p><?php

@@ -1598,23 +1600,21 @@ 
     if(geodir_is_page('pt')){

         $gd_page = 'pt';

         $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

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

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

         if (strpos($current_term->taxonomy,'_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

-    }

-    elseif(geodir_is_page('author')){

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

         $gd_page = 'author';

         if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2025,8 +2025,9 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

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

+    if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') {
+            $listing_type = sanitize_text_field($_REQUEST['listing_type']);
+    }
     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

     /** This action is documented in geodirectory_template_actions.php */

@@ -2038,7 +2039,7 @@ 
         $gd_page = 'add-listing';

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        } elseif(isset($listing_type)){

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2096,7 +2097,11 @@ 
     $required_msg = '';

     $submit_button = '';

 

-    if (isset($_REQUEST['ajax_action'])) $ajax_action = $_REQUEST['ajax_action']; else $ajax_action = 'add';

+    if (isset($_REQUEST['ajax_action'])) {
+        $ajax_action = $_REQUEST['ajax_action'];
+    } else {
+        $ajax_action = 'add';
+    }
 

     $thumb_img_arr = array();

     $curImages = '';

@@ -2335,8 +2340,9 @@ 
         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

             $post = (object)$gd_session->get('listing');

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+            if (isset($post->post_images)) {
+                            $curImages = trim($post->post_images, ",");
+            }
 

 

             if ($curImages != '') {

@@ -2364,10 +2370,13 @@ 
             $totImg = count((array)$thumb_img_arr);

         }

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

+        if ($curImages != '') {
+                    $svalue = $curImages;
+        }
+        // this will be initial value of the above form field. Image urls.

+        else {
+                    $svalue = '';
+        }
 

         $image_limit = $package_info->image_limit;

         $show_image_input_box = ($image_limit != '0');

@@ -2577,8 +2586,9 @@ 
     </script><?php

 

     global $errors;

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

-        $errors->add('claim_login', LOGIN_CLAIM);

+    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') {
+            $errors->add('claim_login', LOGIN_CLAIM);
+    }
 

     if (!empty($errors)) {

         foreach ($errors as $errorsObj) {

@@ -2682,8 +2692,9 @@ 
 

     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+        if (!empty($current_term)) {
+                    $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
+        }
     }

 

 

@@ -2701,7 +2712,7 @@ 
         $gd_page = 'author';

         if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

upgrade.php

Spacing +31 added lines, -31 removed lines

@@ -47,7 +47,7 @@ 
     }

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+    add_action('init', 'gd_fix_cpt_rewrite_slug', 11); // this needs to be kept for a few versions

 

     update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

 

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

  * @package GeoDirectory

  */

-function geodir_upgrade_146(){

+function geodir_upgrade_146() {

     gd_convert_virtual_pages();

 }

 

@@ -94,7 +94,7 @@ 
  * @since 1.5.0

  * @package GeoDirectory

  */

-function geodir_upgrade_150(){

+function geodir_upgrade_150() {

     gd_fix_cpt_rewrite_slug();

 }

 

@@ -106,12 +106,12 @@ 
  * @since 1.4.8

  * @package GeoDirectory

  */

-function geodir_upgrade_148(){

+function geodir_upgrade_148() {

     /*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+    update_option('geodir_ga_pass', '');

+    update_option('geodir_ga_user', '');

 

 }

 

@@ -122,7 +122,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_153(){

+function geodir_upgrade_153() {

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

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

 }

@@ -133,7 +133,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_154(){

+function geodir_upgrade_154() {

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

 }

 

@@ -143,7 +143,7 @@ 
  * @since 1.5.2

  * @package GeoDirectory

  */

-function geodir_upgrade_152(){

+function geodir_upgrade_152() {

     gd_fix_address_detail_table_limit();

 }

 

@@ -641,7 +641,7 @@ 
 

     update_option('gd_theme_compats', $theme_compat);

 

-    gd_set_theme_compat();// set the compat pack if avail

+    gd_set_theme_compat(); // set the compat pack if avail

 }

 

 

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

  * @global object $wpdb WordPress Database object.

  */

-function gd_convert_virtual_pages(){

+function gd_convert_virtual_pages() {

     global $wpdb;

 

     // Update the add listing page settings

@@ -663,9 +663,9 @@ 
         )

     );

 

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

+    if ($add_listing_page) {

+        wp_update_post(array('ID' => $add_listing_page, 'post_status' => 'publish'));

+        update_option('geodir_add_listing_page', $add_listing_page);

     }

 

     // Update the listing preview page settings

@@ -676,9 +676,9 @@ 
         )

     );

 

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

+    if ($listing_preview_page) {

+        wp_update_post(array('ID' => $listing_preview_page, 'post_status' => 'publish'));

+        update_option('geodir_preview_page', $listing_preview_page);

     }

 

     // Update the listing success page settings

@@ -689,9 +689,9 @@ 
         )

     );

 

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

+    if ($listing_success_page) {

+        wp_update_post(array('ID' => $listing_success_page, 'post_status' => 'publish'));

+        update_option('geodir_success_page', $listing_success_page);

     }

 

     // Update the listing success page settings

@@ -702,11 +702,11 @@ 
         )

     );

 

-    if($location_page){

+    if ($location_page) {

         $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

+        if (!$location_slug) {$location_slug = 'location'; }

+        wp_update_post(array('ID' => $location_page, 'post_status' => 'publish', 'post_name' => $location_slug));

+        update_option('geodir_location_page', $location_page);

     }

 

 }

@@ -725,13 +725,13 @@ 
     $post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+    if (is_array($post_types)) {

 

         foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+            if (isset($args['rewrite']['slug'])) {

+                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%", "", $args['rewrite']['slug']);

             }

 

                 $alt_post_types[$post_type] = $args;

@@ -739,8 +739,8 @@ 
         }

     }

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

+    if (!empty($alt_post_types)) {

+        update_option('geodir_post_types', $alt_post_types);

         }

 

 

@@ -767,8 +767,8 @@ 
             // update each GD CTP

             try {

                 $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

+            } catch (Exception $e) {

+                error_log('Error: ' . $e->getMessage());

             }

         }

     }