GeoDirectory / geodirectory

geodirectory-functions/custom_field_html.php

Indentation +333 added lines, -333 removed lines

@@ -18,9 +18,9 @@ 
 global $post_type;

 

 if (!isset($field_info->post_type)) {

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

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

 } else

-    $post_type = $field_info->post_type;

+	$post_type = $field_info->post_type;

 

 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){

 //    $cf_arr = geodir_custom_fields_predefined($post_type);

@@ -48,7 +48,7 @@ 
 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

-    $field_admin_title = $field_info->admin_title;

+	$field_admin_title = $field_info->admin_title;

 

 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';

 

@@ -68,17 +68,17 @@ 
 //print_r($field_info);

 

 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

-    $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

+	$field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

 }elseif(isset($cf['icon']) && $cf['icon']){

-    $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

+	$field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

 }else{

-    $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

+	$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

 }

 

 if(isset($cf['name']) && $cf['name']){

-    $field_type_name = $cf['name'];

+	$field_type_name = $cf['name'];

 }else{

-    $field_type_name = $field_type;

+	$field_type_name = $field_type;

 }

 

 ?>

@@ -88,8 +88,8 @@ 
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

         <?php

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

-        ?>

+		$nonce = wp_create_nonce('custom_fields_' . $result_str);

+		?>

 

         <?php if ($default): ?>

             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>

@@ -98,37 +98,37 @@ 
                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"

                  class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

         <?php endif;

-        if ($field_type == 'fieldset') {

-            ?>

+		if ($field_type == 'fieldset') {

+			?>

             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

             <b style="cursor:pointer;"

                onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>

         <?php

-        } else {echo $field_icon;

-            ?>

+		} else {echo $field_icon;

+			?>

             <b style="cursor:pointer;"

                onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>

         <?php

-        }

-        ?>

+		}

+		?>

     </div>

 

     <form><!-- we need to wrap in a fom so we can use radio buttons with same name -->

     <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

          style="display:<?php if ($field_ins_upd == 'submit') {

-             echo 'block;';

-         } else {

-             echo 'none;';

-         } ?>">

+			 echo 'block;';

+		 } else {

+			 echo 'none;';

+		 } ?>">

         <input type="hidden" name="_wpnonce" value="<?php echo esc_attr($nonce); ?>"/>

         <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

         <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

         <input type="hidden" name="field_type_key" id="field_type_key" value="<?php echo $field_type_key; ?>"/>

         <input type="hidden" name="field_id" id="field_id" value="<?php echo esc_attr($result_str); ?>"/>

         <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

-            echo $field_info->data_type;

-        } ?>"/>

+			echo $field_info->data_type;

+		} ?>"/>

         <input type="hidden" name="is_active" id="is_active" value="1"/>

 

         <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>

@@ -140,37 +140,37 @@ 
 

             <?php

 

-            // data_type

-            if(has_filter("geodir_cfa_data_type_{$field_type}")){

+			// data_type

+			if(has_filter("geodir_cfa_data_type_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->data_type)) {

-                    $value = esc_attr($field_info->data_type);

-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

-                    $value = $cf['defaults']['data_type'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->data_type)) {

+					$value = esc_attr($field_info->data_type);

+				}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+					$value = $cf['defaults']['data_type'];

+				}

+				?>

                 <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/>

             <?php

-            }

+			}

 

 

-            // admin_title

-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){

+			// admin_title

+			if(has_filter("geodir_cfa_admin_title_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->admin_title)) {

-                    $value = esc_attr($field_info->admin_title);

-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

-                    $value = $cf['defaults']['admin_title'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->admin_title)) {

+					$value = esc_attr($field_info->admin_title);

+				}elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

+					$value = $cf['defaults']['admin_title'];

+				}

+				?>

                 <li>

                     <label for="admin_title" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Admin title :', 'geodirectory'); ?>

@@ -184,22 +184,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // site_title

-            if(has_filter("geodir_cfa_site_title_{$field_type}")){

+			// site_title

+			if(has_filter("geodir_cfa_site_title_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->site_title)) {

-                    $value = esc_attr($field_info->site_title);

-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

-                    $value = $cf['defaults']['site_title'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->site_title)) {

+					$value = esc_attr($field_info->site_title);

+				}elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

+					$value = $cf['defaults']['site_title'];

+				}

+				?>

                 <li>

                     <label for="site_title" class="gd-cf-tooltip-wrap"> <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend title :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -212,22 +212,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // admin_desc

-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

+			// admin_desc

+			if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->admin_desc)) {

-                    $value = esc_attr($field_info->admin_desc);

-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

-                    $value = $cf['defaults']['admin_desc'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->admin_desc)) {

+					$value = esc_attr($field_info->admin_desc);

+				}elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

+					$value = $cf['defaults']['admin_desc'];

+				}

+				?>

                 <li>

                     <label for="admin_desc" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend description :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -239,23 +239,23 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

 

-            // htmlvar_name

-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

+			// htmlvar_name

+			if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->htmlvar_name)) {

-                    $value = esc_attr($field_info->htmlvar_name);

-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

-                    $value = $cf['defaults']['htmlvar_name'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->htmlvar_name)) {

+					$value = esc_attr($field_info->htmlvar_name);

+				}elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

+					$value = $cf['defaults']['htmlvar_name'];

+				}

+				?>

                 <li>

                     <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

                         <div class="gdcf-tooltip">

@@ -265,29 +265,29 @@ 
                     <div class="gd-cf-input-wrap">

                         <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"

                                value="<?php if ($value) {

-                                   echo preg_replace('/geodir_/', '', $value, 1);

-                               }?>" <?php if ($default) {

-                            echo 'readonly="readonly"';

-                        }?> />

+								   echo preg_replace('/geodir_/', '', $value, 1);

+							   }?>" <?php if ($default) {

+							echo 'readonly="readonly"';

+						}?> />

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // is_active

-            if(has_filter("geodir_cfa_is_active_{$field_type}")){

+			// is_active

+			if(has_filter("geodir_cfa_is_active_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->is_active)) {

-                    $value = esc_attr($field_info->is_active);

-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

-                    $value = $cf['defaults']['is_active'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->is_active)) {

+					$value = esc_attr($field_info->is_active);

+				}elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

+					$value = $cf['defaults']['is_active'];

+				}

+				?>

                 <li <?php echo $field_display; ?>>

                     <label for="is_active" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -298,35 +298,35 @@ 
 

                         <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // for_admin_use

-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

+			// for_admin_use

+			if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->for_admin_use)) {

-                    $value = esc_attr($field_info->for_admin_use);

-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

-                    $value = $cf['defaults']['for_admin_use'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->for_admin_use)) {

+					$value = esc_attr($field_info->for_admin_use);

+				}elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

+					$value = $cf['defaults']['for_admin_use'];

+				}

+				?>

                 <li>

                     <label for="for_admin_use" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -337,47 +337,47 @@ 
 

                         <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // default_value

-            if(has_filter("geodir_cfa_default_value_{$field_type}")){

+			// default_value

+			if(has_filter("geodir_cfa_default_value_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->default_value)) {

-                    $value = esc_attr($field_info->default_value);

-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

-                    $value = $cf['defaults']['default_value'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->default_value)) {

+					$value = esc_attr($field_info->default_value);

+				}elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

+					$value = $cf['defaults']['default_value'];

+				}

+				?>

                 <li>

                     <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

                         <div class="gdcf-tooltip">

                             <?php

-                            if ($field_type == 'checkbox') {

-                                _e('Should the checkbox be checked by default?', 'geodirectory');

-                            } else if ($field_type == 'email') {

-                                _e('A default value for the field, usually blank. Ex: info@mysite.com', 'geodirectory');

-                            } else {

-                                _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');

-                            }

-                            ?>

+							if ($field_type == 'checkbox') {

+								_e('Should the checkbox be checked by default?', 'geodirectory');

+							} else if ($field_type == 'email') {

+								_e('A default value for the field, usually blank. Ex: info@mysite.com', 'geodirectory');

+							} else {

+								_e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');

+							}

+							?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

@@ -394,22 +394,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // show_in

-            if(has_filter("geodir_cfa_show_in_{$field_type}")){

+			// show_in

+			if(has_filter("geodir_cfa_show_in_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->show_in)) {

-                    $value = esc_attr($field_info->show_in);

-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

-                    $value = esc_attr($cf['defaults']['show_in']);

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->show_in)) {

+					$value = esc_attr($field_info->show_in);

+				}elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

+					$value = esc_attr($cf['defaults']['show_in']);

+				}

+				?>

                 <li>

                     <label for="show_in" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -420,41 +420,41 @@ 
 

                         <?php

 

-                        /*

+						/*

 						 * We wrap the key values in [] so we can search the DB easier with a LIKE query.

 						 */

-                        $show_in_locations = array(

-                            "[detail]" => __("Details page sidebar", 'geodirectory'),

-                            "[moreinfo]" => __("More info tab", 'geodirectory'),

-                            "[listing]" => __("Listings page", 'geodirectory'),

-                            "[owntab]" => __("Details page own tab", 'geodirectory'),

-                            "[mapbubble]" => __("Map bubble", 'geodirectory'),

-                        );

-

-                        /**

-                         * Filter the locations array for where to display custom fields.

-                         *

-                         * @since 1.6.6

-                         * @param array $show_in_locations The array of locations and descriptions.

-                         * @param object $field_info The field being displayed info.

-                         * @param string $field_info The type of field.

-                         */

-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

-

-

-                        // remove some locations for some field types

-

-                        // don't show new tab option for some types

-                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

-                        }else{

-                            unset($show_in_locations['[owntab]']);

-                        }

-

-                        if(!$display_on_listing){

-                            unset($show_in_locations['[listings]']);

-                        }

-

-                        ?>

+						$show_in_locations = array(

+							"[detail]" => __("Details page sidebar", 'geodirectory'),

+							"[moreinfo]" => __("More info tab", 'geodirectory'),

+							"[listing]" => __("Listings page", 'geodirectory'),

+							"[owntab]" => __("Details page own tab", 'geodirectory'),

+							"[mapbubble]" => __("Map bubble", 'geodirectory'),

+						);

+

+						/**

+						 * Filter the locations array for where to display custom fields.

+						 *

+						 * @since 1.6.6

+						 * @param array $show_in_locations The array of locations and descriptions.

+						 * @param object $field_info The field being displayed info.

+						 * @param string $field_info The type of field.

+						 */

+						$show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

+

+

+						// remove some locations for some field types

+

+						// don't show new tab option for some types

+						if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+						}else{

+							unset($show_in_locations['[owntab]']);

+						}

+

+						if(!$display_on_listing){

+							unset($show_in_locations['[listings]']);

+						}

+

+						?>

 

                         <select multiple="multiple" name="show_in[]"

                                 id="show_in"

@@ -464,38 +464,38 @@ 
                                 option-ajaxchosen="false">

                             <?php

 

-                            $show_in_values = explode(',',$value);

+							$show_in_values = explode(',',$value);

 

-                            foreach( $show_in_locations as $key => $val){

-                                $selected = '';

+							foreach( $show_in_locations as $key => $val){

+								$selected = '';

 

-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

-                                    $selected = 'selected';

-                                }

+								if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

+									$selected = 'selected';

+								}

 

-                                ?>

+								?>

                                 <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>

                                 <?php

-                            }

-                            ?>

+							}

+							?>

                         </select>

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // advanced_editor

-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

+			// advanced_editor

+			if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }

+			}

 

 

 

 

-            ?>

+			?>

 

 

             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>

@@ -508,38 +508,38 @@ 
 

             <?php

 

-            $pricearr = array();

-            if (isset($field_info->packages) && $field_info->packages != '') {

-                $pricearr = explode(',', trim($field_info->packages, ','));

-            } else {

-                $package_info = array();

+			$pricearr = array();

+			if (isset($field_info->packages) && $field_info->packages != '') {

+				$pricearr = explode(',', trim($field_info->packages, ','));

+			} else {

+				$package_info = array();

 

-                $package_info = geodir_post_package_info($package_info, '', $post_type);

-                $pricearr[] = $package_info->pid;

-            }

+				$package_info = geodir_post_package_info($package_info, '', $post_type);

+				$pricearr[] = $package_info->pid;

+			}

 

-            ob_start()

-            ?>

+			ob_start()

+			?>

 

             <select style="display:none" name="show_on_pkg[]" id="show_on_pkg" multiple="multiple">

                 <?php

-                if (!empty($pricearr)) {

-                    foreach ($pricearr as $val) {

-                        ?>

+				if (!empty($pricearr)) {

+					foreach ($pricearr as $val) {

+						?>

                         <option selected="selected" value="<?php echo esc_attr($val); ?>" ><?php echo $val; ?></option><?php

-                    }

-                }

-                ?>

+					}

+				}

+				?>

             </select>

 

             <?php

-            $html = ob_get_clean();

+			$html = ob_get_clean();

 

 			/**

 			 * Filter the price packages list.

 			 *

 			 * Filter the price packages list in custom field form in admin

-             * custom fields settings.

+			 * custom fields settings.

 			 *

 			 * @since 1.0.0

 			 *

@@ -548,25 +548,25 @@ 
 			 */

 			echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);

 

-            ?>

+			?>

 

 

 

             <?php

 

-            // is_required

-            if(has_filter("geodir_cfa_is_required_{$field_type}")){

+			// is_required

+			if(has_filter("geodir_cfa_is_required_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->is_required)) {

-                    $value = esc_attr($field_info->is_required);

-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

-                    $value = $cf['defaults']['is_required'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->is_required)) {

+					$value = esc_attr($field_info->is_required);

+				}elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

+					$value = $cf['defaults']['is_required'];

+				}

+				?>

                 <li>

                     <label for="is_required" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is required :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -578,14 +578,14 @@ 
 

                         <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

@@ -593,21 +593,21 @@ 
                 </li>

 

                 <?php

-            }

+			}

 

-            // required_msg

-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){

+			// required_msg

+			if(has_filter("geodir_cfa_required_msg_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->required_msg)) {

-                    $value = esc_attr($field_info->required_msg);

-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

-                    $value = $cf['defaults']['required_msg'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->required_msg)) {

+					$value = esc_attr($field_info->required_msg);

+				}elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

+					$value = $cf['defaults']['required_msg'];

+				}

+				?>

                 <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>

                     <label for="required_msg" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

@@ -621,38 +621,38 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // required_msg

-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

+			// required_msg

+			if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }

+			}

 

 

-            // extra_fields

-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

+			// extra_fields

+			if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }

+			}

 

 

-            // field_icon

-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){

+			// field_icon

+			if(has_filter("geodir_cfa_field_icon_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->field_icon)) {

-                    $value = esc_attr($field_info->field_icon);

-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

-                    $value = $cf['defaults']['field_icon'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->field_icon)) {

+					$value = esc_attr($field_info->field_icon);

+				}elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

+					$value = $cf['defaults']['field_icon'];

+				}

+				?>

                 <li>

                     <h3><?php echo __('Custom css', 'geodirectory'); ?></h3>

 

@@ -670,22 +670,22 @@ 
 

                 </li>

                 <?php

-            }

+			}

 

 

-            // css_class

-            if(has_filter("geodir_cfa_css_class_{$field_type}")){

+			// css_class

+			if(has_filter("geodir_cfa_css_class_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->css_class)) {

-                    $value = esc_attr($field_info->css_class);

-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

-                    $value = $cf['defaults']['css_class'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->css_class)) {

+					$value = esc_attr($field_info->css_class);

+				}elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

+					$value = $cf['defaults']['css_class'];

+				}

+				?>

                 <li>

 

                     <label for="css_class" class="gd-cf-tooltip-wrap">

@@ -698,47 +698,47 @@ 
                     <div class="gd-cf-input-wrap">

                         <input type="text" name="css_class" id="css_class"

                                value="<?php if (isset($field_info->css_class)) {

-                                   echo esc_attr($field_info->css_class);

-                               }?>"/>

+								   echo esc_attr($field_info->css_class);

+							   }?>"/>

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // cat_sort

-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

+			// cat_sort

+			if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                $hide_cat_sort  ='';

-                if (isset($field_info->cat_sort)) {

-                    $value = esc_attr($field_info->cat_sort);

-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

-                    $value = $cf['defaults']['cat_sort'];

-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

-                }

+			}else{

+				$value = '';

+				$hide_cat_sort  ='';

+				if (isset($field_info->cat_sort)) {

+					$value = esc_attr($field_info->cat_sort);

+				}elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

+					$value = $cf['defaults']['cat_sort'];

+					$hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

+				}

 

-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

-                ?>

+				$hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

+				?>

                 <li <?php echo $hide_cat_sort ;?>>

                     <h3><?php

-                        /**

-                         * Filter the section title.

-                         *

-                         * Filter the section title in custom field form in admin

-                         * custom fields settings.

-                         *

-                         * @since 1.0.0

-                         *

-                         * @param string $title Title of the section.

-                         * @param string $field_type Current field type.

-                         */

-                        echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

-

-                        ?></h3>

+						/**

+						 * Filter the section title.

+						 *

+						 * Filter the section title in custom field form in admin

+						 * custom fields settings.

+						 *

+						 * @since 1.0.0

+						 *

+						 * @param string $title Title of the section.

+						 * @param string $field_type Current field type.

+						 */

+						echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

+

+						?></h3>

                     <label for="cat_sort" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -750,42 +750,42 @@ 
 

                         <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"

                             <?php if (!$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

                 <?php

-            }

-

-

-

-            switch ($field_type):

-                case 'html':

-                case 'file':

-                case 'url':

-                case 'fieldset':

-                    break;

-                default:

-

-                    /**

-                     * Called at the end of the advanced custom fields settings page loop.

-                     *

-                     * Can be used to add or deal with different settings types.

-                     *

-                     * @since 1.0.0

-                     * @since 1.6.6 $cf param added.

-                     * @param object $field_info The current fields info.

-                     * @param array $cf The custom field settings

-                     */

-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>

+			}

+

+

+

+			switch ($field_type):

+				case 'html':

+				case 'file':

+				case 'url':

+				case 'fieldset':

+					break;

+				default:

+

+					/**

+					 * Called at the end of the advanced custom fields settings page loop.

+					 *

+					 * Can be used to add or deal with different settings types.

+					 *

+					 * @since 1.0.0

+					 * @since 1.6.6 $cf param added.

+					 * @param object $field_info The current fields info.

+					 * @param array $cf The custom field settings

+					 */

+					do_action('geodir_advance_custom_fields', $field_info,$cf);?>

 

 

                 <?php endswitch; ?>

Spacing +124 added lines, -124 removed lines

@@ -39,12 +39,12 @@ 
 $cf = (isset($cf_arr[$field_type_key])) ? $cf_arr[$field_type_key] : '';

 

 

-if(isset($field_info->extra_fields)){$extra_fields = $field_info->extra_fields;}

+if (isset($field_info->extra_fields)) {$extra_fields = $field_info->extra_fields; }

 $field_info = stripslashes_deep($field_info); // strip slashes from labels

-if(isset($field_info->extra_fields)){$field_info->extra_fields = $extra_fields;}

+if (isset($field_info->extra_fields)) {$field_info->extra_fields = $extra_fields; }

 

 

-$nonce = wp_create_nonce('custom_fields_' . $result_str);

+$nonce = wp_create_nonce('custom_fields_'.$result_str);

 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

@@ -69,15 +69,15 @@ 
 

 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

     $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

-}elseif(isset($cf['icon']) && $cf['icon']){

+}elseif (isset($cf['icon']) && $cf['icon']) {

     $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

-}else{

+} else {

     $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

 }

 

-if(isset($cf['name']) && $cf['name']){

+if (isset($cf['name']) && $cf['name']) {

     $field_type_name = $cf['name'];

-}else{

+} else {

     $field_type_name = $field_type;

 }

 

@@ -88,7 +88,7 @@ 
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

         <?php

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

         ?>

 

         <?php if ($default): ?>

@@ -103,12 +103,12 @@ 
             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory').' '.$field_admin_title); ?></b>

         <?php

         } else {echo $field_icon;

             ?>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(' '.$field_admin_title.' ('.$field_type_name.')'); ?></b>

         <?php

         }

         ?>

@@ -131,43 +131,43 @@ 
         } ?>"/>

         <input type="hidden" name="is_active" id="is_active" value="1"/>

 

-        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>

-        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />

-        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />

-        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : '';?>" />

+        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : ''; ?>" /><?php // show in sidebar value?>

+        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />

+        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />

+        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : ''; ?>" />

 

         <ul class="widefat post fixed" border="0" style="width:100%;">

 

             <?php

 

             // data_type

-            if(has_filter("geodir_cfa_data_type_{$field_type}")){

+            if (has_filter("geodir_cfa_data_type_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_data_type_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->data_type)) {

                     $value = esc_attr($field_info->data_type);

-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+                }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {

                     $value = $cf['defaults']['data_type'];

                 }

                 ?>

-                <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/>

+                <input type="hidden" name="data_type" id="data_type" value="<?php echo $value; ?>"/>

             <?php

             }

 

 

             // admin_title

-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){

+            if (has_filter("geodir_cfa_admin_title_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_admin_title_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->admin_title)) {

                     $value = esc_attr($field_info->admin_title);

-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

+                }elseif (isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']) {

                     $value = $cf['defaults']['admin_title'];

                 }

                 ?>

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

                     <div class="gd-cf-input-wrap">

                         <input type="text" name="admin_title" id="admin_title"

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

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

                     </div>

                 </li>

                 <?php

@@ -188,15 +188,15 @@ 
 

 

             // site_title

-            if(has_filter("geodir_cfa_site_title_{$field_type}")){

+            if (has_filter("geodir_cfa_site_title_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_site_title_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->site_title)) {

                     $value = esc_attr($field_info->site_title);

-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

+                }elseif (isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']) {

                     $value = $cf['defaults']['site_title'];

                 }

                 ?>

@@ -216,15 +216,15 @@ 
 

 

             // admin_desc

-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

+            if (has_filter("geodir_cfa_admin_desc_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_admin_desc_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->admin_desc)) {

                     $value = esc_attr($field_info->admin_desc);

-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

+                }elseif (isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']) {

                     $value = $cf['defaults']['admin_desc'];

                 }

                 ?>

@@ -235,7 +235,7 @@ 
                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

-                        <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value;?>"/>

+                        <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value; ?>"/>

                     </div>

                 </li>

                 <?php

@@ -244,26 +244,26 @@ 
 

 

             // htmlvar_name

-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

+            if (has_filter("geodir_cfa_htmlvar_name_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->htmlvar_name)) {

                     $value = esc_attr($field_info->htmlvar_name);

-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

+                }elseif (isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']) {

                     $value = $cf['defaults']['htmlvar_name'];

                 }

                 ?>

                 <li>

-                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

+                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php _e('This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

-                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"

+                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory'); ?>"

                                value="<?php if ($value) {

                                    echo preg_replace('/geodir_/', '', $value, 1);

                                }?>" <?php if ($default) {

@@ -276,15 +276,15 @@ 
 

 

             // is_active

-            if(has_filter("geodir_cfa_is_active_{$field_type}")){

+            if (has_filter("geodir_cfa_is_active_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_is_active_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->is_active)) {

                     $value = esc_attr($field_info->is_active);

-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

+                }elseif (isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']) {

                     $value = $cf['defaults']['is_active'];

                 }

                 ?>

@@ -296,17 +296,17 @@ 
                     </label>

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

+                        <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

+                        <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -315,15 +315,15 @@ 
 

 

             // for_admin_use

-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

+            if (has_filter("geodir_cfa_for_admin_use_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->for_admin_use)) {

                     $value = esc_attr($field_info->for_admin_use);

-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

+                }elseif (isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']) {

                     $value = $cf['defaults']['for_admin_use'];

                 }

                 ?>

@@ -335,17 +335,17 @@ 
                     </label>

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"

+                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="for_admin_use_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"

+                        <input type="radio" id="for_admin_use_no<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="for_admin_use_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -354,20 +354,20 @@ 
 

 

             // default_value

-            if(has_filter("geodir_cfa_default_value_{$field_type}")){

+            if (has_filter("geodir_cfa_default_value_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_default_value_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->default_value)) {

                     $value = esc_attr($field_info->default_value);

-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

+                }elseif (isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']) {

                     $value = $cf['defaults']['default_value'];

                 }

                 ?>

                 <li>

-                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

+                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php

                             if ($field_type == 'checkbox') {

@@ -384,12 +384,12 @@ 
                         <?php if ($field_type == 'checkbox') { ?>

                             <select name="default_value" id="default_value">

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

-                                <option value="1" <?php selected(true, (int)$value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>

+                                <option value="1" <?php selected(true, (int) $value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>

                             </select>

                         <?php } else if ($field_type == 'email') { ?>

-                            <input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>

+                            <input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>

                         <?php } else { ?>

-                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>

+                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>

                         <?php } ?>

                     </div>

                 </li>

@@ -398,15 +398,15 @@ 
 

 

             // show_in

-            if(has_filter("geodir_cfa_show_in_{$field_type}")){

+            if (has_filter("geodir_cfa_show_in_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_show_in_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->show_in)) {

                     $value = esc_attr($field_info->show_in);

-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

+                }elseif (isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']) {

                     $value = esc_attr($cf['defaults']['show_in']);

                 }

                 ?>

@@ -439,18 +439,18 @@ 
                          * @param object $field_info The field being displayed info.

                          * @param string $field_info The type of field.

                          */

-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

+                        $show_in_locations = apply_filters('geodir_show_in_locations', $show_in_locations, $field_info, $field_type);

 

 

                         // remove some locations for some field types

 

                         // don't show new tab option for some types

-                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

-                        }else{

+                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {

+                        } else {

                             unset($show_in_locations['[owntab]']);

                         }

 

-                        if(!$display_on_listing){

+                        if (!$display_on_listing) {

                             unset($show_in_locations['[listings]']);

                         }

 

@@ -464,17 +464,17 @@ 
                                 option-ajaxchosen="false">

                             <?php

 

-                            $show_in_values = explode(',',$value);

+                            $show_in_values = explode(',', $value);

 

-                            foreach( $show_in_locations as $key => $val){

+                            foreach ($show_in_locations as $key => $val) {

                                 $selected = '';

 

-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

+                                if (is_array($show_in_values) && in_array($key, $show_in_values)) {

                                     $selected = 'selected';

                                 }

 

                                 ?>

-                                <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>

+                                <option  value="<?php echo $key; ?>" <?php echo $selected; ?>><?php echo $val; ?></option>

                                 <?php

                             }

                             ?>

@@ -486,9 +486,9 @@ 
 

 

             // advanced_editor

-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

+            if (has_filter("geodir_cfa_advanced_editor_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

@@ -499,10 +499,10 @@ 
 

 

             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>

-            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels);} ?>"/>

+            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels); } ?>"/>

 

             <?php // we dont need to show the sort order ?>

-            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order);} ?>"/>

+            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order); } ?>"/>

 

 

 

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

 

             // is_required

-            if(has_filter("geodir_cfa_is_required_{$field_type}")){

+            if (has_filter("geodir_cfa_is_required_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_is_required_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->is_required)) {

                     $value = esc_attr($field_info->is_required);

-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

+                }elseif (isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']) {

                     $value = $cf['defaults']['is_required'];

                 }

                 ?>

@@ -576,17 +576,17 @@ 
 

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"

+                        <input type="radio" id="is_required_yes<?php echo $radio_id; ?>" name="is_required" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"

+                        <input type="radio" id="is_required_no<?php echo $radio_id; ?>" name="is_required" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

 

@@ -596,19 +596,19 @@ 
             }

 

             // required_msg

-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){

+            if (has_filter("geodir_cfa_required_msg_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_required_msg_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->required_msg)) {

                     $value = esc_attr($field_info->required_msg);

-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

+                }elseif (isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']) {

                     $value = $cf['defaults']['required_msg'];

                 }

                 ?>

-                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>

+                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'"; }?>>

                     <label for="required_msg" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -625,31 +625,31 @@ 
 

 

             // required_msg

-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

+            if (has_filter("geodir_cfa_validation_pattern_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

 

             // extra_fields

-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

+            if (has_filter("geodir_cfa_extra_fields_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_extra_fields_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

 

             // field_icon

-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){

+            if (has_filter("geodir_cfa_field_icon_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_field_icon_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->field_icon)) {

                     $value = esc_attr($field_info->field_icon);

-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

+                }elseif (isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']) {

                     $value = $cf['defaults']['field_icon'];

                 }

                 ?>

@@ -660,12 +660,12 @@ 
                     <label for="field_icon" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Upload icon :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>

+                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

                         <input type="text" name="field_icon" id="field_icon"

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

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

                     </div>

 

                 </li>

@@ -674,15 +674,15 @@ 
 

 

             // css_class

-            if(has_filter("geodir_cfa_css_class_{$field_type}")){

+            if (has_filter("geodir_cfa_css_class_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_css_class_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->css_class)) {

                     $value = esc_attr($field_info->css_class);

-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

+                }elseif (isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']) {

                     $value = $cf['defaults']['css_class'];

                 }

                 ?>

@@ -691,8 +691,8 @@ 
                     <label for="css_class" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Css class :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>

-                            <?php if($field_type=='multiselect'){_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory');}?>

+                            <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>

+                            <?php if ($field_type == 'multiselect') {_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory'); }?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

@@ -707,23 +707,23 @@ 
 

 

             // cat_sort

-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

+            if (has_filter("geodir_cfa_cat_sort_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_cat_sort_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

-                $hide_cat_sort  ='';

+                $hide_cat_sort = '';

                 if (isset($field_info->cat_sort)) {

                     $value = esc_attr($field_info->cat_sort);

-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

+                }elseif (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']) {

                     $value = $cf['defaults']['cat_sort'];

-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

+                    $hide_cat_sort = ($value === false) ? "style='display:none;'" : '';

                 }

 

-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

+                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort'] === false) ? "style='display:none;'" : '';

                 ?>

-                <li <?php echo $hide_cat_sort ;?>>

+                <li <?php echo $hide_cat_sort; ?>>

                     <h3><?php

                         /**

                          * Filter the section title.

@@ -742,23 +742,23 @@ 
                     <label for="cat_sort" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory');?>

+                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory'); ?>

                         </div>

                     </label>

 

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"

+                        <input type="radio" id="cat_sort_yes<?php echo $radio_id; ?>" name="cat_sort" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="cat_sort_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"

+                        <input type="radio" id="cat_sort_no<?php echo $radio_id; ?>" name="cat_sort" class="gdri-disabled" value="0"

                             <?php if (!$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="cat_sort_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -785,7 +785,7 @@ 
                      * @param object $field_info The current fields info.

                      * @param array $cf The custom field settings

                      */

-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>

+                    do_action('geodir_advance_custom_fields', $field_info, $cf); ?>

 

 

                 <?php endswitch; ?>

@@ -797,10 +797,10 @@ 
                     <h3></h3>

                 </label>

                 <div class="gd-cf-input-wrap">

-                    <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"

+                    <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"

                            onclick="save_field('<?php echo esc_attr($result_str); ?>')"/>

                     <?php if (!$default): ?>

-                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

+                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"

                                                             class="button"/></a>

                     <?php endif; ?>

Braces +43 added lines, -38 removed lines

@@ -19,8 +19,9 @@ 
 

 if (!isset($field_info->post_type)) {

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

-} else

-    $post_type = $field_info->post_type;

+} else {
+    $post_type = $field_info->post_type;
+}
 

 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){

 //    $cf_arr = geodir_custom_fields_predefined($post_type);

@@ -47,8 +48,9 @@ 
 $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

 $field_admin_title = '';

-if (isset($field_info->admin_title))

-    $field_admin_title = $field_info->admin_title;

+if (isset($field_info->admin_title)) {
+    $field_admin_title = $field_info->admin_title;
+}
 

 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';

 

@@ -69,15 +71,15 @@ 
 

 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

     $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

-}elseif(isset($cf['icon']) && $cf['icon']){

+} elseif(isset($cf['icon']) && $cf['icon']){

     $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

-}else{

+} else{

     $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

 }

 

 if(isset($cf['name']) && $cf['name']){

     $field_type_name = $cf['name'];

-}else{

+} else{

     $field_type_name = $field_type;

 }

 

@@ -93,8 +95,11 @@ 
 

         <?php if ($default): ?>

             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>

-        <?php else: ?>

-            <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+        <?php else {
+	: ?>

+            <div title="<?php _e('Click to remove field', 'geodirectory');
+}
+?>"

                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"

                  class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

         <?php endif;

@@ -145,11 +150,11 @@ 
 

                 echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->data_type)) {

                     $value = esc_attr($field_info->data_type);

-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+                } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

                     $value = $cf['defaults']['data_type'];

                 }

                 ?>

@@ -163,11 +168,11 @@ 
 

                 echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->admin_title)) {

                     $value = esc_attr($field_info->admin_title);

-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

+                } elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

                     $value = $cf['defaults']['admin_title'];

                 }

                 ?>

@@ -192,11 +197,11 @@ 
 

                 echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->site_title)) {

                     $value = esc_attr($field_info->site_title);

-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

+                } elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

                     $value = $cf['defaults']['site_title'];

                 }

                 ?>

@@ -220,11 +225,11 @@ 
 

                 echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->admin_desc)) {

                     $value = esc_attr($field_info->admin_desc);

-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

+                } elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

                     $value = $cf['defaults']['admin_desc'];

                 }

                 ?>

@@ -248,11 +253,11 @@ 
 

                 echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->htmlvar_name)) {

                     $value = esc_attr($field_info->htmlvar_name);

-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

+                } elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

                     $value = $cf['defaults']['htmlvar_name'];

                 }

                 ?>

@@ -280,11 +285,11 @@ 
 

                 echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->is_active)) {

                     $value = esc_attr($field_info->is_active);

-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

+                } elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

                     $value = $cf['defaults']['is_active'];

                 }

                 ?>

@@ -319,11 +324,11 @@ 
 

                 echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->for_admin_use)) {

                     $value = esc_attr($field_info->for_admin_use);

-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

+                } elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

                     $value = $cf['defaults']['for_admin_use'];

                 }

                 ?>

@@ -358,11 +363,11 @@ 
 

                 echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->default_value)) {

                     $value = esc_attr($field_info->default_value);

-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

+                } elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

                     $value = $cf['defaults']['default_value'];

                 }

                 ?>

@@ -402,11 +407,11 @@ 
 

                 echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->show_in)) {

                     $value = esc_attr($field_info->show_in);

-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

+                } elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

                     $value = esc_attr($cf['defaults']['show_in']);

                 }

                 ?>

@@ -446,7 +451,7 @@ 
 

                         // don't show new tab option for some types

                         if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

-                        }else{

+                        } else{

                             unset($show_in_locations['[owntab]']);

                         }

 

@@ -559,11 +564,11 @@ 
 

                 echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->is_required)) {

                     $value = esc_attr($field_info->is_required);

-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

+                } elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

                     $value = $cf['defaults']['is_required'];

                 }

                 ?>

@@ -600,11 +605,11 @@ 
 

                 echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->required_msg)) {

                     $value = esc_attr($field_info->required_msg);

-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

+                } elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

                     $value = $cf['defaults']['required_msg'];

                 }

                 ?>

@@ -645,11 +650,11 @@ 
 

                 echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->field_icon)) {

                     $value = esc_attr($field_info->field_icon);

-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

+                } elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

                     $value = $cf['defaults']['field_icon'];

                 }

                 ?>

@@ -678,11 +683,11 @@ 
 

                 echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->css_class)) {

                     $value = esc_attr($field_info->css_class);

-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

+                } elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

                     $value = $cf['defaults']['css_class'];

                 }

                 ?>

@@ -711,12 +716,12 @@ 
 

                 echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 $hide_cat_sort  ='';

                 if (isset($field_info->cat_sort)) {

                     $value = esc_attr($field_info->cat_sort);

-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

+                } elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

                     $value = $cf['defaults']['cat_sort'];

                     $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

                 }

geodirectory_shortcodes.php

Spacing +49 added lines, -49 removed lines

@@ -197,14 +197,14 @@ 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
         $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
+        if (get_option('geodir_marker_cluster_type')) {
             if ($map_args['autozoom']) {
                 $map_args['enable_marker_cluster_no_reposition'] = false;
             } else {
                 $map_args['enable_marker_cluster_no_reposition'] = true;
             }
 
-            $map_args['enable_marker_cluster_server'] = true ;
+            $map_args['enable_marker_cluster_server'] = true;
 
         }
 	} else {
@@ -212,7 +212,7 @@ 
 	}
 
     // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
+    if (!empty($params['latitude']) && !empty($params['longitude'])) {
         $map_args['enable_marker_cluster_no_reposition'] = true;
     }
 
@@ -264,7 +264,7 @@ 
 function geodir_sc_listing_map($atts) {
 
     // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+    if (isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type'])) {
 
         global $add_post_in_marker_array, $gd_sc_map_params;
         $backup_globals                             = array();
@@ -287,34 +287,34 @@ 
             'event_type'     => 'all'
         );
 
-        $params = shortcode_atts( $defaults, $atts );
+        $params = shortcode_atts($defaults, $atts);
 
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+        if (!(gdsc_is_post_type_valid($params['post_type']))) {
             $params['post_type'] = 'gd_place';
         }
 
         // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
+        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
+        $categories        = get_terms($category_taxonomy, array(
             'orderby' => 'count',
             'order'   => 'DESC',
             'fields'  => 'ids'
-        ) );
+        ));
 
         // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
+        if (!(is_array($params['category']))) {
+            $params['category'] = explode(',', $params['category']);
         }
 
         // Array_intersect returns only the items in $params['category'] that are also in our category list
         // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
+        $params['category'] = array_intersect($params['category'], $categories);
 
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+        if ($params['post_type'] == 'gd_event') {
+            $params['event_type'] = gdsc_validate_list_filter_choice($params['event_type']);
         }
 
-        $params = gdsc_validate_map_args( $params );
+        $params = gdsc_validate_map_args($params);
 
         $gd_sc_map_params = $params;
 
@@ -324,12 +324,12 @@ 
             'gd_location'    => false,
         );
 
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+        if (!empty($params['category']) && isset($params['category'][0]) && (int) $params['category'][0] != 0) {
+            $category_taxonomy = geodir_get_taxonomies($params['post_type']);
 
             ######### WPML #########
-            if ( function_exists( 'icl_object_id' ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+            if (function_exists('icl_object_id')) {
+                $category = gd_lang_object_ids($params['category'], $category_taxonomy[0]);
             }
             ######### WPML #########
 
@@ -339,36 +339,36 @@ 
                 'terms'    => $params['category']
             );
 
-            $query_args['tax_query'] = array( $tax_query );
+            $query_args['tax_query'] = array($tax_query);
         }
 
         $add_post_in_marker_array = true;
 
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+        if ($params['post_type'] == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
             global $geodir_event_widget_listview;
             $geodir_event_widget_listview = true;
 
             $query_args['geodir_event_type'] = $params['event_type'];
 
-            $listings = geodir_event_get_widget_events( $query_args );
+            $listings = geodir_event_get_widget_events($query_args);
 
             $geodir_event_widget_listview = false;
         } else {
-            $listings = geodir_get_widget_listings( $query_args );
+            $listings = geodir_get_widget_listings($query_args);
         }
 
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
+        if (!empty($listings)) {
+            foreach ($listings as $listing) {
+                create_marker_jason_of_posts($listing);
             }
         }
 
         ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
 
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
 
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
 
         $default_location = geodir_get_default_location();
 
@@ -389,17 +389,17 @@ 
             'enable_location_filters'  => false,
             'enable_jason_on_load'     => true,
             'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+            'latitude'                 => isset($default_location->city_latitude) ? $default_location->city_latitude : '',
+            'longitude'                => isset($default_location->city_longitude) ? $default_location->city_longitude : '',
             'streetViewControl'        => true,
             'showPreview'              => '0',
             'maxZoom'                  => 21,
             'bubble_size'              => 'small',
         );
 
-        if ( is_single() ) {
+        if (is_single()) {
             global $post;
-            if ( isset( $post->post_latitude ) ) {
+            if (isset($post->post_latitude)) {
                 $map_args['latitude']  = $post->post_latitude;
                 $map_args['longitude'] = $post->post_longitude;
             }
@@ -410,24 +410,24 @@ 
         }
 
         // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
             $map_args['enable_marker_cluster'] = true;
         } else {
             $map_args['enable_marker_cluster'] = false;
         }
 
-        geodir_draw_map( $map_args );
+        geodir_draw_map($map_args);
 
         $output = ob_get_contents();
 
         ob_end_clean();
 
-        foreach ( $backup_globals as $global => $value ) {
+        foreach ($backup_globals as $global => $value) {
             ${$global} = $value;
         }
 
         return $output;
-    }else{
+    } else {
         ob_start();
         add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
         add_action('the_post', 'create_list_jsondata'); // Add marker in json array
@@ -1044,20 +1044,20 @@ 
 	
 	$show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
 	
-	if ($show_adv_search != '' ) {
-		$show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
+	if ($show_adv_search != '') {
+		$show_adv_class = 'geodir-advance-search-'.$show_adv_search.' ';
 		if ($show_adv_search == 'searched' && geodir_is_page('search')) {
 			$show_adv_search = 'search';
 		}
-		$show_adv_attrs = 'data-show-adv="' . $show_adv_search . '"';
+		$show_adv_attrs = 'data-show-adv="'.$show_adv_search.'"';
 		
-		$params['before_widget'] = str_replace('class="', $show_adv_attrs . ' class="' . $show_adv_class, $params['before_widget']);
+		$params['before_widget'] = str_replace('class="', $show_adv_attrs.' class="'.$show_adv_class, $params['before_widget']);
 	}
 	
 	ob_start();
 	
 	//geodir_get_template_part('listing', 'filter-form');
-	the_widget('geodir_advance_search_widget', $params, $params );
+	the_widget('geodir_advance_search_widget', $params, $params);
 	
 	$output = ob_get_contents();
     ob_end_clean();
@@ -1257,7 +1257,7 @@ 
 
     // Validate character_count
     //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
+    $params['character_count'] = $params['character_count'];
 
     // Validate our layout choice
     // Outside of the norm, I added some more simple terms to match the existing
@@ -1269,7 +1269,7 @@ 
 
     // Validate Listing width, used in the template widget-listing-listview.php
     // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
     // Validate the checkboxes used on the widget
     $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
@@ -1285,7 +1285,7 @@ 
     if (!empty($params['tags'])) {
         if (!is_array($params['tags'])) {
             $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
+            if (',' !== $comma) {
                 $params['tags'] = str_replace($comma, ',', $params['tags']);
             }
             $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
@@ -1307,13 +1307,13 @@ 
         unset($atts['pageno']);
     }
 
-    if ( !empty($atts['shortcode_content']) ) {
+    if (!empty($atts['shortcode_content'])) {
         $content = $atts['shortcode_content'];
     }
     $params['shortcode_content'] = trim($content);
     $atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+    $params['shortcode_atts'] = $atts;
 
     $output = geodir_sc_gd_listings_output($params);
 
@@ -1385,8 +1385,8 @@ 
     // Validate the checkboxes used on the widget
     $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
     $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+    $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']);
+    $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']);
 
     if ($params['max_count'] != 'all') {
         $params['max_count'] = absint($params['max_count']);

Indentation +874 added lines, -874 removed lines

@@ -7,7 +7,7 @@ 
  */
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 require_once('geodirectory-functions/shortcode_functions.php');
 
@@ -32,43 +32,43 @@ 
  */
 function geodir_sc_add_listing($atts)
 {
-    ob_start();
-    $defaults = array(
-        'pid' => '',
-        'listing_type' => 'gd_place',
-        'login_msg' => __('You must login to post.', 'geodirectory'),
-        'show_login' => false,
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    foreach ($params as $key => $value) {
-        $_REQUEST[$key] = $value;
-    }
-
-    $user_id = get_current_user_id();
-    if (!$user_id) {
-        echo $params['login_msg'];
-        if ($params['show_login']) {
-            echo "<br />";
-            $defaults = array(
-                'before_widget' => '',
-                'after_widget' => '',
-                'before_title' => '',
-                'after_title' => '',
-            );
-
-            geodir_loginwidget_output($defaults, $defaults);
-        }
-
-
-    } else {
-       // Add listing page will be used if shortcode is detected in page content, no need to call it here
-    }
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	$defaults = array(
+		'pid' => '',
+		'listing_type' => 'gd_place',
+		'login_msg' => __('You must login to post.', 'geodirectory'),
+		'show_login' => false,
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	foreach ($params as $key => $value) {
+		$_REQUEST[$key] = $value;
+	}
+
+	$user_id = get_current_user_id();
+	if (!$user_id) {
+		echo $params['login_msg'];
+		if ($params['show_login']) {
+			echo "<br />";
+			$defaults = array(
+				'before_widget' => '',
+				'after_widget' => '',
+				'before_title' => '',
+				'after_title' => '',
+			);
+
+			geodir_loginwidget_output($defaults, $defaults);
+		}
+
+
+	} else {
+	   // Add listing page will be used if shortcode is detected in page content, no need to call it here
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -96,136 +96,136 @@ 
  */
 function geodir_sc_home_map($atts)
 {
-    ob_start();
-    $defaults = array(
-        'width' => '960',
-        'height' => '425',
-        'maptype' => 'ROADMAP',
-        'zoom' => '13',
-        'autozoom' => '',
-        'child_collapse' => '0',
-        'scrollwheel' => '0',
+	ob_start();
+	$defaults = array(
+		'width' => '960',
+		'height' => '425',
+		'maptype' => 'ROADMAP',
+		'zoom' => '13',
+		'autozoom' => '',
+		'child_collapse' => '0',
+		'scrollwheel' => '0',
 		'marker_cluster' => false,
-        'latitude' => '',
-        'longitude' => ''
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    $params = gdsc_validate_map_args($params);
-
-    $map_args = array(
-        'map_canvas_name' => 'gd_home_map',
-        'latitude' => $params['latitude'],
-        'longitude' => $params['longitude'],
-
-        /**
-         * Filter the widget width of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['width'] The map width.
-         */
-        'width' => apply_filters('widget_width', $params['width']),
-        /**
-         * Filter the widget height of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['height'] The map height.
-         */
-        'height' => apply_filters('widget_heigh', $params['height']),
-        /**
-         * Filter the widget maptype of the map on home/listings page.
-         *
-         * @since 1.0.0
+		'latitude' => '',
+		'longitude' => ''
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+	$params = gdsc_validate_map_args($params);
+
+	$map_args = array(
+		'map_canvas_name' => 'gd_home_map',
+		'latitude' => $params['latitude'],
+		'longitude' => $params['longitude'],
+
+		/**
+		 * Filter the widget width of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['width'] The map width.
+		 */
+		'width' => apply_filters('widget_width', $params['width']),
+		/**
+		 * Filter the widget height of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['height'] The map height.
+		 */
+		'height' => apply_filters('widget_heigh', $params['height']),
+		/**
+		 * Filter the widget maptype of the map on home/listings page.
+		 *
+		 * @since 1.0.0
 		 * @since 1.5.2 Added TERRAIN map type.
-         * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
-         */
-        'maptype' => apply_filters('widget_maptype', $params['maptype']),
-        /**
-         * Filter the widget scrollwheel value of the map on home/listings page.
-         *
-         * Should the scrollwheel zoom the map or not.
-         *
-         * @since 1.0.0
-         * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
-         */
-        'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
-        /**
-         * Filter the widget zoom level of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param int $params['zoom'] The zoom level of the map. Between 1-19.
-         */
-        'zoom' => apply_filters('widget_zoom', $params['zoom']),
-        /**
-         * Filter the widget auto zoom value of the map on home/listings page.
-         *
-         * If the map should autozoom to fit the markers shown.
-         *
-         * @since 1.0.0
-         * @param bool $params['autozoom'] True if the map should autozoom, false if not.
-         */
-        'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
-        /**
-         * Filter the widget child_collapse value of the map on home/listings page.
-         *
-         * If the map should auto collapse the child categories if the category bar is present.
-         *
-         * @since 1.0.0
-         * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
-         */
-        'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
-        'enable_cat_filters' => true,
-        'enable_text_search' => true,
-        'enable_post_type_filters' => true,
-        /**
-         * Filter the widget enable_location_filters value of the map on home/listings page.
-         *
-         * This is used when the location addon is used.
-         *
-         * @since 1.0.0
-         * @param bool $val True if location filters should be used, false if not.
-         */
-        'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
-        'enable_jason_on_load' => false,
-        'enable_marker_cluster' => false,
-        'enable_map_resize_button' => true,
-        'map_class_name' => 'geodir-map-home-page',
-        'is_geodir_home_map_widget' => true,
-    );
+		 * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
+		 */
+		'maptype' => apply_filters('widget_maptype', $params['maptype']),
+		/**
+		 * Filter the widget scrollwheel value of the map on home/listings page.
+		 *
+		 * Should the scrollwheel zoom the map or not.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
+		 */
+		'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
+		/**
+		 * Filter the widget zoom level of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param int $params['zoom'] The zoom level of the map. Between 1-19.
+		 */
+		'zoom' => apply_filters('widget_zoom', $params['zoom']),
+		/**
+		 * Filter the widget auto zoom value of the map on home/listings page.
+		 *
+		 * If the map should autozoom to fit the markers shown.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['autozoom'] True if the map should autozoom, false if not.
+		 */
+		'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
+		/**
+		 * Filter the widget child_collapse value of the map on home/listings page.
+		 *
+		 * If the map should auto collapse the child categories if the category bar is present.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
+		 */
+		'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
+		'enable_cat_filters' => true,
+		'enable_text_search' => true,
+		'enable_post_type_filters' => true,
+		/**
+		 * Filter the widget enable_location_filters value of the map on home/listings page.
+		 *
+		 * This is used when the location addon is used.
+		 *
+		 * @since 1.0.0
+		 * @param bool $val True if location filters should be used, false if not.
+		 */
+		'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
+		'enable_jason_on_load' => false,
+		'enable_marker_cluster' => false,
+		'enable_map_resize_button' => true,
+		'map_class_name' => 'geodir-map-home-page',
+		'is_geodir_home_map_widget' => true,
+	);
 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-        $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
-            if ($map_args['autozoom']) {
-                $map_args['enable_marker_cluster_no_reposition'] = false;
-            } else {
-                $map_args['enable_marker_cluster_no_reposition'] = true;
-            }
+		$map_args['enable_marker_cluster'] = true;
+		if(get_option('geodir_marker_cluster_type')) {
+			if ($map_args['autozoom']) {
+				$map_args['enable_marker_cluster_no_reposition'] = false;
+			} else {
+				$map_args['enable_marker_cluster_no_reposition'] = true;
+			}
 
-            $map_args['enable_marker_cluster_server'] = true ;
+			$map_args['enable_marker_cluster_server'] = true ;
 
-        }
+		}
 	} else {
 		$map_args['enable_marker_cluster'] = false;
 	}
 
-    // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
-        $map_args['enable_marker_cluster_no_reposition'] = true;
-    }
+	// if lat and long set in shortcode, hack it so the map is not repositioned
+	if(!empty($params['latitude']) && !empty($params['longitude']) ){
+		$map_args['enable_marker_cluster_no_reposition'] = true;
+	}
 
 
-    geodir_draw_map($map_args);
+	geodir_draw_map($map_args);
 
-    add_action('wp_footer', 'geodir_home_map_add_script', 100);
+	add_action('wp_footer', 'geodir_home_map_add_script', 100);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_homepage_map', 'geodir_sc_home_map');
 
@@ -263,242 +263,242 @@ 
  */
 function geodir_sc_listing_map($atts) {
 
-    // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
-
-        global $add_post_in_marker_array, $gd_sc_map_params;
-        $backup_globals                             = array();
-        $backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
-        $backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
-
-        $defaults = array(
-            'width'          => '294',
-            'height'         => '370',
-            'zoom'           => '13',
-            'autozoom'       => '',
-            'sticky'         => '',
-            'showall'        => '0',
-            'scrollwheel'    => '0',
-            'maptype'        => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false,
-            'post_type'      => 'gd_place',
-            'category'       => '0',
-            'event_type'     => 'all'
-        );
-
-        $params = shortcode_atts( $defaults, $atts );
-
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
-            $params['post_type'] = 'gd_place';
-        }
-
-        // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
-            'orderby' => 'count',
-            'order'   => 'DESC',
-            'fields'  => 'ids'
-        ) );
-
-        // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
-        }
-
-        // Array_intersect returns only the items in $params['category'] that are also in our category list
-        // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
-
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
-        }
-
-        $params = gdsc_validate_map_args( $params );
-
-        $gd_sc_map_params = $params;
-
-        $query_args = array(
-            'posts_per_page' => 1000000, //@todo kiran why was this added? 
-            'is_geodir_loop' => true,
-            'gd_location'    => false,
-        );
-
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-
-            ######### WPML #########
-            if ( function_exists( 'icl_object_id' ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
-            }
-            ######### WPML #########
-
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field'    => 'id',
-                'terms'    => $params['category']
-            );
-
-            $query_args['tax_query'] = array( $tax_query );
-        }
-
-        $add_post_in_marker_array = true;
-
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
-            global $geodir_event_widget_listview;
-            $geodir_event_widget_listview = true;
-
-            $query_args['geodir_event_type'] = $params['event_type'];
-
-            $listings = geodir_event_get_widget_events( $query_args );
-
-            $geodir_event_widget_listview = false;
-        } else {
-            $listings = geodir_get_widget_listings( $query_args );
-        }
-
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
-            }
-        }
-
-        ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
-
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
-
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
-
-        $default_location = geodir_get_default_location();
-
-        $map_args = array(
-            'map_canvas_name'          => 'gd_listing_map',
-            'width'                    => $params['width'],
-            'height'                   => $params['height'],
-            'zoom'                     => $params['zoom'],
-            'autozoom'                 => $params['autozoom'],
-            'sticky'                   => $params['sticky'],
-            'showall'                  => $params['showall'],
-            'scrollwheel'              => $params['scrollwheel'],
-            'maptype'                  => $params['maptype'],
-            'child_collapse'           => 0,
-            'enable_cat_filters'       => false,
-            'enable_text_search'       => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters'  => false,
-            'enable_jason_on_load'     => true,
-            'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
-            'streetViewControl'        => true,
-            'showPreview'              => '0',
-            'maxZoom'                  => 21,
-            'bubble_size'              => 'small',
-        );
-
-        if ( is_single() ) {
-            global $post;
-            if ( isset( $post->post_latitude ) ) {
-                $map_args['latitude']  = $post->post_latitude;
-                $map_args['longitude'] = $post->post_longitude;
-            }
-
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-
-        // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-
-        geodir_draw_map( $map_args );
-
-        $output = ob_get_contents();
-
-        ob_end_clean();
-
-        foreach ( $backup_globals as $global => $value ) {
-            ${$global} = $value;
-        }
-
-        return $output;
-    }else{
-        ob_start();
-        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
-        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
-        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
-        $defaults = array(
-            'width' => '294',
-            'height' => '370',
-            'zoom' => '13',
-            'autozoom' => '',
-            'sticky' => '',
-            'showall' => '0',
-            'scrollwheel' => '0',
-            'maptype' => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false
-        );
-        $params = shortcode_atts($defaults, $atts);
-        $params = gdsc_validate_map_args($params);
-        $map_args = array(
-            'map_canvas_name' => 'gd_listing_map',
-            'width' => $params['width'],
-            'height' => $params['height'],
-            'zoom' => $params['zoom'],
-            'autozoom' => $params['autozoom'],
-            'sticky' => $params['sticky'],
-            'showall' => $params['showall'],
-            'scrollwheel' => $params['scrollwheel'],
-            'child_collapse' => 0,
-            'enable_cat_filters' => false,
-            'enable_text_search' => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters' => false,
-            'enable_jason_on_load' => true,
-        );
-        if (is_single()) {
-            global $post;
-            $map_default_lat = $address_latitude = $post->post_latitude;
-            $map_default_lng = $address_longitude = $post->post_longitude;
-            $mapview = $post->post_mapview;
-            $map_args['zoom'] = $post->post_mapzoom;
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $default_location = geodir_get_default_location();
-            $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-        if (empty($mapview)) {
-            $mapview = 'ROADMAP';
-        }
-        // Set default map options
-        $map_args['ajax_url'] = geodir_get_ajax_url();
-        $map_args['latitude'] = $map_default_lat;
-        $map_args['longitude'] = $map_default_lng;
-        $map_args['streetViewControl'] = true;
-        $map_args['maptype'] = $mapview;
-        $map_args['showPreview'] = '0';
-        $map_args['maxZoom'] = 21;
-        $map_args['bubble_size'] = 'small';
-
-        // Add marker cluster
-        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-        geodir_draw_map($map_args);
-        $output = ob_get_contents();
-        ob_end_clean();
-        return $output;
-    }
+	// if some params are set then we need a new query, if not then we can use the main query
+	if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+
+		global $add_post_in_marker_array, $gd_sc_map_params;
+		$backup_globals                             = array();
+		$backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
+		$backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
+
+		$defaults = array(
+			'width'          => '294',
+			'height'         => '370',
+			'zoom'           => '13',
+			'autozoom'       => '',
+			'sticky'         => '',
+			'showall'        => '0',
+			'scrollwheel'    => '0',
+			'maptype'        => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false,
+			'post_type'      => 'gd_place',
+			'category'       => '0',
+			'event_type'     => 'all'
+		);
+
+		$params = shortcode_atts( $defaults, $atts );
+
+		if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+			$params['post_type'] = 'gd_place';
+		}
+
+		// Validate the selected category/ies - Grab the current list based on post_type
+		$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+		$categories        = get_terms( $category_taxonomy, array(
+			'orderby' => 'count',
+			'order'   => 'DESC',
+			'fields'  => 'ids'
+		) );
+
+		// Make sure we have an array
+		if ( ! ( is_array( $params['category'] ) ) ) {
+			$params['category'] = explode( ',', $params['category'] );
+		}
+
+		// Array_intersect returns only the items in $params['category'] that are also in our category list
+		// Otherwise it becomes empty and later on that will mean "All"
+		$params['category'] = array_intersect( $params['category'], $categories );
+
+		if ( $params['post_type'] == 'gd_event' ) {
+			$params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+		}
+
+		$params = gdsc_validate_map_args( $params );
+
+		$gd_sc_map_params = $params;
+
+		$query_args = array(
+			'posts_per_page' => 1000000, //@todo kiran why was this added? 
+			'is_geodir_loop' => true,
+			'gd_location'    => false,
+		);
+
+		if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
+			$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+
+			######### WPML #########
+			if ( function_exists( 'icl_object_id' ) ) {
+				$category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+			}
+			######### WPML #########
+
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field'    => 'id',
+				'terms'    => $params['category']
+			);
+
+			$query_args['tax_query'] = array( $tax_query );
+		}
+
+		$add_post_in_marker_array = true;
+
+		if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+			global $geodir_event_widget_listview;
+			$geodir_event_widget_listview = true;
+
+			$query_args['geodir_event_type'] = $params['event_type'];
+
+			$listings = geodir_event_get_widget_events( $query_args );
+
+			$geodir_event_widget_listview = false;
+		} else {
+			$listings = geodir_get_widget_listings( $query_args );
+		}
+
+		if ( ! empty( $listings ) ) {
+			foreach ( $listings as $listing ) {
+				create_marker_jason_of_posts( $listing );
+			}
+		}
+
+		ob_start();
+		add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+
+		add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+
+		add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+
+		$default_location = geodir_get_default_location();
+
+		$map_args = array(
+			'map_canvas_name'          => 'gd_listing_map',
+			'width'                    => $params['width'],
+			'height'                   => $params['height'],
+			'zoom'                     => $params['zoom'],
+			'autozoom'                 => $params['autozoom'],
+			'sticky'                   => $params['sticky'],
+			'showall'                  => $params['showall'],
+			'scrollwheel'              => $params['scrollwheel'],
+			'maptype'                  => $params['maptype'],
+			'child_collapse'           => 0,
+			'enable_cat_filters'       => false,
+			'enable_text_search'       => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters'  => false,
+			'enable_jason_on_load'     => true,
+			'ajax_url'                 => geodir_get_ajax_url(),
+			'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
+			'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+			'streetViewControl'        => true,
+			'showPreview'              => '0',
+			'maxZoom'                  => 21,
+			'bubble_size'              => 'small',
+		);
+
+		if ( is_single() ) {
+			global $post;
+			if ( isset( $post->post_latitude ) ) {
+				$map_args['latitude']  = $post->post_latitude;
+				$map_args['longitude'] = $post->post_longitude;
+			}
+
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+
+		// Add marker cluster
+		if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+
+		geodir_draw_map( $map_args );
+
+		$output = ob_get_contents();
+
+		ob_end_clean();
+
+		foreach ( $backup_globals as $global => $value ) {
+			${$global} = $value;
+		}
+
+		return $output;
+	}else{
+		ob_start();
+		add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
+		add_action('the_post', 'create_list_jsondata'); // Add marker in json array
+		add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
+		$defaults = array(
+			'width' => '294',
+			'height' => '370',
+			'zoom' => '13',
+			'autozoom' => '',
+			'sticky' => '',
+			'showall' => '0',
+			'scrollwheel' => '0',
+			'maptype' => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false
+		);
+		$params = shortcode_atts($defaults, $atts);
+		$params = gdsc_validate_map_args($params);
+		$map_args = array(
+			'map_canvas_name' => 'gd_listing_map',
+			'width' => $params['width'],
+			'height' => $params['height'],
+			'zoom' => $params['zoom'],
+			'autozoom' => $params['autozoom'],
+			'sticky' => $params['sticky'],
+			'showall' => $params['showall'],
+			'scrollwheel' => $params['scrollwheel'],
+			'child_collapse' => 0,
+			'enable_cat_filters' => false,
+			'enable_text_search' => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters' => false,
+			'enable_jason_on_load' => true,
+		);
+		if (is_single()) {
+			global $post;
+			$map_default_lat = $address_latitude = $post->post_latitude;
+			$map_default_lng = $address_longitude = $post->post_longitude;
+			$mapview = $post->post_mapview;
+			$map_args['zoom'] = $post->post_mapzoom;
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$default_location = geodir_get_default_location();
+			$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+		if (empty($mapview)) {
+			$mapview = 'ROADMAP';
+		}
+		// Set default map options
+		$map_args['ajax_url'] = geodir_get_ajax_url();
+		$map_args['latitude'] = $map_default_lat;
+		$map_args['longitude'] = $map_default_lng;
+		$map_args['streetViewControl'] = true;
+		$map_args['maptype'] = $mapview;
+		$map_args['showPreview'] = '0';
+		$map_args['maxZoom'] = 21;
+		$map_args['bubble_size'] = 'small';
+
+		// Add marker cluster
+		if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+		geodir_draw_map($map_args);
+		$output = ob_get_contents();
+		ob_end_clean();
+		return $output;
+	}
 }
 
 add_shortcode('gd_listing_slider', 'geodir_sc_listing_slider');
@@ -531,120 +531,120 @@ 
  */
 function geodir_sc_listing_slider($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'slideshow' => '0',
-        'animation_loop' => 0,
-        'direction_nav' => 0,
-        'slideshow_speed' => 5000,
-        'animation_speed' => 600,
-        'animation' => 'slide',
-        'order_by' => 'latest',
-        'show_title' => '',
-        'show_featured_only' => '',
-        'title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-
-    /*
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'slideshow' => '0',
+		'animation_loop' => 0,
+		'direction_nav' => 0,
+		'slideshow_speed' => 5000,
+		'animation_speed' => 600,
+		'animation' => 'slide',
+		'order_by' => 'latest',
+		'show_title' => '',
+		'show_featured_only' => '',
+		'title' => '',
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+
+	/*
      *
      * Now we begin the validation of the attributes.
      */
-    // Check we have a valid post_type
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Check we have a valid sort_order
-    $params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
-
-    // Match the chosen animation to our options
-    $animation_list = array('slide', 'fade');
-    if (!(in_array($params['animation'], $animation_list))) {
-        $params['animation'] = 'slide';
-    }
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Manage the entered categories
-    if (0 != $params['category'] || '' != $params['category']) {
-        $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
-    }
-    // Convert show_title to a bool
-    $params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
-
-    // Convert show_featured_only to a bool
-    $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
-
-    /*
+	// Check we have a valid post_type
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Check we have a valid sort_order
+	$params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
+
+	// Match the chosen animation to our options
+	$animation_list = array('slide', 'fade');
+	if (!(in_array($params['animation'], $animation_list))) {
+		$params['animation'] = 'slide';
+	}
+
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Manage the entered categories
+	if (0 != $params['category'] || '' != $params['category']) {
+		$params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
+	}
+	// Convert show_title to a bool
+	$params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
+
+	// Convert show_featured_only to a bool
+	$params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
+
+	/*
      * Hopefully all attributes are now valid, and safe to pass forward
      */
 
-    // redeclare vars after validation
-
-    if (isset($params['direction_nav'])) {
-        $params['directionNav'] = $params['direction_nav'];
-    }
-    if (isset($params['animation_loop'])) {
-        $params['animationLoop'] = $params['animation_loop'];
-    }
-    if (isset($params['slideshow_speed'])) {
-        $params['slideshowSpeed'] = $params['slideshow_speed'];
-    }
-    if (isset($params['animation_speed'])) {
-        $params['animationSpeed'] = $params['animation_speed'];
-    }
-    if (isset($params['order_by'])) {
-        $params['list_sort'] = $params['order_by'];
-    }
-
-    $query_args = array(
-        'post_number' => $params['post_number'],
-        'is_geodir_loop' => true,
-        'post_type' => $params['post_type'],
-        'order_by' => $params['order_by']
-    );
-
-    if (1 == $params['show_featured_only']) {
-        $query_args['show_featured_only'] = 1;
-    }
-
-    if (0 != $params['category'] && '' != $params['category']) {
-        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $params['category'],
-        );
-
-        $query_args['tax_query'] = array($tax_query);
-    }
-
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
-
-    $query_args = array_merge($query_args, $params);
-
-    geodir_listing_slider_widget_output($defaults, $query_args);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	// redeclare vars after validation
+
+	if (isset($params['direction_nav'])) {
+		$params['directionNav'] = $params['direction_nav'];
+	}
+	if (isset($params['animation_loop'])) {
+		$params['animationLoop'] = $params['animation_loop'];
+	}
+	if (isset($params['slideshow_speed'])) {
+		$params['slideshowSpeed'] = $params['slideshow_speed'];
+	}
+	if (isset($params['animation_speed'])) {
+		$params['animationSpeed'] = $params['animation_speed'];
+	}
+	if (isset($params['order_by'])) {
+		$params['list_sort'] = $params['order_by'];
+	}
+
+	$query_args = array(
+		'post_number' => $params['post_number'],
+		'is_geodir_loop' => true,
+		'post_type' => $params['post_type'],
+		'order_by' => $params['order_by']
+	);
+
+	if (1 == $params['show_featured_only']) {
+		$query_args['show_featured_only'] = 1;
+	}
+
+	if (0 != $params['category'] && '' != $params['category']) {
+		$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $params['category'],
+		);
+
+		$query_args['tax_query'] = array($tax_query);
+	}
+
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
+
+	$query_args = array_merge($query_args, $params);
+
+	geodir_listing_slider_widget_output($defaults, $query_args);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_login_box', 'geodir_sc_login_box');
@@ -668,22 +668,22 @@ 
  */
 function geodir_sc_login_box($atts)
 {
-    ob_start();
+	ob_start();
 
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
 
-    geodir_loginwidget_output($defaults, $defaults);
+	geodir_loginwidget_output($defaults, $defaults);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_popular_post_category', 'geodir_sc_popular_post_category');
@@ -714,31 +714,31 @@ 
  */
 function geodir_sc_popular_post_category($atts)
 {
-    ob_start();
-    global $geodir_post_category_str;
-    $defaults = array(
-        'category_limit' => 15,
-        'category_restrict' => false,
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-        'title' => '',
-        'default_post_type' => '',
-        'parent_only' => false,
-    );
-
-    $params = shortcode_atts($defaults, $atts, 'popular_post_category');
-    $params['category_limit'] = absint($params['category_limit']);
-    $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
-    $params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
-    geodir_popular_post_category_output($params, $params);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	global $geodir_post_category_str;
+	$defaults = array(
+		'category_limit' => 15,
+		'category_restrict' => false,
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+		'title' => '',
+		'default_post_type' => '',
+		'parent_only' => false,
+	);
+
+	$params = shortcode_atts($defaults, $atts, 'popular_post_category');
+	$params['category_limit'] = absint($params['category_limit']);
+	$params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
+	$params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
+	geodir_popular_post_category_output($params, $params);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view');
@@ -778,97 +778,97 @@ 
  */
 function geodir_sc_popular_post_view($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => '0',
-        'list_sort' => 'latest',
-        'use_viewing_post_type' => '1',
-        'character_count' => '20',
-        'listing_width' => '',
-        'show_featured_only' => '0',
-        'show_special_only' => '0',
-        'with_pics_only' => '0',
-        'with_videos_only' => '0',
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'title' => '',
-        'category_title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => '0',
+		'list_sort' => 'latest',
+		'use_viewing_post_type' => '1',
+		'character_count' => '20',
+		'listing_width' => '',
+		'show_featured_only' => '0',
+		'show_special_only' => '0',
+		'with_pics_only' => '0',
+		'with_videos_only' => '0',
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'title' => '',
+		'category_title' => '',
+	);
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-    $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category'] = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
-
-    // Validate character_count
-    $params['character_count'] = absint($params['character_count']);
-    if (20 > $params['character_count']) {
-        $params['character_count'] = 20;
-    }
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
-    $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
-
-    /**
-     * End of validation
-     */
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Validate our incoming params
+	 */
 
-    geodir_popular_postview_output($params, $params);
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+	$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
 
-    $output = ob_get_contents();
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
 
-    ob_end_clean();
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category'] = array_intersect($params['category'], $categories);
 
-    return $output;
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
+
+	/**
+	 * End of validation
+	 */
+
+	geodir_popular_postview_output($params, $params);
+
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews');
@@ -890,37 +890,37 @@ 
  * @return string Recent reviews HTML.
  */
 function geodir_sc_recent_reviews($atts) {
-    ob_start();
-    $defaults = array(
+	ob_start();
+	$defaults = array(
 		'title' => '',
 		'count' => 5,
-    );
+	);
 
-    $params = shortcode_atts($defaults, $atts);
+	$params = shortcode_atts($defaults, $atts);
 
-    $count = absint($params['count']);
-    if (0 == $count) {
-        $count = 1;
-    }
+	$count = absint($params['count']);
+	if (0 == $count) {
+		$count = 1;
+	}
 	
 	$title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
 
-    $comments_li = geodir_get_recent_reviews(30, $count, 100, false);
+	$comments_li = geodir_get_recent_reviews(30, $count, 100, false);
 
-    if ($comments_li) {
-        if ($title != '') { ?>
+	if ($comments_li) {
+		if ($title != '') { ?>
 		<h3 class="geodir-sc-recent-reviews-title widget-title"><?php echo $title; ?></h3>
 		<?php } ?>
         <div class="geodir_sc_recent_reviews_section">
             <ul class="geodir_sc_recent_reviews"><?php echo $comments_li; ?></ul>
         </div>
     <?php
-    }
-    $output = ob_get_contents();
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_related_listings', 'geodir_sc_related_listings');
@@ -950,64 +950,64 @@ 
  */
 function geodir_sc_related_listings($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_number' => 5,
-        'relate_to' => 'category',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => 0,
-        'listing_width' => '',
-        'list_sort' => 'latest',
-        'character_count' => 20,
-        'is_widget' => 1,
-        'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
-    );
-    // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Begin validating parameters
-     */
+	ob_start();
+	$defaults = array(
+		'post_number' => 5,
+		'relate_to' => 'category',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => 0,
+		'listing_width' => '',
+		'list_sort' => 'latest',
+		'character_count' => 20,
+		'is_widget' => 1,
+		'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
+	);
+	// The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
 
-    // Validate that post_number is a number and is 1 or higher
-    $params['post_number'] = absint($params['post_number']);
-    if (0 === $params['post_number']) {
-        $params['post_number'] = 1;
-    }
+	$params = shortcode_atts($defaults, $atts);
 
-    // Validate relate_to - only category or tags
-    $params['relate_to'] = geodir_strtolower($params['relate_to']);
-    if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
-        $params['relate_to'] = 'category';
-    }
+	/**
+	 * Begin validating parameters
+	 */
 
-    // Validate layout selection
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
+	// Validate that post_number is a number and is 1 or higher
+	$params['post_number'] = absint($params['post_number']);
+	if (0 === $params['post_number']) {
+		$params['post_number'] = 1;
+	}
 
-    // Validate sorting option
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+	// Validate relate_to - only category or tags
+	$params['relate_to'] = geodir_strtolower($params['relate_to']);
+	if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
+		$params['relate_to'] = 'category';
+	}
 
-    // Validate add_location_filter
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	// Validate layout selection
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
-    // Validate listing_width
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+	// Validate sorting option
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    // Validate character_count
-    $params['character_count'] = absint($params['character_count']);
-    if (20 > $params['character_count']) {
-        $params['character_count'] = 20;
-    }
+	// Validate add_location_filter
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
 
-    if ($related_display = geodir_related_posts_display($params)) {
-        echo $related_display;
-    }
-    $output = ob_get_contents();
+	// Validate listing_width
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    ob_end_clean();
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
 
-    return $output;
+	if ($related_display = geodir_related_posts_display($params)) {
+		echo $related_display;
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -1031,13 +1031,13 @@ 
  * @return string Advanced search widget HTML.
  */
 function geodir_sc_advanced_search($atts) {
-    $defaults = array(
+	$defaults = array(
 		'title' => '',
 		'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advance_search_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'show_adv_search' => 'default',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'show_adv_search' => 'default',
 		'post_type' => ''
 	);
 	
@@ -1061,9 +1061,9 @@ 
 	the_widget('geodir_advance_search_widget', $params, $params );
 	
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_advanced_search', 'geodir_sc_advanced_search');
 
@@ -1109,48 +1109,48 @@ 
 		'add_location_filter' => '1',
 		'tab_layout' => 'bestof-tabs-on-top',
 		'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-    /**
-     * Validate our incoming params
-     */
+	/**
+	 * Validate our incoming params
+	 */
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 	
 	// Post limit needs to be a positive integer
-    $params['post_limit'] = absint($params['post_limit']);
-    if (0 == $params['post_limit']) {
-        $params['post_limit'] = 5;
-    }
+	$params['post_limit'] = absint($params['post_limit']);
+	if (0 == $params['post_limit']) {
+		$params['post_limit'] = 5;
+	}
 	
 	// Category limit needs to be a positive integer
-    $params['categ_limit'] = absint($params['categ_limit']);
-    if (0 == $params['categ_limit']) {
-        $params['categ_limit'] = 3;
-    }
+	$params['categ_limit'] = absint($params['categ_limit']);
+	if (0 == $params['categ_limit']) {
+		$params['categ_limit'] = 3;
+	}
 	
 	// Tab layout validation
-    $params['tab_layout'] = $params['tab_layout'];
-    if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
-        $params['tab_layout'] = 'bestof-tabs-on-top';
-    }
+	$params['tab_layout'] = $params['tab_layout'];
+	if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
+		$params['tab_layout'] = 'bestof-tabs-on-top';
+	}
 	
 	// Validate character_count
-    $params['character_count'] = $params['character_count'];
+	$params['character_count'] = $params['character_count'];
 
 	ob_start();
 	the_widget('geodir_bestof_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_bestof_widget', 'geodir_sc_bestof_widget');
 
@@ -1198,127 +1198,127 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-    global $post;
-    $defaults = array(
-        'title'                 => '',
-        'post_type'             => 'gd_place',
-        'category'              => 0,
-        'list_sort'             => 'latest',
-        'event_type'            => '',
-        'post_number'           => 10,
-        'post_author'           => '',
-        'layout'                => 'gridview_onehalf',
-        'listing_width'         => '',
-        'character_count'       => 20,
-        'add_location_filter'   => 1,
-        'show_featured_only'    => '',
-        'show_special_only'     => '',
-        'with_pics_only'        => '',
-        'with_videos_only'      => '',
-        'with_pagination'       => '1',
-        'top_pagination'        => '0',
-        'bottom_pagination'     => '1',
-        'without_no_results'    => 0,
-        'tags'                  => ''
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    $params['title']        = wp_strip_all_tags($params['title']);
-    $params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy      = geodir_get_taxonomies($params['post_type']);
-    $categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category']     = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number']  = absint($params['post_number']);
-    $params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
+	global $post;
+	$defaults = array(
+		'title'                 => '',
+		'post_type'             => 'gd_place',
+		'category'              => 0,
+		'list_sort'             => 'latest',
+		'event_type'            => '',
+		'post_number'           => 10,
+		'post_author'           => '',
+		'layout'                => 'gridview_onehalf',
+		'listing_width'         => '',
+		'character_count'       => 20,
+		'add_location_filter'   => 1,
+		'show_featured_only'    => '',
+		'show_special_only'     => '',
+		'with_pics_only'        => '',
+		'with_videos_only'      => '',
+		'with_pagination'       => '1',
+		'top_pagination'        => '0',
+		'bottom_pagination'     => '1',
+		'without_no_results'    => 0,
+		'tags'                  => ''
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	$params['title']        = wp_strip_all_tags($params['title']);
+	$params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy      = geodir_get_taxonomies($params['post_type']);
+	$categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category']     = array_intersect($params['category'], $categories);
+
+	// Post_number needs to be a positive integer
+	$params['post_number']  = absint($params['post_number']);
+	$params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
     
-    // Post_number needs to be a positive integer
-    if (!empty($atts['post_author'])) {
-        if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
-            $params['post_author'] = $post->post_author;
-        } else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) {
-            $params['post_author'] = absint($atts['post_author']);
-        } else {
-            unset($params['post_author']);
-        }
-    } else {
-        unset($params['post_author']);
-    }
-
-    // Validate character_count
-    //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout']           = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort']        = gdsc_validate_sort_choice($params['list_sort']);
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
-    $params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
-    $params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
-    $params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
-
-    // Clean tags
-    if (!empty($params['tags'])) {
-        if (!is_array($params['tags'])) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $params['tags'] = str_replace($comma, ',', $params['tags']);
-            }
-            $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
-            $params['tags'] = array_map('trim', $params['tags']);
-        }
-    } else {
-        $params['tags'] = array();
-    }
-
-    /**
-     * End of validation
-     */
-    if (isset($atts['geodir_ajax'])) {
-        $params['geodir_ajax'] = $atts['geodir_ajax'];
-        unset($atts['geodir_ajax']);
-    }
-    if (isset($atts['pageno'])) {
-        $params['pageno'] = $atts['pageno'];
-        unset($atts['pageno']);
-    }
-
-    if ( !empty($atts['shortcode_content']) ) {
-        $content = $atts['shortcode_content'];
-    }
-    $params['shortcode_content'] = trim($content);
-    $atts['shortcode_content'] = trim($content);
+	// Post_number needs to be a positive integer
+	if (!empty($atts['post_author'])) {
+		if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
+			$params['post_author'] = $post->post_author;
+		} else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) {
+			$params['post_author'] = absint($atts['post_author']);
+		} else {
+			unset($params['post_author']);
+		}
+	} else {
+		unset($params['post_author']);
+	}
+
+	// Validate character_count
+	//todo: is this necessary?
+	$params['character_count']  = $params['character_count'];
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout']           = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort']        = gdsc_validate_sort_choice($params['list_sort']);
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
+	$params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
+	$params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
+	$params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
+
+	// Clean tags
+	if (!empty($params['tags'])) {
+		if (!is_array($params['tags'])) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$params['tags'] = str_replace($comma, ',', $params['tags']);
+			}
+			$params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
+			$params['tags'] = array_map('trim', $params['tags']);
+		}
+	} else {
+		$params['tags'] = array();
+	}
+
+	/**
+	 * End of validation
+	 */
+	if (isset($atts['geodir_ajax'])) {
+		$params['geodir_ajax'] = $atts['geodir_ajax'];
+		unset($atts['geodir_ajax']);
+	}
+	if (isset($atts['pageno'])) {
+		$params['pageno'] = $atts['pageno'];
+		unset($atts['pageno']);
+	}
+
+	if ( !empty($atts['shortcode_content']) ) {
+		$content = $atts['shortcode_content'];
+	}
+	$params['shortcode_content'] = trim($content);
+	$atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+	$params['shortcode_atts']       = $atts;
 
-    $output = geodir_sc_gd_listings_output($params);
+	$output = geodir_sc_gd_listings_output($params);
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_listings', 'geodir_sc_gd_listings');
 
@@ -1358,56 +1358,56 @@ 
  * @return string HTML content to display CPT categories.
  */
 function geodir_sc_cpt_categories_widget($atts, $content = '') {
-    $defaults = array(
-        'title' => '',
-        'post_type' => '', // NULL for all
-        'hide_empty' => '',
-        'show_count' => '',
-        'hide_icon' => '',
-        'cpt_left' => '',
-        'sort_by' => 'count',
-        'max_count' => 'all',
-        'max_level' => '1',
-        'no_cpt_filter' => '',
-        'no_cat_filter' => '',
-        'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
-    // Make sure we have an array
-    $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
-     
-    // Validate the checkboxes used on the widget
-    $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
-    $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+	$defaults = array(
+		'title' => '',
+		'post_type' => '', // NULL for all
+		'hide_empty' => '',
+		'show_count' => '',
+		'hide_icon' => '',
+		'cpt_left' => '',
+		'sort_by' => 'count',
+		'max_count' => 'all',
+		'max_level' => '1',
+		'no_cpt_filter' => '',
+		'no_cat_filter' => '',
+		'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+	);
+	$params = shortcode_atts($defaults, $atts);
 
-    if ($params['max_count'] != 'all') {
-        $params['max_count'] = absint($params['max_count']);
-    }
+	/**
+	 * Validate our incoming params
+	 */
+	// Make sure we have an array
+	$params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
+     
+	// Validate the checkboxes used on the widget
+	$params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
+	$params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
+	$params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
+	$params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+
+	if ($params['max_count'] != 'all') {
+		$params['max_count'] = absint($params['max_count']);
+	}
 
-    if ($params['max_level'] != 'all') {
-        $params['max_level'] = absint($params['max_level']);
-    }
+	if ($params['max_level'] != 'all') {
+		$params['max_level'] = absint($params['max_level']);
+	}
 
-    $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
-    $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
+	$params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
+	$params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
 
-    $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
+	$params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
 
-    ob_start();
-    the_widget('geodir_cpt_categories_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	ob_start();
+	the_widget('geodir_cpt_categories_widget', $params, $params);
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget');
 
@@ -1422,6 +1422,6 @@ 
  * @return string HTML code.
  */
 function geodir_sc_responsive_videos($atts, $content) {
-    return '<div class="geodir-video-wrapper">'.$content.'</div>';
+	return '<div class="geodir-video-wrapper">'.$content.'</div>';
 }
 add_shortcode('gd_video', 'geodir_sc_responsive_videos');
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -427,7 +427,7 @@
         }
 
         return $output;
-    }else{
+    } else{
         ob_start();
         add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
         add_action('the_post', 'create_list_jsondata'); // Add marker in json array

geodirectory-functions/map-functions/map_on_add_listing_page.php

Indentation +61 added lines, -61 removed lines

@@ -35,19 +35,19 @@ 
 $defaultcity = isset($default_location->city) ? $default_location->city : '';

 $lat_lng_blank = false;

 if ($lat == '' && $lng == '') {

-    $lat_lng_blank = true;

-    $city = $defaultcity;

-    $region = isset($default_location->region) ? $default_location->region : '';

-    $country = isset($default_location->country) ? $default_location->country : '';

-    $lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-    $lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+	$lat_lng_blank = true;

+	$city = $defaultcity;

+	$region = isset($default_location->region) ? $default_location->region : '';

+	$country = isset($default_location->country) ? $default_location->country : '';

+	$lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+	$lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 }

 $default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

-    $mapzoom = 4;

-    if (isset($_REQUEST['add_hood']))

-        $mapzoom = 10;

+	$mapzoom = 4;

+	if (isset($_REQUEST['add_hood']))

+		$mapzoom = 10;

 }

 

 /**

@@ -68,7 +68,7 @@ 
 	 * Fires at the start of the add javascript on the add lsitings map.

 	 *

 	 * @since 1.0.0

-     * @param string $prefix The prefix for all elements.

+	 * @param string $prefix The prefix for all elements.

 	 */

 	do_action('geodir_add_listing_js_start', $prefix);

 	?>

@@ -260,12 +260,12 @@ 
             // fix for regions in GB

 

             $country_arr = <?php

-            /**

-             * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1.

-             *

-             * @since 1.6.16

-             */

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

+			/**

+			 * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1.

+			 *

+			 * @since 1.6.16

+			 */

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

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

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

@@ -339,13 +339,13 @@ 
                 getZip = postal_code.long_name;

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

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

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

@@ -426,15 +426,15 @@ 
             }

         }

         <?php

-        /**

-         * Fires when marker address updated on map.

-         *

-         * @since 1.0.0

-         * @param string $prefix Identifier used as a prefix for field name

-         */

-        do_action('geodir_update_marker_address', $prefix);

-        echo $updateMarkerAddress = ob_get_clean();

-        ?>

+		/**

+		 * Fires when marker address updated on map.

+		 *

+		 * @since 1.0.0

+		 * @param string $prefix Identifier used as a prefix for field name

+		 */

+		do_action('geodir_update_marker_address', $prefix);

+		echo $updateMarkerAddress = ob_get_clean();

+		?>

     }

     function geodir_codeAddress(set_on_map) {

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

@@ -464,9 +464,9 @@ 
         }

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

         <?php ob_start();

-        $defaultregion = isset($default_location->region) ? $default_location->region : '';

-        $defaultcountry = isset($default_location->country) ? $default_location->country : '';

-        ?>

+		$defaultregion = isset($default_location->region) ? $default_location->region : '';

+		$defaultcountry = isset($default_location->country) ? $default_location->country : '';

+		?>

         if (set_on_map && is_restrict) {

             if (zip != '' && address != '') {

                 address = address + ',' + zip;

@@ -478,12 +478,12 @@ 
             if( address == city || address == region || address == country || address == zip )

                 address = '';

             <?php

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

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

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

                 address = '';

             }

             <?php

-               }?>

+			   }?>

 

             if (ISO2 == 'GB') {

                 address = address + ',' + city + ',' + country; // UK is funny with regions

@@ -499,15 +499,15 @@ 
             address =  address.replace(",null,", ",");

         }

         <?php $codeAddress = ob_get_clean();

-        /**

-         * Filter the address variable

-         *

-         * @since 1.0.0

-         *

-         * @param string $codeAddress Row of address to use in google map.

-         */

-        echo apply_filters('geodir_codeaddress', $codeAddress);

-        ?>

+		/**

+		 * Filter the address variable

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param string $codeAddress Row of address to use in google map.

+		 */

+		echo apply_filters('geodir_codeaddress', $codeAddress);

+		?>

         if (!window.gdMaps) { // No Google Map Loaded

             return;

         }

@@ -532,13 +532,13 @@ 
                         updateMarkerPosition(baseMarker.getPosition());

                         //if(set_on_map && is_restrict) {

                         <?php 

-                        /**

-                         * Fires before set geocode position.

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_add_listing_codeaddress_before_geocode');

-                        ?>

+						/**

+						 * Fires before set geocode position.

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_add_listing_codeaddress_before_geocode');

+						?>

                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

@@ -584,13 +584,13 @@ 
                 updateMarkerPositionOSM(baseMarker.getLatLng());

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

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

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

@@ -738,7 +738,7 @@ 
 <?php

 $set_button_class = 'geodir_button';

 if (is_admin())

-    $set_button_class = 'button-primary';

+	$set_button_class = 'button-primary';

 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

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

Spacing +79 added lines, -79 removed lines

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

     

     user_address = false;

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

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

         user_address = true;

     });

 

     baseMarker = '';

     geocoder = '';

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

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

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

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

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

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

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

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

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

     var oldstr_address;

     var oldstr_zip;

@@ -265,7 +265,7 @@ 
              *

              * @since 1.6.16

              */

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

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

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

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

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

             ?>

             <?php if ($is_map_restrict) { ?>

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

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

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

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

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

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

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

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

                 updateMarkerPosition(baseMarker.getPosition());

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

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

         } else {

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

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

         }

     }

     function centerMap(latlng) {

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

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

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

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

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

@@ -371,7 +371,7 @@ 
         }

     }

     function centerMarker() {

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

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

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

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

             baseMarker.setPosition(center);

@@ -380,48 +380,48 @@ 
         }

     }

     function updateMapZoom(zoom) {

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

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

     }

     function updateMarkerPosition(markerlatLng) {

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

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

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

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

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

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

     }

     function updateMarkerPositionOSM(markerlatLng) {

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

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

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

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

     }

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

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

-        <?php ob_start();?>

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

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

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

+        <?php ob_start(); ?>

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

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

         

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

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

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

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

         }

         if (getAddress) {

             oldstr_address = getAddress;

         }

 

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

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

         if (getZip) {

             oldstr_zip = getZip;

         }

         if (set_map_val_in_fields) {

             if (getCountry) {

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

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

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

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

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

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

             }

             if (getState) {

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

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

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

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

                 }

             }

             if (getCity) {

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

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

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

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

                 }

             }

         }

@@ -437,15 +437,15 @@ 
         ?>

     }

     function geodir_codeAddress(set_on_map) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

         }

         if (ISO2 == '--') {

             ISO2 = '';

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

         }

         if (typeof city == "undefined") {

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

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

         }

         if (typeof region == "undefined") {

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

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

         }

         if (typeof country == "undefined") {

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

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

         }

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

         <?php ob_start();

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

                 address = '';

             <?php

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

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

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

                 address = '';

             }

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

                 function (results, status) {

                     console.log(status);

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

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

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

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

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

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

                         //}

                     } else {

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

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

                     }

                 });

         }

     }

     function gdMaxMap() {

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

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

 

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

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

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

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

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

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

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

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

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

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

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

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

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

         window.setTimeout(function () {

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

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

             ?>

             <?php if ($is_map_restrict) { ?>

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

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

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

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

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

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

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

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

                 updateMarkerPositionOSM(baseMarker.getLatLng());

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

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

         } else {

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

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

         }

     }

     

     jQuery(function ($) {

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

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

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

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

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

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

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

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

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

             streetViewControl: true,

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

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

         });

 

         if (window.gdMaps) {

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

 

             baseMarker = $.goMap.createMarker({

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

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

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

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

                 id: 'baseMarker',

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

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

                 draggable: true,

                 addToMap: true, // For OSM

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

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

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

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

             });

         } else {

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

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

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

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

         }

         

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

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

             var set_on_map = true;

             geodir_codeAddress(set_on_map);

         });

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

             });

 

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

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

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

 

             <?php if ($is_map_restrict) { ?>

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

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

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

                 function (results, status) {

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

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

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

                         // Bounds for North America

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

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

                         );

                     } else {

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

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

                     }

                 });

             <?php } ?>

             // Limit the zoom level

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

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

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

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

             });

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

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

             });

 

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

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

 

             <?php if ($is_map_restrict) { ?>

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

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

             geocodePositionOSM('', CITY_ADDRESS);

             <?php } ?>

             // Limit the zoom level

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

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

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

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

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

         <!-- new map start -->

         <div class="iprelative">

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

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

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

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

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

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

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

         </div>

         <!-- new map end -->

     </div>

Braces +7 added lines, -5 removed lines

@@ -46,9 +46,10 @@ 
 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

     $mapzoom = 4;

-    if (isset($_REQUEST['add_hood']))

-        $mapzoom = 10;

-}

+    if (isset($_REQUEST['add_hood'])) {
+            $mapzoom = 10;
+    }
+    }

 

 /**

  * Filter the auto change address fields values

@@ -737,8 +738,9 @@ 
 </script>

 <?php

 $set_button_class = 'geodir_button';

-if (is_admin())

-    $set_button_class = 'button-primary';

+if (is_admin()) {
+    $set_button_class = 'button-primary';
+}
 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

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

geodirectory-functions/taxonomy_functions.php

Braces +169 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 . '">

@@ -159,8 +162,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');

@@ -176,8 +180,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.

                                      *

@@ -261,8 +266,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.

                                          *

@@ -319,8 +325,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;

 

@@ -406,24 +413,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 = '';
+    }
 

     if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

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

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

@@ -529,9 +541,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')) {

     /**

@@ -555,18 +568,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)]);
+                    }
                 }

 

             }

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

         }

 

-        if ($echo)

-            echo $html;

-        else

-            return $html;

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

 }

 

@@ -658,11 +675,12 @@ 
 

     }

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

-}

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

 

 

 /**

@@ -693,16 +711,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')) {

     /**

@@ -758,18 +778,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>';

                 }

 

@@ -778,8 +798,9 @@ 
 

             }

 

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

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

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

             return $out;

         }

@@ -805,18 +826,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;

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

@@ -1043,7 +1068,7 @@ 
 

         if(is_array( $exclude_cats)){

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

-        }else{

+        } else{

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1073,7 +1098,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>

@@ -1173,8 +1201,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" >';

 

@@ -1182,8 +1211,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 ) );

@@ -1248,8 +1278,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

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

     }

@@ -1552,8 +1583,9 @@ 
                             'city_slug' => $post->city_slug

                         );

 

-                    } else

-                        $post_location = geodir_get_location();

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

 

                 } else {

@@ -1582,8 +1614,9 @@ 
                             );

 

                         }

-                    } else

-                        $post_location = geodir_get_location();

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

 

 

@@ -1626,8 +1659,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);

@@ -1641,8 +1675,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.'/';

             }

 

@@ -1657,15 +1692,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

@@ -1857,11 +1897,12 @@ 
     

     $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

-}

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

 

 /**

  * Print or Get post type plural label.

@@ -1877,18 +1918,20 @@ 
 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

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

     

     $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

-}

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

 

 /**

  * Checks whether a term exists or not.

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

 

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

 }

Indentation +1225 added lines, -1225 removed lines

@@ -33,265 +33,265 @@ 
  */

 function geodir_add_nav_menu_items()

 {

-    $items = '';

-    // apply filter to add more navigations // -Filter-Location-Manager

-

-    if (get_option('geodir_show_listing_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('listing'))

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

-

-

-        //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

-        if (!empty($post_types)) {

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

-                if (!empty($show_post_type_main_nav)) {

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

-                            /**

-                             * Filter the menu li class.

-                             *

-                             * @since 1.0.0

-                             * @param string $menu_class The menu HTML class.

-                             */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                            /**

-                             * Filter the menu a class.

-                             *

-                             * @since 1.0.0

-                             */

-                            $a_class = apply_filters('geodir_menu_a_class', '');

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

+	$items = '';

+	// apply filter to add more navigations // -Filter-Location-Manager

+

+	if (get_option('geodir_show_listing_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('listing'))

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

+

+

+		//SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

+		if (!empty($post_types)) {

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

+				if (!empty($show_post_type_main_nav)) {

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

+							/**

+							 * Filter the menu li class.

+							 *

+							 * @since 1.0.0

+							 * @param string $menu_class The menu HTML class.

+							 */

+							$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+							/**

+							 * Filter the menu a class.

+							 *

+							 * @since 1.0.0

+							 */

+							$a_class = apply_filters('geodir_menu_a_class', '');

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

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

 										' . __(ucfirst($args->labels->name),'geodirectory') . '

 									</a>

 								</li>';

-                        }

-                    }

-                }

-            }

-        }

-        //END LISTING OF POST TYPE IN MAIN NAVIGATION

-

-        $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

-        $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

-        if ($is_listing_sub_meny_exists) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

+						}

+					}

+				}

+			}

+		}

+		//END LISTING OF POST TYPE IN MAIN NAVIGATION

+

+		$view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

+		$is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

+		if ($is_listing_sub_meny_exists) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

 					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

-            $post_types = geodir_get_posttypes('object');

+			$post_types = geodir_get_posttypes('object');

 

-            $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

+			$show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

 

-            if (!empty($post_types)) {

-                global $geodir_add_location_url;

-                $geodir_add_location_url = true;

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

-                    if (!empty($show_listing_post_types)) {

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

-                            if (get_post_type_archive_link($post_type)) {

+			if (!empty($post_types)) {

+				global $geodir_add_location_url;

+				$geodir_add_location_url = true;

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

+					if (!empty($show_listing_post_types)) {

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

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

+								$menu_class = '';

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

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

 

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

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

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

 															' . __(ucfirst($args->labels->name),'geodirectory') . '

 														</a>

 													</li>';

-                            }

-                        }

-                    }

-                }

-                $geodir_add_location_url = NULL;

-            }

+							}

+						}

+					}

+				}

+				$geodir_add_location_url = NULL;

+			}

 

-            $items .= '	</ul> ';

-            /**

-             * Filter called after the sub menu closing ul tag for dynamic added menu items.

-             *

-             * @since 1.5.9

-             */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

-        }

-    }

-

-    if (get_option('geodir_show_addlisting_nav')) {

-

-        $menu_class = '';

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

-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

-

-        if (!empty($post_types)) {

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

-                if (!empty($geodir_allow_posttype_frontend)) {

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

-                        if (!empty($show_add_listing_post_types_main_nav)) {

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

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

-                                    /**

-                                     * Filter the menu li class.

-                                     *

-                                     * @since 1.0.0

-                                     * @param string $menu_class The menu HTML class.

-                                     */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                    /**

-                                     * Filter the menu a class.

-                                     *

-                                     * @since 1.0.0

-                                     */

-                                    $a_class = apply_filters('geodir_menu_a_class', '');

-                                    $cpt_name = __($args->labels->singular_name, 'geodirectory');

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

+			$items .= '	</ul> ';

+			/**

+			 * Filter called after the sub menu closing ul tag for dynamic added menu items.

+			 *

+			 * @since 1.5.9

+			 */

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

+			$items .= '</li>';

+		}

+	}

+

+	if (get_option('geodir_show_addlisting_nav')) {

+

+		$menu_class = '';

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

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+

+		if (!empty($post_types)) {

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

+				if (!empty($geodir_allow_posttype_frontend)) {

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

+						if (!empty($show_add_listing_post_types_main_nav)) {

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

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

+									/**

+									 * Filter the menu li class.

+									 *

+									 * @since 1.0.0

+									 * @param string $menu_class The menu HTML class.

+									 */

+									$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+									/**

+									 * Filter the menu a class.

+									 *

+									 * @since 1.0.0

+									 */

+									$a_class = apply_filters('geodir_menu_a_class', '');

+									$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 ) . '

 											</a>

 										</li>';

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-        //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-    }

-

-    $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

-    $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

-    if ($is_add_listing_sub_meny_exists) {

-

-        if (get_option('geodir_show_addlisting_nav')) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		//END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+	}

+

+	$view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

+	$is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

+	if ($is_add_listing_sub_meny_exists) {

+

+		if (get_option('geodir_show_addlisting_nav')) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

 					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

 

-            $post_types = geodir_get_posttypes('object');

-

-            $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

-

-            if (!empty($post_types)) {

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

-                    if (!empty($geodir_allow_posttype_frontend)) {

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

-                            if (!empty($show_add_listing_post_types)) {

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

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

-                                        /**

-                                         * Filter the menu li class.

-                                         *

-                                         * @since 1.0.0

-                                         * @param string $menu_class The menu HTML class.

-                                         */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                        $cpt_name = __($args->labels->singular_name, 'geodirectory');

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

+			$post_types = geodir_get_posttypes('object');

+

+			$show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

+

+			if (!empty($post_types)) {

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

+					if (!empty($geodir_allow_posttype_frontend)) {

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

+							if (!empty($show_add_listing_post_types)) {

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

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

+										/**

+										 * Filter the menu li class.

+										 *

+										 * @since 1.0.0

+										 * @param string $menu_class The menu HTML class.

+										 */

+										$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+										$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 ) . '

 														</a>

 													</li>';

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

+									}

+								}

+							}

+						}

+					}

+				}

+			}

 

-            $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

+			$items .= '	</ul> ';

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

+			$items .= '</li>';

 

-        }

-    }

-    // apply filter to add more navigations // -Filter-Location-Manager

-    return $items;

+		}

+	}

+	// apply filter to add more navigations // -Filter-Location-Manager

+	return $items;

 }

 

 

@@ -309,20 +309,20 @@ 
  */

 function geodir_pagemenu_items($menu, $args)

 {

-    $locations = get_nav_menu_locations();

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

-    $geodir_theme_location_nav = array();

-    if (empty($locations) && empty($geodir_theme_location)) {

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

-        $geodir_theme_location_nav[] = $args['theme_location'];

-        update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

-    }

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

+	$locations = get_nav_menu_locations();

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location_nav = array();

+	if (empty($locations) && empty($geodir_theme_location)) {

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

+		$geodir_theme_location_nav[] = $args['theme_location'];

+		update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

+	}

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

+	return $menu;

 

 }

 

@@ -342,18 +342,18 @@ 
 function geodir_menu_items($items, $args)

 {

 

-    $location = $args->theme_location;

+	$location = $args->theme_location;

 

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

 

-    if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

+	if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

-        return $items;

+		$items = $items . geodir_add_nav_menu_items();

+		return $items;

 

-    } else {

-        return $items;

-    }

+	} else {

+		return $items;

+	}

 }

 

 /**

@@ -368,25 +368,25 @@ 
  */

 function geodir_get_category_all_array()

 {

-    global $wpdb;

-    $return_array = array();

-

-    $taxonomies = geodir_get_taxonomies();

-    $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

-

-    $pn_categories = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

-        )

-    );

-

-    foreach ($pn_categories as $pn_categories_obj) {

-        $return_array[] = array("id" => $pn_categories_obj->cat_ID,

-            "title" => $pn_categories_obj->name,);

-    }

-    return $return_array;

+	global $wpdb;

+	$return_array = array();

+

+	$taxonomies = geodir_get_taxonomies();

+	$taxonomies = implode("','", $taxonomies);

+	$taxonomies = "'" . $taxonomies . "'";

+

+	$pn_categories = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

+			array($wpdb->terms . term_id)

+		)

+	);

+

+	foreach ($pn_categories as $pn_categories_obj) {

+		$return_array[] = array("id" => $pn_categories_obj->cat_ID,

+			"title" => $pn_categories_obj->name,);

+	}

+	return $return_array;

 }

 

 

@@ -401,41 +401,41 @@ 
  */

 function geodir_get_current_posttype()

 {

-    global $wp_query, $geodir_post_type;

+	global $wp_query, $geodir_post_type;

 

-    $geodir_post_type = get_query_var('post_type');

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

+	$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 = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

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

-    }

+	if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

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

+	}

 

 

-    /**

-     * Filter the default CPT return.

-     *

-     * @since 1.6.9

-     */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+	/**

+	 * Filter the default CPT return.

+	 *

+	 * @since 1.6.9

+	 */

+	return apply_filters('geodir_get_current_posttype',$geodir_post_type);

 }

 

 /**

@@ -449,22 +449,22 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

-

-    $stype = false;

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

-        global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

-            $stype = $post_type; break;

-        }

-    }

-

-    if(!$stype){

-        $stype = 'gd_place';

-    }

-

-    return $stype;

+	$post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+

+	$stype = false;

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

+		global $wpdb;

+		$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

+		if ( $has_posts ) {

+			$stype = $post_type; break;

+		}

+	}

+

+	if(!$stype){

+		$stype = 'gd_place';

+	}

+

+	return $stype;

 }

 

 /**

@@ -478,21 +478,21 @@ 
  */

 function geodir_get_posttypes($output = 'names')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types)) {

-        switch ($output):

-            case 'object':

-            case 'Object':

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

-                break;

-            case 'array':

-            case 'Array':

-                $post_types = (array)$post_types;

-                break;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types)) {

+		switch ($output):

+			case 'object':

+			case 'Object':

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

+				break;

+			case 'array':

+			case 'Array':

+				$post_types = (array)$post_types;

+				break;

 			case 'options':

-                $post_types = (array)$post_types;

+				$post_types = (array)$post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -501,17 +501,17 @@ 
 					}

 				}

 				$post_types = $options;

-                break;

-            default:

-                $post_types = array_keys($post_types);

-                break;

-        endswitch;

-    }

-

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

+				break;

+			default:

+				$post_types = array_keys($post_types);

+				break;

+		endswitch;

+	}

+

+	if (!empty($post_types))

+		return $post_types;

+	else

+		return array();

 }

 

 /**

@@ -524,108 +524,108 @@ 
  */

 function geodir_get_posttype_info($post_type = '')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

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

-        return $post_types[$post_type];

-    } else

-        return false;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

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

+		return $post_types[$post_type];

+	} else

+		return false;

 }

 

 if (!function_exists('geodir_get_taxonomies')) {

-    /**

-     * Get all custom taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @return array|bool Taxonomies on success. false on failure.

-     */

-    function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)

-    {

+	/**

+	 * Get all custom taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @return array|bool Taxonomies on success. false on failure.

+	 */

+	function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)

+	{

 

-        $taxonomies = array();

-        $gd_taxonomies = array();

+		$taxonomies = array();

+		$gd_taxonomies = array();

 

-        if ($taxonomies = get_option('geodir_taxonomies')) {

+		if ($taxonomies = get_option('geodir_taxonomies')) {

 

 

-            $gd_taxonomies = array_keys($taxonomies);

+			$gd_taxonomies = array_keys($taxonomies);

 

 

-            if ($post_type != '')

-                $gd_taxonomies = array();

+			if ($post_type != '')

+				$gd_taxonomies = array();

 

-            $i = 0;

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

+			$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 ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

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

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

+				}

 

-            }

+			}

+

+			$gd_taxonomies = array_values($gd_taxonomies);

+		}

 

-            $gd_taxonomies = array_values($gd_taxonomies);

-        }

-

-        /**

-         * Filter the taxonomies.

-         *

-         * @since 1.0.0

-         * @param array $gd_taxonomies The taxonomy array.

-         */

-        $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

-

-        if (!empty($taxonomies)) {

-            return $taxonomies;

-        } else {

-            return false;

-        }

-    }

+		/**

+		 * Filter the taxonomies.

+		 *

+		 * @since 1.0.0

+		 * @param array $gd_taxonomies The taxonomy array.

+		 */

+		$taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

+

+		if (!empty($taxonomies)) {

+			return $taxonomies;

+		} else {

+			return false;

+		}

+	}

 }

 

 if (!function_exists(' geodir_get_categories_dl')) {

-    /**

-     * Get categories dropdown HTML.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param string $selected The selected value.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @param bool $echo Prints the HTML when set to true. Default: true.

-     * @return void|string Dropdown HTML.

-     */

-    function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

-    {

-

-        $html = '';

-        $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

-

-        $categories = get_terms($taxonomies);

-

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

-

-        foreach ($categories as $category_obj) {

-            $select_opt = '';

-            if ($selected == $category_obj->term_id) {

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

-            }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . ucfirst($category_obj->name) . '</option>';

-        }

-

-        if ($echo)

-            echo $html;

-        else

-            return $html;

-    }

+	/**

+	 * Get categories dropdown HTML.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param string $selected The selected value.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @param bool $echo Prints the HTML when set to true. Default: true.

+	 * @return void|string Dropdown HTML.

+	 */

+	function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

+	{

+

+		$html = '';

+		$taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

+

+		$categories = get_terms($taxonomies);

+

+		$html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+

+		foreach ($categories as $category_obj) {

+			$select_opt = '';

+			if ($selected == $category_obj->term_id) {

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

+			}

+			$html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

+				. ucfirst($category_obj->name) . '</option>';

+		}

+

+		if ($echo)

+			echo $html;

+		else

+			return $html;

+	}

 }

 

 

@@ -640,28 +640,28 @@ 
 function geodir_get_listing_slug($object_type = '')

 {

 

-    $listing_slug = '';

+	$listing_slug = '';

 

-    $post_types = get_option('geodir_post_types');

-    $taxonomies = get_option('geodir_taxonomies');

+	$post_types = get_option('geodir_post_types');

+	$taxonomies = get_option('geodir_taxonomies');

 

 

-    if ($object_type != '') {

-        if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

+	if ($object_type != '') {

+		if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

 

-            $object_info = $post_types[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

-            $object_info = $taxonomies[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        }

+			$object_info = $post_types[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		} elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

+			$object_info = $taxonomies[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		}

 

-    }

+	}

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

+	if (!empty($listing_slug))

+		return $listing_slug;

+	else

+		return false;

 }

 

 

@@ -676,212 +676,212 @@ 
  */

 function geodir_get_taxonomy_posttype($taxonomy = '')

 {

-    global $wp_query;

-

-    $post_type = array();

-    $taxonomies = array();

-

-    if (!empty($taxonomy)) {

-        $taxonomies[] = $taxonomy;

-    } 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']);}

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

-    }

-

-    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 (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

+	global $wp_query;

+

+	$post_type = array();

+	$taxonomies = array();

+

+	if (!empty($taxonomy)) {

+		$taxonomies[] = $taxonomy;

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

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

+	}

+

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

+		return $post_type[0];

+	else

+		return false;

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param int $cat_parent The parent term ID.

-     * @param bool $hide_empty Hide empty taxonomies? Default: false.

-     * @param int $pading CSS padding in pixels.

-     * @return string|void taxonomy HTML.

-     */

-    function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

-    {

-        global $cat_display, $post_cat, $exclude_cats;

-

-        $search_terms = trim($post_cat, ",");

-

-        $search_terms = explode(",", $search_terms);

-

-        $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

-

-        $display = '';

-        $onchange = '';

-        $term_check = '';

-        $main_list_class = '';

-        $out = '';

-        //If there are terms, start displaying

-        if (count($cat_terms) > 0) {

-            //Displaying as a list

-            $p = $pading * 20;

-            $pading++;

-

-

-            if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

-                if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

-                    $main_list_class = 'class="main_list_selecter"';

-                } else {

-                    //$display = 'display:none';

-                    $list_class = 'sub_list gd-sub-cats-list';

-                }

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param int $cat_parent The parent term ID.

+	 * @param bool $hide_empty Hide empty taxonomies? Default: false.

+	 * @param int $pading CSS padding in pixels.

+	 * @return string|void taxonomy HTML.

+	 */

+	function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

+	{

+		global $cat_display, $post_cat, $exclude_cats;

+

+		$search_terms = trim($post_cat, ",");

+

+		$search_terms = explode(",", $search_terms);

+

+		$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

+

+		$display = '';

+		$onchange = '';

+		$term_check = '';

+		$main_list_class = '';

+		$out = '';

+		//If there are terms, start displaying

+		if (count($cat_terms) > 0) {

+			//Displaying as a list

+			$p = $pading * 20;

+			$pading++;

+

+

+			if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

+				if ($cat_parent == 0) {

+					$list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+					$main_list_class = 'class="main_list_selecter"';

+				} else {

+					//$display = 'display:none';

+					$list_class = 'sub_list gd-sub-cats-list';

+				}

+			}

 

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

-                $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

-            }

+			if ($cat_display == 'checkbox' || $cat_display == 'radio') {

+				$p = 0;

+				$out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+			}

 

-            foreach ($cat_terms as $cat_term) {

+			foreach ($cat_terms as $cat_term) {

 

-                $checked = '';

+				$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 (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 == '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>';

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

-                }

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

+				}

 

-                // Call recurson to print sub cats

-                $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

+				// Call recurson to print sub cats

+				$out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

 

-            }

+			}

 

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

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

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

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

 

-            return $out;

-        }

-        return;

-    }

+			return $out;

+		}

+		return;

+	}

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker2')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post WordPress Post object.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param string $cat_limit Number of categories to display.

-     */

-    function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

-    {

-        $post_category = '';

-        $post_category_str = '';

-        global $exclude_cats, $gd_session;

-

-        $cat_exclude = '';

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

-

-            $post_categories = $post->post_category_str;

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

-

-            $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

-            if (empty($post_category) && isset($post->{$cat_taxonomy})) {

-                $post_category = $post->{$cat_taxonomy};

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post WordPress Post object.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param string $cat_limit Number of categories to display.

+	 */

+	function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

+	{

+		$post_category = '';

+		$post_category_str = '';

+		global $exclude_cats, $gd_session;

+

+		$cat_exclude = '';

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

+

+			$post_categories = $post->post_category_str;

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

+

+			$post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

+			if (empty($post_category) && isset($post->{$cat_taxonomy})) {

+				$post_category = $post->{$cat_taxonomy};

+			}

 

-            $post_categories = get_post_meta($post->ID, 'post_categories', true);

+			$post_categories = get_post_meta($post->ID, 'post_categories', true);

 

-            if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

-                foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

-                    if (is_numeric($cat_part)) {

-                        $cat_part_arr[] = $cat_part;

-                    }

-                }

-                if (is_array($cat_part_arr)) {

-                    $post_category = implode(',', $cat_part_arr);

-                }

-            }

+			if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

+				foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

+					if (is_numeric($cat_part)) {

+						$cat_part_arr[] = $cat_part;

+					}

+				}

+				if (is_array($cat_part_arr)) {

+					$post_category = implode(',', $cat_part_arr);

+				}

+			}

 

-            if (!empty($post_category)) {

-                $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+			if (!empty($post_category)) {

+				$cat1 = array_filter(explode(',', $post_category));

+				$post_category = ',' . implode(',', $cat1) . ',';

 

-            }

+			}

 

-            if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

+			if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

 

-                $post_category_upd = explode(',', $post_category);

-                $post_category_change = '';

-                foreach ($post_category_upd as $cat) {

+				$post_category_upd = explode(',', $post_category);

+				$post_category_change = '';

+				foreach ($post_category_upd as $cat) {

 

-                    if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

-                    }

-                }

-                $post_category = $post_category_change;

-            }

+					if (!in_array($cat, $exclude_cats) && $cat != '') {

+						$post_category_change .= ',' . $cat;

+					}

+				}

+				$post_category = $post_category_change;

+			}

 

 

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

+			}

+		}

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

 

 

-        ?>

+		?>

         <div class="cat_sublist">

             <?php

 

-            $post_id = isset($post->ID) ? $post->ID : '';

+			$post_id = isset($post->ID) ? $post->ID : '';

 

-            if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

+			if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

 

-                geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

-            }

-            ?>

+				geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

+			}

+			?>

         </div>

         <script type="text/javascript">

 

@@ -1004,22 +1004,22 @@ 
 

         </script>

         <?php

-        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 (!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;";

+		}

+		?>

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

-            echo $style;

-        }?> ">

+			echo $style;

+		}?> ">

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

-            ?>

+			?>

         </div>

     <?php

 

-    }

+	}

 }

 

 /**

@@ -1036,23 +1036,23 @@ 
  */

 function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '')

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    if ($exclude != '') {

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

+	if ($exclude != '') {

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

 

-        if(is_array( $exclude_cats)){

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

-        }else{

-            $exclude_cats = intval($exclude_cats);

-        }

+		if(is_array( $exclude_cats)){

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

+		}else{

+			$exclude_cats = intval($exclude_cats);

+		}

 

-    }

+	}

 

-    if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

-        (!is_array($exclude_cats) || empty($exclude_cats))

-    ) {

-        ?>

+	if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

+		(!is_array($exclude_cats) || empty($exclude_cats))

+	) {

+		?>

 

         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

@@ -1081,8 +1081,8 @@ 
 

             <br/>

             <?php

-            $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

-            if (!empty($cat_terms)) { ?>

+			$cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

+			if (!empty($cat_terms)) { ?>

                 <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>

                 <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?>

             <?php } ?>

@@ -1104,53 +1104,53 @@ 
 function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories)

 {

 

-    if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

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

+	if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

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

 

 			foreach ($post_cat_array as $post_cat_html) {

 

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

-                $post_maincat_str = $post_cat_info[0];

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

+				$post_maincat_str = $post_cat_info[0];

 

-                if (!empty($post_maincat_str)) {

-                    $post_maincat_info = explode(",", $post_maincat_str);

-                    $post_maincat_id = $post_maincat_info[0];

-                    ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                    (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-                }

-                $post_sub_catid = '';

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

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

-                }

+				if (!empty($post_maincat_str)) {

+					$post_maincat_info = explode(",", $post_maincat_str);

+					$post_maincat_id = $post_maincat_info[0];

+					($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+					(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+				}

+				$post_sub_catid = '';

+				if (isset($post_cat_info[1]) && !empty($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);

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

 

-            }

-        } else {

+			}

+		} else {

 

-            $post_cat_info = explode(":", $post_cat_str);

-            $post_maincat_str = $post_cat_info[0];

+			$post_cat_info = explode(":", $post_cat_str);

+			$post_maincat_str = $post_cat_info[0];

 

-            $post_sub_catid = '';

+			$post_sub_catid = '';

 

-            if (!empty($post_maincat_str)) {

-                $post_maincat_info = explode(",", $post_maincat_str);

-                $post_maincat_id = $post_maincat_info[0];

-                ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-            }

+			if (!empty($post_maincat_str)) {

+				$post_maincat_info = explode(",", $post_maincat_str);

+				$post_maincat_id = $post_maincat_info[0];

+				($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+				(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+			}

 

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

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

-            }

+			if (isset($post_cat_info[1]) && !empty($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);

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

 

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -1164,35 +1164,35 @@ 
  */

 function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false)

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

 

-    if (!empty($cat_terms)) {

-        $onchange = '';

-        $onchange = ' onchange="show_subcatlist(this.value, this)" ';

+	if (!empty($cat_terms)) {

+		$onchange = '';

+		$onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

-        $option_selected = '';

-        if (!$selected)

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

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

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

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+		echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

 

-        foreach ($cat_terms as $cat_term) {

-            $option_selected = '';

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

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

+		foreach ($cat_terms as $cat_term) {

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

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

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

 

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

-        }

-        echo '</select>';

-    }

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

+		}

+		echo '</select>';

+	}

 }

 

 /**

@@ -1208,28 +1208,28 @@ 
  */

 function geodir_custom_update_messages($messages)

 {

-    global $post, $post_ID;

-

-    $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

-

-    foreach ($post_types as $post_type => $post_object) {

-

-        $messages[$post_type] = array(

-            0 => '', // Unused. Messages start at index 1.

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

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

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

-            9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            10 => sprintf(__('%s draft updated. <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),

-        );

-    }

-

-    return $messages;

+	global $post, $post_ID;

+

+	$post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

+

+	foreach ($post_types as $post_type => $post_object) {

+

+		$messages[$post_type] = array(

+			0 => '', // Unused. Messages start at index 1.

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

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

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

+			9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			10 => sprintf(__('%s draft updated. <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),

+		);

+	}

+

+	return $messages;

 }

 

 

@@ -1244,183 +1244,183 @@ 
 function geodir_register_defaults()

 {

 

-    global $wpdb;

-

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

-

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

-        $listing_slug = 'places';

-

-    /**

-     * Taxonomies

-     **/

-    //if ( ! taxonomy_exists('gd_place_tags') )

-    {

-

-        $gd_placetags = array();

-        $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

-        $gd_placetags['args'] = array(

-            'public' => true,

-            'hierarchical' => false,

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

-            'query_var' => true,

-

-            'labels' => array(

-                'name' => __('Place Tags', 'geodirectory'),

-                'singular_name' => __('Place Tag', 'geodirectory'),

-                'search_items' => __('Search Place Tags', 'geodirectory'),

-                'popular_items' => __('Popular Place Tags', 'geodirectory'),

-                'all_items' => __('All Place Tags', 'geodirectory'),

-                'edit_item' => __('Edit Place Tag', 'geodirectory'),

-                'update_item' => __('Update Place Tag', 'geodirectory'),

-                'add_new_item' => __('Add New Place Tag', 'geodirectory'),

-                'new_item_name' => __('New Place Tag Name', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

-                'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

-                'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_place_tags'] = $gd_placetags;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-

-    }

-

-    //if ( ! taxonomy_exists('gd_placecategory') )

-    {

-

-        $gd_placecategory = array();

-        $gd_placecategory['object_type'] = 'gd_place';

-        $gd_placecategory['listing_slug'] = $listing_slug;

-        $gd_placecategory['args'] = array(

-            'public' => true,

-            'hierarchical' => true,

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

-            'query_var' => true,

-            'labels' => array(

-                'name' => __('Place Categories', 'geodirectory'),

-                'singular_name' => __('Place Category', 'geodirectory'),

-                'search_items' => __('Search Place Categories', 'geodirectory'),

-                'popular_items' => __('Popular Place Categories', 'geodirectory'),

-                'all_items' => __('All Place Categories', 'geodirectory'),

-                'edit_item' => __('Edit Place Category', 'geodirectory'),

-                'update_item' => __('Update Place Category', 'geodirectory'),

-                'add_new_item' => __('Add New Place Category', 'geodirectory'),

-                'new_item_name' => __('New Place Category', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        flush_rewrite_rules();

-    }

-

-    /**

-     * Post Types

-     **/

-

-    //if ( ! post_type_exists('gd_place') )

-    {

-

-        $labels = array(

-            'name' => __('Places', 'geodirectory'),

-            'singular_name' => __('Place', 'geodirectory'),

-            'add_new' => __('Add New', 'geodirectory'),

-            'add_new_item' => __('Add New Place', 'geodirectory'),

-            'edit_item' => __('Edit Place', 'geodirectory'),

-            'new_item' => __('New Place', 'geodirectory'),

-            'view_item' => __('View Place', 'geodirectory'),

-            'search_items' => __('Search Places', 'geodirectory'),

-            'not_found' => __('No Place Found', 'geodirectory'),

-            'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

-

-        $place_default = array(

-            'labels' => $labels,

-            'can_export' => true,

-            'capability_type' => 'post',

-            'description' => 'Place post type.',

-            'has_archive' => $listing_slug,

-            'hierarchical' => false,

-            'map_meta_cap' => true,

-            'menu_icon' => $menu_icon,

-            'public' => true,

-            'query_var' => true,

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

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

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

-

-        //Update custom post types

-        $geodir_post_types = get_option('geodir_post_types');

-        $geodir_post_types['gd_place'] = $place_default;

-        update_option('geodir_post_types', $geodir_post_types);

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-    }

-

-

-    geodir_register_taxonomies();

-    geodir_register_post_types();

-

-    //die;

+	global $wpdb;

+

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

+

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

+		$listing_slug = 'places';

+

+	/**

+	 * Taxonomies

+	 **/

+	//if ( ! taxonomy_exists('gd_place_tags') )

+	{

+

+		$gd_placetags = array();

+		$gd_placetags['object_type'] = 'gd_place';

+		$gd_placetags['listing_slug'] = $listing_slug . '/tags';

+		$gd_placetags['args'] = array(

+			'public' => true,

+			'hierarchical' => false,

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

+			'query_var' => true,

+

+			'labels' => array(

+				'name' => __('Place Tags', 'geodirectory'),

+				'singular_name' => __('Place Tag', 'geodirectory'),

+				'search_items' => __('Search Place Tags', 'geodirectory'),

+				'popular_items' => __('Popular Place Tags', 'geodirectory'),

+				'all_items' => __('All Place Tags', 'geodirectory'),

+				'edit_item' => __('Edit Place Tag', 'geodirectory'),

+				'update_item' => __('Update Place Tag', 'geodirectory'),

+				'add_new_item' => __('Add New Place Tag', 'geodirectory'),

+				'new_item_name' => __('New Place Tag Name', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

+				'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

+				'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_place_tags'] = $gd_placetags;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+

+	}

+

+	//if ( ! taxonomy_exists('gd_placecategory') )

+	{

+

+		$gd_placecategory = array();

+		$gd_placecategory['object_type'] = 'gd_place';

+		$gd_placecategory['listing_slug'] = $listing_slug;

+		$gd_placecategory['args'] = array(

+			'public' => true,

+			'hierarchical' => true,

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

+			'query_var' => true,

+			'labels' => array(

+				'name' => __('Place Categories', 'geodirectory'),

+				'singular_name' => __('Place Category', 'geodirectory'),

+				'search_items' => __('Search Place Categories', 'geodirectory'),

+				'popular_items' => __('Popular Place Categories', 'geodirectory'),

+				'all_items' => __('All Place Categories', 'geodirectory'),

+				'edit_item' => __('Edit Place Category', 'geodirectory'),

+				'update_item' => __('Update Place Category', 'geodirectory'),

+				'add_new_item' => __('Add New Place Category', 'geodirectory'),

+				'new_item_name' => __('New Place Category', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		flush_rewrite_rules();

+	}

+

+	/**

+	 * Post Types

+	 **/

+

+	//if ( ! post_type_exists('gd_place') )

+	{

+

+		$labels = array(

+			'name' => __('Places', 'geodirectory'),

+			'singular_name' => __('Place', 'geodirectory'),

+			'add_new' => __('Add New', 'geodirectory'),

+			'add_new_item' => __('Add New Place', 'geodirectory'),

+			'edit_item' => __('Edit Place', 'geodirectory'),

+			'new_item' => __('New Place', 'geodirectory'),

+			'view_item' => __('View Place', 'geodirectory'),

+			'search_items' => __('Search Places', 'geodirectory'),

+			'not_found' => __('No Place Found', 'geodirectory'),

+			'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

+

+		$place_default = array(

+			'labels' => $labels,

+			'can_export' => true,

+			'capability_type' => 'post',

+			'description' => 'Place post type.',

+			'has_archive' => $listing_slug,

+			'hierarchical' => false,

+			'map_meta_cap' => true,

+			'menu_icon' => $menu_icon,

+			'public' => true,

+			'query_var' => true,

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

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

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

+

+		//Update custom post types

+		$geodir_post_types = get_option('geodir_post_types');

+		$geodir_post_types['gd_place'] = $place_default;

+		update_option('geodir_post_types', $geodir_post_types);

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+	}

+

+

+	geodir_register_taxonomies();

+	geodir_register_post_types();

+

+	//die;

 

 }

 

 $gd_wpml_get_languages = "";

 function gd_wpml_get_lang_from_url($url){

 

-    global $gd_wpml_get_languages;

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

+	global $gd_wpml_get_languages;

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

 

 

-    //

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

+	//

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

 

-    // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

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

+	// site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

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

 

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

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

 

 

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

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

 

-    //print_r( $segments);

-    if($gd_wpml_get_languages){

-        $langs = $gd_wpml_get_languages;

-    }else{

-        global $sitepress;

-        $gd_wpml_get_languages = $sitepress->get_active_languages();

-    }

+	//print_r( $segments);

+	if($gd_wpml_get_languages){

+		$langs = $gd_wpml_get_languages;

+	}else{

+		global $sitepress;

+		$gd_wpml_get_languages = $sitepress->get_active_languages();

+	}

 

-    if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

-        return $segments[0];

-    }

+	if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

+		return $segments[0];

+	}

 

-    return false;

+	return false;

 

 

 }

 

 function gd_wpml_slug_translation_turned_on($post_type) {

 

-    global $sitepress;

-    $settings = $sitepress->get_settings();

-    return isset($settings['posts_slug_translation']['types'][$post_type])

-    && $settings['posts_slug_translation']['types'][$post_type]

-    && isset($settings['posts_slug_translation']['on'])

-    && $settings['posts_slug_translation']['on'];

+	global $sitepress;

+	$settings = $sitepress->get_settings();

+	return isset($settings['posts_slug_translation']['types'][$post_type])

+	&& $settings['posts_slug_translation']['types'][$post_type]

+	&& isset($settings['posts_slug_translation']['on'])

+	&& $settings['posts_slug_translation']['on'];

 }

 

 

@@ -1445,150 +1445,150 @@ 
  */

 function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample)

 {

-    //echo $post_link."<br />".$sample ;

+	//echo $post_link."<br />".$sample ;

 

 

-    global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

-    if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-    } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {

-        return $post_link;

-    } else {

-        $orig_post = $post;

-        $post = $post_obj;

-    }

+	global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

+	if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

+	} elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {

+		return $post_link;

+	} else {

+		$orig_post = $post;

+		$post = $post_obj;

+	}

 

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

+	if (in_array($post->post_type, geodir_get_posttypes())) {

 

 

-        $post_types = get_option('geodir_post_types');

-        $slug = $post_types[$post->post_type]['rewrite']['slug'];

+		$post_types = get_option('geodir_post_types');

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

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

 

-                $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

-                    $slug,

-                    'WordPress',

-                    'URL slug: ' . $slug,

-                    $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters( 'wpml_translate_single_string',

+					$slug,

+					'WordPress',

+					'URL slug: ' . $slug,

+					$language_code);

 

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

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

 

-            }

-        }

+			}

+		}

 

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

         

-        // 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 slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

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

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-

-        $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 (isset($comment_post_cache[$post->ID])) {

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

-        }

-        if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

-            $post_id = $post->ID;

-            if (isset($orig_post)) {

-                $post = $orig_post;

-            }

-            return $gd_permalink_cache[$post_id];

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

 

-        if (!isset($post->post_locations)) {

-            $post_type = $post->post_type;

-            $ID = $post->ID;

-            $post2 = $wpdb->get_row(

-                $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                    array($post->ID)

-                )

-            );

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

+		if ($fix_url) {

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

+		}

 

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

+		$post_link = trailingslashit(

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

+		);

 

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

-        }

+		if ($fix_url) {

+			$post_link = $site_url . $post_link;

+		}

 

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

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

+		}

+		if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

+			$post_id = $post->ID;

+			if (isset($orig_post)) {

+				$post = $orig_post;

+			}

+			return $gd_permalink_cache[$post_id];

+		}

 

+		if (!isset($post->post_locations)) {

+			$post_type = $post->post_type;

+			$ID = $post->ID;

+			$post2 = $wpdb->get_row(

+				$wpdb->prepare(

+					"SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+					array($post->ID)

+				)

+			);

 

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

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

 

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

-                $location_request = '';

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

+		}

 

 

-                if (!empty($post->post_locations)) {

-                    $geodir_arr_locations = explode(',', $post->post_locations);

-                    if (count($geodir_arr_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

-                        $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

-                            'region_slug' => $post->region_slug,

-                            'city_slug' => $post->city_slug

-                        );

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

 

-                    } else

-                        $post_location = geodir_get_location();

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

+				$location_request = '';

 

 

-                } else {

+				if (!empty($post->post_locations)) {

+					$geodir_arr_locations = explode(',', $post->post_locations);

+					if (count($geodir_arr_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

+						$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

 

-                    $post_location_sql = $wpdb->get_results(

-                        $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                            array($post->ID)

-                        )

-                    );

-

-                    if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

-

-                        $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

-                        if (count($geodir_arr_locations) == 3) {

-                            $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

-                            $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

-                                'region_slug' => $post->region_slug,

-                                'city_slug' => $post->city_slug

-                            );

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

+							'region_slug' => $post->region_slug,

+							'city_slug' => $post->city_slug

+						);

 

-                        }

-                    } else

-                        $post_location = geodir_get_location();

-                }

+					} else

+						$post_location = geodir_get_location();

 

 

-                if (!empty($post_location)) {

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

+				} else {

+

+					$post_location_sql = $wpdb->get_results(

+						$wpdb->prepare(

+							"SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+							array($post->ID)

+						)

+					);

+

+					if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

+

+						$geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

+						if (count($geodir_arr_locations) == 3) {

+							$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

+							$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

+							$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,

+								'region_slug' => $post->region_slug,

+								'city_slug' => $post->city_slug

+							);

+

+						}

+					} else

+						$post_location = geodir_get_location();

+				}

+

+

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

 					

@@ -1606,78 +1606,78 @@ 
 					$location_slug[] = $city_slug;

 					

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

-                }

-            }

+				}

+			}

 

-            if (get_option('geodir_add_categories_url')) {

+			if (get_option('geodir_add_categories_url')) {

 

-                $term_request = '';

-                $taxonomies = geodir_get_taxonomies($post->post_type);

+				$term_request = '';

+				$taxonomies = geodir_get_taxonomies($post->post_type);

 

-                $taxonomies = end($taxonomies);

+				$taxonomies = end($taxonomies);

 

-                if (!empty($post->default_category)) {

-                    $post_terms = $post->default_category;

-                } else {

-                    $post_terms = '';

+				if (!empty($post->default_category)) {

+					$post_terms = $post->default_category;

+				} else {

+					$post_terms = '';

 

-                    if (isset($post->{$taxonomies})) {

-                        $post_terms = explode(",", trim($post->{$taxonomies}, ","));

-                        $post_terms = $post_terms[0];

-                    }

+					if (isset($post->{$taxonomies})) {

+						$post_terms = explode(",", trim($post->{$taxonomies}, ","));

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

+					if (!$post_terms) {

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

 

-                        if ($post_terms) {

-                            $post_terms = explode(",", trim($post_terms, ","));

-                            $post_terms = $post_terms[0];

-                        }

-                    }

-                }

+						if ($post_terms) {

+							$post_terms = explode(",", trim($post_terms, ","));

+							$post_terms = $post_terms[0];

+						}

+					}

+				}

 

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

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

 

-                if (!empty($term))

-                    $term_request = $term->slug;

-                //$term_request = $term->slug.'/';

-            }

+				if (!empty($term))

+					$term_request = $term->slug;

+				//$term_request = $term->slug.'/';

+			}

 

-            $request_term = '';

-            $listingurl_separator = '';

-            //$detailurl_separator = get_option('geodir_detailurl_separator');

-            $detailurl_separator = '';

-            if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

-                $request_term = $location_request;

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

-                //$request_term .= $listingurl_separator.'/'.$term_request;

-                $request_term .= $term_request;

+			$request_term = '';

+			$listingurl_separator = '';

+			//$detailurl_separator = get_option('geodir_detailurl_separator');

+			$detailurl_separator = '';

+			if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

+				$request_term = $location_request;

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

+				//$request_term .= $listingurl_separator.'/'.$term_request;

+				$request_term .= $term_request;

 

-            } else {

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

+			} else {

+				if (isset($location_request) && $location_request != '') $request_term = $location_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);

-            //echo $post_link ;

-        }

-        // temp cache the permalink

-        if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

-            $gd_permalink_cache[$post->ID] = $post_link;

-        }

-    }

-    if (isset($orig_post)) {

-        $post = $orig_post;

-    }

-

-    return $post_link;

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

+			//echo $post_link ;

+		}

+		// temp cache the permalink

+		if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

+			$gd_permalink_cache[$post->ID] = $post_link;

+		}

+	}

+	if (isset($orig_post)) {

+		$post = $orig_post;

+	}

+

+	return $post_link;

 }

 

 /**

@@ -1693,99 +1693,99 @@ 
  * @return string The term link.

  */

 function geodir_term_link($termlink, $term, $taxonomy) {

-    $geodir_taxonomies = geodir_get_taxonomies('', true);

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

-    if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

-        global $geodir_add_location_url, $gd_session;

-        $include_location = false;

-        $request_term = array();

-        $add_location_url = get_option('geodir_add_location_url');

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

+	if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

+		global $geodir_add_location_url, $gd_session;

+		$include_location = false;

+		$request_term = array();

+		$add_location_url = get_option('geodir_add_location_url');

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

 

-        $listing_slug = geodir_get_listing_slug($taxonomy);

+		$listing_slug = geodir_get_listing_slug($taxonomy);

 

-        if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

-            if ($geodir_add_location_url && $add_location_url) {

-                $include_location = true;

-            }

-        } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

-            $include_location = true;

-        } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

-            $include_location = true;

-        }

-

-        if ($include_location) {

-            global $post;

+		if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

+			if ($geodir_add_location_url && $add_location_url) {

+				$include_location = true;

+			}

+		} elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

+			$include_location = true;

+		} elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

+			$include_location = true;

+		}

+

+		if ($include_location) {

+			global $post;

             

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

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

             

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

-                }

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

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

+			}

 

-            $geodir_show_location_url = get_option('geodir_show_location_url');

-            $location_terms = geodir_remove_location_terms($location_terms);

+			$geodir_show_location_url = get_option('geodir_show_location_url');

+			$location_terms = geodir_remove_location_terms($location_terms);

 

-            if (!empty($location_terms)) {

-                $url_separator = '';

+			if (!empty($location_terms)) {

+				$url_separator = '';

 

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

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

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

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

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

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

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

+					$new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

 

-                    $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

-                } else {

-                    $termlink = geodir_getlink($termlink, $request_term);

-                }

-            }

-        }

+					$termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

+				} else {

+					$termlink = geodir_getlink($termlink, $request_term);

+				}

+			}

+		}

 

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

-        /* we can replace this with the below function

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

+		/* we can replace this with the below function

         if(function_exists('icl_object_id')){

             global $sitepress;

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

             $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type);

         }*/

 

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

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

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

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

-                }

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

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

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

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

+				}

 

-                $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+				$org_slug = $slug;

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

-            }

-        }

-    }

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

+			}

+		}

+	}

     

-    return $termlink;

+	return $termlink;

 }

 

 /**

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

-                    'gd_city' => $post->city_slug

-                );

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 			

 			$location_terms = geodir_remove_location_terms($location_terms);

 			

@@ -1850,17 +1850,17 @@ 
  * @return void|string Label.

  */

 function get_post_type_singular_label($post_type, $echo = false, $translate = false) {

-    $obj_post_type = get_post_type_object($post_type);

-    if (!is_object($obj_post_type)) {

-        return;

-    }

+	$obj_post_type = get_post_type_object($post_type);

+	if (!is_object($obj_post_type)) {

+		return;

+	}

     

-    $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

+	$label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1875,19 +1875,19 @@ 
  * @return void|string Label.

  */

 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

+		return false;

 

-    $obj_post_type = get_post_type_object($post_type);

+	$obj_post_type = get_post_type_object($post_type);

     

-    $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

+	$label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1905,51 +1905,51 @@ 
  */

 function geodir_term_exists($term, $taxonomy = '', $parent = 0)

 {

-    global $wpdb;

-

-    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

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

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

-    }

+	global $wpdb;

+

+	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

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

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

+	}

 

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

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

 

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

-        return 0;

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

+		return 0;

 

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

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

 

-    $where_fields = array($slug);

-    if (!empty($taxonomy)) {

-        $parent = (int)$parent;

-        if ($parent > 0) {

-            $where_fields[] = $parent;

-            $else_where_fields[] = $parent;

-            $where .= ' AND tt.parent = %d';

+	$where_fields = array($slug);

+	if (!empty($taxonomy)) {

+		$parent = (int)$parent;

+		if ($parent > 0) {

+			$where_fields[] = $parent;

+			$else_where_fields[] = $parent;

+			$where .= ' AND tt.parent = %d';

 

-        }

+		}

 

-        $where_fields[] = $taxonomy;

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

-    }

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

+	return false;

 }

 

 /**

@@ -1961,7 +1961,7 @@ 
 function geodir_get_term_icon_rebuild()

 {

 

-    update_option('gd_term_icons', '');

+	update_option('gd_term_icons', '');

 

 }

 

@@ -1979,61 +1979,61 @@ 
  */

 function geodir_get_term_icon($term_id = false, $rebuild = false)

 {

-    global $wpdb;

-    if (!$rebuild) {

-        $terms_icons = get_option('gd_term_icons');

-    } else {

-        $terms_icons = array();

-    }

-

-    if (empty($terms_icons)) {

-        $terms_icons = array();

-        $default_icon_url = get_option('geodir_default_marker_icon');

-        $taxonomy = geodir_get_taxonomies();

-        $post_types = geodir_get_posttypes();

-        $tax_arr = array();

-        foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

-        }

-        $tax_c = implode(',', $tax_arr);

-        $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

-        //$terms = get_terms( $taxonomy );

-

-        if($terms) {

-            foreach ($terms as $term) {

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

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

+	global $wpdb;

+	if (!$rebuild) {

+		$terms_icons = get_option('gd_term_icons');

+	} else {

+		$terms_icons = array();

+	}

 

-            }

-        }

+	if (empty($terms_icons)) {

+		$terms_icons = array();

+		$default_icon_url = get_option('geodir_default_marker_icon');

+		$taxonomy = geodir_get_taxonomies();

+		$post_types = geodir_get_posttypes();

+		$tax_arr = array();

+		foreach ($post_types as $post_type) {

+			$tax_arr[] = "'" . $post_type . "category'";

+		}

+		$tax_c = implode(',', $tax_arr);

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

+		//$terms = get_terms( $taxonomy );

 

-        if($a_terms) {

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

+		if($terms) {

+			foreach ($terms as $term) {

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

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

 

-                foreach ($t2 as $term) {

-                    $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

-                    if ($term_icon) {

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

-                    } else {

-                        $term_icon_url = $default_icon_url;

-                    }

-                    $terms_icons[$term->term_id] = $term_icon_url;

-                }

-            }

-        }

+			}

+		}

+

+		if($a_terms) {

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

+

+				foreach ($t2 as $term) {

+					$term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

+					if ($term_icon) {

+						$term_icon_url = $term_icon["src"];

+					} else {

+						$term_icon_url = $default_icon_url;

+					}

+					$terms_icons[$term->term_id] = $term_icon_url;

+				}

+			}

+		}

 

-        update_option('gd_term_icons', $terms_icons);

-    }

+		update_option('gd_term_icons', $terms_icons);

+	}

 

-    if ($term_id && isset($terms_icons[$term_id])) {

-        return $terms_icons[$term_id];

-    } elseif ($term_id && !isset($terms_icons[$term_id])) {

-        return get_option('geodir_default_marker_icon');

-    }

+	if ($term_id && isset($terms_icons[$term_id])) {

+		return $terms_icons[$term_id];

+	} elseif ($term_id && !isset($terms_icons[$term_id])) {

+		return get_option('geodir_default_marker_icon');

+	}

 

-    if (is_ssl()) {

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

-    }

+	if (is_ssl()) {

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

+	}

 

-    return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

+	return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

 }
\ No newline at end of file

Spacing +127 added lines, -127 removed lines

@@ -60,16 +60,16 @@ 
                              * @since 1.0.0

                              * @param string $menu_class The menu HTML class.

                              */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                             /**

                              * Filter the menu a class.

                              *

                              * @since 1.0.0

                              */

                             $a_class = apply_filters('geodir_menu_a_class', '');

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

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

-										' . __(ucfirst($args->labels->name),'geodirectory') . '

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

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

+										' . __(ucfirst($args->labels->name), 'geodirectory').'

 									</a>

 								</li>';

                         }

@@ -88,14 +88,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -114,9 +114,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

-					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

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

+					<a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

             $post_types = geodir_get_posttypes('object');

 

             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

@@ -133,9 +133,9 @@ 
                                 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 . '">

-															' . __(ucfirst($args->labels->name),'geodirectory') . '

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

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

+															' . __(ucfirst($args->labels->name), 'geodirectory').'

 														</a>

 													</li>';

                             }

@@ -151,7 +151,7 @@ 
              *

              * @since 1.5.9

              */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

         }

     }

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

                                      * @param string $menu_class The menu HTML class.

                                      */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                     /**

                                      * Filter the menu a class.

                                      *

@@ -192,9 +192,9 @@ 
                                      */

                                     $a_class = apply_filters('geodir_menu_a_class', '');

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

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

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

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

 											</a>

 										</li>';

                                 }

@@ -218,14 +218,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -244,9 +244,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

-					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

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

+					<a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

 

             $post_types = geodir_get_posttypes('object');

 

@@ -269,11 +269,11 @@ 
                                          * @since 1.0.0

                                          * @param string $menu_class The menu HTML class.

                                          */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

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

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

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

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

 														</a>

 													</li>';

                                     }

@@ -285,7 +285,7 @@ 
             }

 

             $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

 

         }

@@ -313,14 +313,14 @@ 
     $geodir_theme_location = get_option('geodir_theme_location_nav');

     $geodir_theme_location_nav = array();

     if (empty($locations) && empty($geodir_theme_location)) {

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

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

         $geodir_theme_location_nav[] = $args['theme_location'];

         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

     }

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

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

 

     return $menu;

 

@@ -348,7 +348,7 @@ 
 

     if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

+        $items = $items.geodir_add_nav_menu_items();

         return $items;

 

     } else {

@@ -373,12 +373,12 @@ 
 

     $taxonomies = geodir_get_taxonomies();

     $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

+    $taxonomies = "'".$taxonomies."'";

 

     $pn_categories = $wpdb->get_results(

         $wpdb->prepare(

             "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

+            array($wpdb->terms.term_id)

         )

     );

 

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

     }

@@ -425,7 +425,7 @@ 
     if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

         $geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+    if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {

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

     }

 

@@ -435,7 +435,7 @@ 
      *

      * @since 1.6.9

      */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+    return apply_filters('geodir_get_current_posttype', $geodir_post_type);

 }

 

 /**

@@ -449,18 +449,18 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+    $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));

 

     $stype = false;

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

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

         global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

+        $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+        if ($has_posts) {

             $stype = $post_type; break;

         }

     }

 

-    if(!$stype){

+    if (!$stype) {

         $stype = 'gd_place';

     }

 

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

@@ -610,15 +610,15 @@ 
 

         $categories = get_terms($taxonomies);

 

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+        $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';

 

         foreach ($categories as $category_obj) {

             $select_opt = '';

             if ($selected == $category_obj->term_id) {

                 $select_opt = 'selected="selected"';

             }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . ucfirst($category_obj->name) . '</option>';

+            $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">'

+                . ucfirst($category_obj->name).'</option>';

         }

 

         if ($echo)

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

     }

 

@@ -740,7 +740,7 @@ 
 

             if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

                 if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display;

                     $main_list_class = 'class="main_list_selecter"';

                 } else {

                     //$display = 'display:none';

@@ -750,7 +750,7 @@ 
 

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

                 $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+                $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">';

             }

 

             foreach ($cat_terms as $cat_term) {

@@ -765,12 +765,12 @@ 
                 }

 

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

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

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

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

                 }

 

                 // Call recurson to print sub cats

@@ -809,7 +809,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,7 +841,7 @@ 
 

             if (!empty($post_category)) {

                 $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+                $post_category = ','.implode(',', $cat1).',';

 

             }

 

@@ -852,7 +852,7 @@ 
                 foreach ($post_category_upd as $cat) {

 

                     if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

+                        $post_category_change .= ','.$cat;

                     }

                 }

                 $post_category = $post_category_change;

@@ -864,11 +864,11 @@ 
             }

         }

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']"  />';

 

 

         ?>

@@ -887,14 +887,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 } ?>

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

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

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

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

 

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

         }

 

@@ -1057,25 +1057,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>

 

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

 

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

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

@@ -1176,9 +1176,9 @@ 
         if (!$selected)

             $option_slected = ' selected="selected" ';

 

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

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

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';

 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

@@ -1186,10 +1186,10 @@ 
                 $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>';

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

         }

         echo '</select>';

     }

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

@@ -1246,7 +1246,7 @@ 
 

     global $wpdb;

 

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

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

 

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

         $listing_slug = 'places';

@@ -1259,11 +1259,11 @@ 
 

         $gd_placetags = array();

         $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';

         $gd_placetags['args'] = array(

             'public' => true,

             'hierarchical' => false,

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

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

             'query_var' => true,

 

             'labels' => array(

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

             'public' => true,

             'query_var' => true,

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

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

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

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

 

@@ -1379,27 +1379,27 @@ 
 }

 

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

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

 

     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

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

+    $site_url = str_replace(array("http://", "https://"), "", site_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();

     }

@@ -1464,17 +1464,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,

+                    'URL slug: '.$slug,

                     $language_code);

 

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

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

 

             }

         }

@@ -1496,11 +1496,11 @@ 
         }

 

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

-            $post_link = $site_url . $post_link;

+            $post_link = $site_url.$post_link;

         }

 

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

@@ -1519,12 +1519,12 @@ 
             $ID = $post->ID;

             $post2 = $wpdb->get_row(

                 $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                     array($post->ID)

                 )

             );

 

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

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

 

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

         }

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

 

 

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

                         );

@@ -1560,7 +1560,7 @@ 
 

                     $post_location_sql = $wpdb->get_results(

                         $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                             array($post->ID)

                         )

                     );

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

                             );

@@ -1605,7 +1605,7 @@ 
 					}

 					$location_slug[] = $city_slug;

 					

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

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

                 }

             }

 

@@ -1663,9 +1663,9 @@ 
             }

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

             if (!empty($request_term))

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

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

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

             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1740,9 +1740,9 @@ 
                 $url_separator = '';

 

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

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

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

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

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';

 

                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

                 } else {

@@ -1762,25 +1762,25 @@ 
         // Alter the CPT slug if WPML is set to do so

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

                 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, 'WordPress', 'URL slug: ' . $slug, $language_code);

+                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: '.$slug, $language_code);

 

                 if (!$slug) {

                     $slug = $org_slug;

                 }

 

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

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

             }

         }

     }

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

@@ -1827,7 +1827,7 @@ 
 					$location_terms = implode("/", $location_terms);

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

 					

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

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

 				} else {

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

 				}

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

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

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

     }

 

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

@@ -1929,7 +1929,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -1993,13 +1993,13 @@ 
         $post_types = geodir_get_posttypes();

         $tax_arr = array();

         foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

+            $tax_arr[] = "'".$post_type."category'";

         }

         $tax_c = implode(',', $tax_arr);

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

@@ -2007,7 +2007,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

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

 

                 foreach ($t2 as $term) {

@@ -2032,7 +2032,7 @@ 
     }

 

     if (is_ssl()) {

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

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

     }

 

     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

geodirectory_template_actions.php

Braces +31 added lines, -24 removed lines

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

                             }

                         }

@@ -1265,8 +1266,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

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

         }

 

@@ -2074,8 +2074,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 */

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

         }

 

@@ -2406,8 +2407,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 != '') {

@@ -2435,10 +2437,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 = isset($package_info->image_limit) ? $package_info->image_limit : '0';

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

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

@@ -2753,8 +2759,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) . "'";
+        }
     }

 

 

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

         }

 

Indentation +1838 added lines, -1838 removed lines

@@ -17,10 +17,10 @@ 
  */

 function gd_compat_styles()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<style id='gd-compat-styles' type='text/css'>";

-    echo $tc['geodir_theme_compat_css'];

-    echo "</style>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<style id='gd-compat-styles' type='text/css'>";

+	echo $tc['geodir_theme_compat_css'];

+	echo "</style>";

 }

 

 /**

@@ -31,10 +31,10 @@ 
  */

 function gd_compat_script()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<script>";

-    echo $tc['geodir_theme_compat_js'];

-    echo " </script>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<script>";

+	echo $tc['geodir_theme_compat_js'];

+	echo " </script>";

 }

 

 /**

@@ -47,8 +47,8 @@ 
  */

 function geodir_top_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_top_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_top_content_add'];

 }

 

 /**

@@ -61,8 +61,8 @@ 
  */

 function geodir_before_main_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_before_main_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_before_main_content_add'];

 }

 

 /**

@@ -75,8 +75,8 @@ 
  */

 function geodir_full_page_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_full_page_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_full_page_class_filter'];

 }

 

 /**

@@ -89,8 +89,8 @@ 
  */

 function geodir_before_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_widget_filter'];

 }

 

 /**

@@ -103,8 +103,8 @@ 
  */

 function geodir_after_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_widget_filter'];

 }

 

 /**

@@ -117,8 +117,8 @@ 
  */

 function geodir_before_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_title_filter'];

 }

 

 /**

@@ -131,8 +131,8 @@ 
  */

 function geodir_after_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_title_filter'];

 }

 

 /**

@@ -145,8 +145,8 @@ 
  */

 function geodir_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_li_class_filter'];

 }

 

 /**

@@ -159,8 +159,8 @@ 
  */

 function geodir_sub_menu_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_ul_class_filter'];

 }

 

 /**

@@ -173,8 +173,8 @@ 
  */

 function geodir_sub_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_li_class_filter'];

 }

 

 /**

@@ -187,8 +187,8 @@ 
  */

 function geodir_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_a_class_filter'];

 }

 

 /**

@@ -201,8 +201,8 @@ 
  */

 function geodir_sub_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_a_class_filter'];

 }

 

 /**

@@ -215,8 +215,8 @@ 
  */

 function geodir_location_switcher_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_li_class_filter'];

 }

 

 /**

@@ -229,8 +229,8 @@ 
  */

 function geodir_location_switcher_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_a_class_filter'];

 }

 

 /**

@@ -243,8 +243,8 @@ 
  */

 function geodir_location_switcher_menu_sub_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

 }

 

 /**

@@ -257,8 +257,8 @@ 
  */

 function geodir_location_switcher_menu_sub_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

 }

 

 

@@ -275,107 +275,107 @@ 
 function geodir_content_actions_dynamic()

 {

 

-    $tc = get_option('theme_compatibility_setting');

+	$tc = get_option('theme_compatibility_setting');

 //print_r($tc);

-    if (empty($tc)) {

-        return;

-    }

-

-    //php

-    if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

-    }

-

-    //geodir_full_page_class

-    if (!empty($tc['geodir_full_page_class_filter'])) {

-        add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

-    }

-

-    //widget before filter

-    if (!empty($tc['geodir_before_widget_filter'])) {

-        add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

-    }

-

-    //widget after filter

-    if (!empty($tc['geodir_after_widget_filter'])) {

-        add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

-    }

-

-    //widget before title filter

-    if (!empty($tc['geodir_before_title_filter'])) {

-        add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

-    }

-

-    //widget before title filter

-    if (!empty($tc['geodir_after_title_filter'])) {

-        add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

-    }

-

-    //menu li class

-    if (!empty($tc['geodir_menu_li_class_filter'])) {

-        add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

-    }

-

-    //menu ul class

-    if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

-        add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

-    }

-

-    //menu sub li class

-    if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

-        add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

-    }

-

-    //menu a class

-    if (!empty($tc['geodir_menu_a_class_filter'])) {

-        add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

-    }

-

-    //menu sub a class

-    if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

-        add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

-    }

-

-    //location menu li class

-    if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

-    }

-

-    //location menu sub ul class

-    if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

-    }

-

-    //location menu sub li class

-    if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

-    }

-

-    //location menu a class

-    if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

-    }

-

-    // compat styles

-    if (!empty($tc['geodir_theme_compat_css'])) {

-        add_action('wp_head', 'gd_compat_styles');

-    }

-

-    // compat js

-    if (!empty($tc['geodir_theme_compat_js'])) {

-        add_action('wp_footer', 'gd_compat_script');

-    }

-

-

-    // geodir_top_content_add

-    if (!empty($tc['geodir_top_content_add'])) {

-        add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

-    }

-

-    // geodir_before_main_content_add

-    if (!empty($tc['geodir_before_main_content_add'])) {

-        add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

-    }

+	if (empty($tc)) {

+		return;

+	}

+

+	//php

+	if (!empty($tc['geodir_theme_compat_code'])) {

+		include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+	}

+

+	//geodir_full_page_class

+	if (!empty($tc['geodir_full_page_class_filter'])) {

+		add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

+	}

+

+	//widget before filter

+	if (!empty($tc['geodir_before_widget_filter'])) {

+		add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

+	}

+

+	//widget after filter

+	if (!empty($tc['geodir_after_widget_filter'])) {

+		add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

+	}

+

+	//widget before title filter

+	if (!empty($tc['geodir_before_title_filter'])) {

+		add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

+	}

+

+	//widget before title filter

+	if (!empty($tc['geodir_after_title_filter'])) {

+		add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

+	}

+

+	//menu li class

+	if (!empty($tc['geodir_menu_li_class_filter'])) {

+		add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

+	}

+

+	//menu ul class

+	if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

+		add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

+	}

+

+	//menu sub li class

+	if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

+		add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

+	}

+

+	//menu a class

+	if (!empty($tc['geodir_menu_a_class_filter'])) {

+		add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

+	}

+

+	//menu sub a class

+	if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

+		add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

+	}

+

+	//location menu li class

+	if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

+	}

+

+	//location menu sub ul class

+	if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

+	}

+

+	//location menu sub li class

+	if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

+	}

+

+	//location menu a class

+	if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

+	}

+

+	// compat styles

+	if (!empty($tc['geodir_theme_compat_css'])) {

+		add_action('wp_head', 'gd_compat_styles');

+	}

+

+	// compat js

+	if (!empty($tc['geodir_theme_compat_js'])) {

+		add_action('wp_footer', 'gd_compat_script');

+	}

+

+

+	// geodir_top_content_add

+	if (!empty($tc['geodir_top_content_add'])) {

+		add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

+	}

+

+	// geodir_before_main_content_add

+	if (!empty($tc['geodir_before_main_content_add'])) {

+		add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

+	}

 

 

 }

@@ -398,23 +398,23 @@ 
  */

 function geodir_action_wrapper_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_open_replace'])) {

-        $text = $tc['geodir_wrapper_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_open_replace'])) {

+		$text = $tc['geodir_wrapper_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]">';

+	}

 

-    if (!empty($tc['geodir_wrapper_open_id'])) {

-        $id = $tc['geodir_wrapper_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_open_class'])) {

-        $class = $tc['geodir_wrapper_open_class'];

-    }

+	if (!empty($tc['geodir_wrapper_open_id'])) {

+		$id = $tc['geodir_wrapper_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_open_class'])) {

+		$class = $tc['geodir_wrapper_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the wrapperdiv closing tag

@@ -429,14 +429,14 @@ 
  */

 function geodir_action_wrapper_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_close_replace'])) {

-        $text = $tc['geodir_wrapper_close_replace'];

-    } else {

-        $text = '</div><!-- wrapper ends here-->';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_close_replace'])) {

+		$text = $tc['geodir_wrapper_close_replace'];

+	} else {

+		$text = '</div><!-- wrapper ends here-->';

+	}

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the content div opening tag

@@ -452,35 +452,35 @@ 
  */

 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_open_replace'])) {

-        $text = $tc['geodir_wrapper_content_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]" role="main" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_wrapper_content_open_id'])) {

-        $id = $tc['geodir_wrapper_content_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_content_open_class'])) {

-        $class = $tc['geodir_wrapper_content_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_open_replace'])) {

+		$text = $tc['geodir_wrapper_content_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]" role="main" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_wrapper_content_open_id'])) {

+		$id = $tc['geodir_wrapper_content_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_content_open_class'])) {

+		$class = $tc['geodir_wrapper_content_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -494,13 +494,13 @@ 
  */

 function geodir_action_wrapper_content_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_close_replace'])) {

-        $text = $tc['geodir_wrapper_content_close_replace'];

-    } else {

-        $text = '</div><!-- content ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_close_replace'])) {

+		$text = $tc['geodir_wrapper_content_close_replace'];

+	} else {

+		$text = '</div><!-- content ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the <article> opening tag

@@ -518,24 +518,24 @@ 
  */

 function geodir_action_article_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    $class = implode(" ", $class);

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_open_replace'])) {

-        $text = $tc['geodir_article_open_replace'];

-    } else {

-        $text = '<article  id="[id]" class="[class]" >';

-    }

+	$class = implode(" ", $class);

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_open_replace'])) {

+		$text = $tc['geodir_article_open_replace'];

+	} else {

+		$text = '<article  id="[id]" class="[class]" >';

+	}

 

-    if (!empty($tc['geodir_article_open_id'])) {

-        $id = $tc['geodir_article_open_id'];

-    }

-    if (!empty($tc['geodir_article_open_class'])) {

-        $class = $tc['geodir_article_open_class'];

-    }

+	if (!empty($tc['geodir_article_open_id'])) {

+		$id = $tc['geodir_article_open_id'];

+	}

+	if (!empty($tc['geodir_article_open_class'])) {

+		$class = $tc['geodir_article_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

+	$text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -549,13 +549,13 @@ 
  */

 function geodir_action_article_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_close_replace'])) {

-        $text = $tc['geodir_article_close_replace'];

-    } else {

-        $text = '</article><!-- article ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_close_replace'])) {

+		$text = $tc['geodir_article_close_replace'];

+	} else {

+		$text = '</article><!-- article ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the sidebar opening tag

@@ -572,35 +572,35 @@ 
  */

 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_open_replace'])) {

-        $text = $tc['geodir_sidebar_right_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_right_open_id'])) {

-        $id = $tc['geodir_sidebar_right_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_right_open_class'])) {

-        $class = $tc['geodir_sidebar_right_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_open_replace'])) {

+		$text = $tc['geodir_sidebar_right_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_right_open_id'])) {

+		$id = $tc['geodir_sidebar_right_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_right_open_class'])) {

+		$class = $tc['geodir_sidebar_right_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -614,13 +614,13 @@ 
  */

 function geodir_action_sidebar_right_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_close_replace'])) {

-        $text = $tc['geodir_sidebar_right_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_close_replace'])) {

+		$text = $tc['geodir_sidebar_right_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 

@@ -641,121 +641,121 @@ 
  */

 function geodir_action_geodir_set_preview_post()

 {

-    global $post, $preview, $gd_session;

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

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

-        return;

-    }// bail if not previewing

-

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

-

-    $fields_info = geodir_get_custom_fields_type($listing_type);

-

-    foreach ($_REQUEST as $pkey => $pval) {

-        if ($pkey == 'geodir_video') {

-            $tags = '<iframe>';

-        } else if ($pkey == 'post_desc') {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($_REQUEST[$pkey])) {

-            $tags = 'skip_field';

-        } else {

-            $tags = '';

-        }

-        /**

-         * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

-         *

-         * @since 1.0.0

-         * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

-         * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

-         */

-        $tags = apply_filters('geodir_save_post_key', $tags, $pkey);

-

-        if ($tags != 'skip_field') {

-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

-        }

-    }

-

-    $post = (object)$_REQUEST;

-

-

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

-        $post->video = stripslashes($post->video);

-    }

-

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

-        $post->Video2 = stripslashes($post->Video2);

-    }

-

-    $post_type = $post->listing_type;

-    $post_type_info = get_post_type_object($post_type);

-

-    $listing_label = $post_type_info->labels->singular_name;

-

-    $term_icon = '';

-

-    if (!empty($post->post_category)) {

-        foreach ($post->post_category as $post_taxonomy => $post_term) {

-

-            if ($post_term != '' && !is_array($post_term)) {

-                $post_term = explode(',', trim($post_term, ','));

-            }

+	global $post, $preview, $gd_session;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

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

+		return;

+	}// bail if not previewing

+

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

+

+	$fields_info = geodir_get_custom_fields_type($listing_type);

+

+	foreach ($_REQUEST as $pkey => $pval) {

+		if ($pkey == 'geodir_video') {

+			$tags = '<iframe>';

+		} else if ($pkey == 'post_desc') {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($_REQUEST[$pkey])) {

+			$tags = 'skip_field';

+		} else {

+			$tags = '';

+		}

+		/**

+		 * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

+		 *

+		 * @since 1.0.0

+		 * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

+		 * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

+		 */

+		$tags = apply_filters('geodir_save_post_key', $tags, $pkey);

+

+		if ($tags != 'skip_field') {

+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

+		}

+	}

+

+	$post = (object)$_REQUEST;

+

+

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

+		$post->video = stripslashes($post->video);

+	}

+

+	if (isset($post->Video2)) {

+		$post->Video2 = stripslashes($post->Video2);

+	}

+

+	$post_type = $post->listing_type;

+	$post_type_info = get_post_type_object($post_type);

+

+	$listing_label = $post_type_info->labels->singular_name;

+

+	$term_icon = '';

+

+	if (!empty($post->post_category)) {

+		foreach ($post->post_category as $post_taxonomy => $post_term) {

+

+			if ($post_term != '' && !is_array($post_term)) {

+				$post_term = explode(',', trim($post_term, ','));

+			}

 

-            if (is_array($post_term)) {

-                $post_term = array_unique($post_term);

-            }

+			if (is_array($post_term)) {

+				$post_term = array_unique($post_term);

+			}

 

-            if (!empty($post_term)) {

-                foreach ($post_term as $cat_id) {

-                    $cat_id = trim($cat_id);

-

-                    if ($cat_id != '') {

-                        $term_icon = get_option('geodir_default_marker_icon');

-

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

-                                break;

-                            }

-                        }

-                    }

-                }

-            }

-        }

-    }

+			if (!empty($post_term)) {

+				foreach ($post_term as $cat_id) {

+					$cat_id = trim($cat_id);

+

+					if ($cat_id != '') {

+						$term_icon = get_option('geodir_default_marker_icon');

+

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

+								break;

+							}

+						}

+					}

+				}

+			}

+		}

+	}

 

-    $post_latitude = isset($post->post_latitude) ? $post->post_latitude : '';

-    $post_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+	$post_latitude = isset($post->post_latitude) ? $post->post_latitude : '';

+	$post_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

 

-    $srcharr = array("'", "/", "-", '"', '\\');

-    $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

+	$srcharr = array("'", "/", "-", '"', '\\');

+	$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

 

-    $json_title = str_replace($srcharr, $replarr, $post->post_title);

+	$json_title = str_replace($srcharr, $replarr, $post->post_title);

 

-    $json = '{';

-    $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

-    $json .= '}';

+	$json = '{';

+	$json .= '"post_preview": "1",';

+	$json .= '"t": "' . $json_title . '",';

+	$json .= '"lt": "' . $post_latitude . '",';

+	$json .= '"ln": "' . $post_longitude . '",';

+	$json .= '"i":"' . $term_icon . '"';

+	$json .= '}';

 

-    $post->marker_json = $json;

+	$post->marker_json = $json;

 

-    $gd_session->set('listing', $_REQUEST);

+	$gd_session->set('listing', $_REQUEST);

 

-    // we need to define a few things to trick the setup_postdata

-    if (!isset($post->ID)) {

-        $post->ID = '';

-        $post->post_author = '';

-        $post->post_date = '';

-        $post->post_content = '';

-        $post->default_category = '';

-        $post->post_type = '';

-    }

-    setup_postdata($post);

+	// we need to define a few things to trick the setup_postdata

+	if (!isset($post->ID)) {

+		$post->ID = '';

+		$post->post_author = '';

+		$post->post_date = '';

+		$post->post_content = '';

+		$post->default_category = '';

+		$post->post_type = '';

+	}

+	setup_postdata($post);

 }

 

 /**

@@ -767,15 +767,15 @@ 
  */

 function geodir_action_geodir_preview_code()

 {

-    global $preview;

+	global $preview;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

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

-        return;

-    }// bail if not previewing

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

+		return;

+	}// bail if not previewing

 

-    geodir_get_template_part('preview', 'buttons');

+	geodir_get_template_part('preview', 'buttons');

 }

 

 // action for adding the details page top widget area

@@ -791,20 +791,20 @@ 
  */

 function geodir_action_geodir_sidebar_detail_top($class = '')

 {

-    if (get_option('geodir_show_detail_top_section')) { ?>

+	if (get_option('geodir_show_detail_top_section')) { ?>

         <div

             class="<?php

-            /**

-             * Filter the div class for the wrapper of the full width widget areas.

-             *

-             * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

-             *

-             * @since 1.0.0

-             * @param string $class The class of the div.

-             * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

-             *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

-             */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

+			/**

+			 * Filter the div class for the wrapper of the full width widget areas.

+			 *

+			 * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

+			 *

+			 * @since 1.0.0

+			 * @param string $class The class of the div.

+			 * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

+			 *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

+			 */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_top'); ?>

         </div>

     <?php }

@@ -828,11 +828,11 @@ 
  */

 function geodir_action_geodir_sidebar_detail_bottom_section($class = '')

 {

-    if (get_option('geodir_show_detail_bottom_section')) { ?>

+	if (get_option('geodir_show_detail_bottom_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_bottom'); ?>

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

     <?php }

@@ -846,7 +846,7 @@ 
  */

 function geodir_details_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_detail_sidebar');

+	dynamic_sidebar('geodir_detail_sidebar');

 }

 

 /**

@@ -857,12 +857,12 @@ 
  */

 function geodir_details_sidebar_place_details()

 {

-    /**

-     * Used to add items to the details page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_detail_page_sidebar');

+	/**

+	 * Used to add items to the details page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_detail_page_sidebar');

 }

 

 add_action('geodir_detail_sidebar_inside', 'geodir_details_sidebar_place_details', 10);

@@ -877,68 +877,68 @@ 
  */

 function geodir_action_details_sidebar()

 {

-    // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-    if (get_option('geodir_detail_sidebar_left_section')) {

-        /**

-         * Called before the details page left sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');

-        ?>

+	// this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

+	if (get_option('geodir_detail_sidebar_left_section')) {

+		/**

+		 * Called before the details page left sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-left geodir-sidebar-wrap"><?php

-        /**

-         * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

-         *

-         * This is used to add all info to the details page sidebars.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-left --><?php

-        /**

-         * Called after the details page left sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_left_close', 'details-page');

-    } else {

-        /**

-         * Called before the details page right sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

-        ?>

+		/**

+		 * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

+		 *

+		 * This is used to add all info to the details page sidebars.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-left --><?php

+		/**

+		 * Called after the details page left sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_left_close', 'details-page');

+	} else {

+		/**

+		 * Called before the details page right sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-right geodir-sidebar-wrap"><?php

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

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-right --><?php

-        /**

-         * Called after the details page right sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_right_close', 'details-page');

-    }

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

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-right --><?php

+		/**

+		 * Called after the details page right sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_right_close', 'details-page');

+	}

 }

 

 add_action('geodir_page_title', 'geodir_action_page_title', 10);

@@ -952,21 +952,21 @@ 
  */

 function geodir_action_page_title()

 {

-    /**

-     * Filter the page title HTML h1 class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-title fn'.

-     */

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

-    /**

-     * Filter the page title HTML header wrapper class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-header'.

-     */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+	/**

+	 * Filter the page title HTML h1 class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-title fn'.

+	 */

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

+	/**

+	 * Filter the page title HTML header wrapper class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-header'.

+	 */

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

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

 }

 

 

@@ -983,94 +983,94 @@ 
  */

 function geodir_action_details_slider()

 {

-    global $preview, $post;

+	global $preview, $post;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

 

-    if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

-        $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

+		$preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-        $preview_post_images = array();

-        if ($preview_get_images) {

-            foreach ($preview_get_images as $row) {

-                $preview_post_images[] = $row->src;

-            }

-        }

-        if (!empty($preview_post_images)) {

-            $post->post_images = implode(',', $preview_post_images);

-        }

-    }

-

-    if ($preview) {

-        $post_images = array();

-        if (isset($post->post_images) && !empty($post->post_images)) {

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

-            $post_images = explode(",", $post->post_images);

-        }

-

-        $main_slides = '';

-        $nav_slides = '';

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if (!empty($image)) {

-                    $sizes = getimagesize(trim($image));

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

-                    $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

-

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

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

-                    }

-

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

-                        if ($image->height >= 400) {

-                            $spacer_height = 0;

-                        } else {

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

-                        }

-

-                        $image_title = isset($image->title) ? $image->title : '';

-

-                        $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;" /></li>';

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

-                        $slides++;

-                    }

-                }

-            }// endfore

-        } //end if

-    } else {

-        $main_slides = '';

-        $nav_slides = '';

-        /**

-         * Filter if default images should show on the details page.

-         *

-         * @param bool $use_default_image Default false.

-         * @since 1.6.16

-         */

-        $use_default_image = apply_filters('geodir_details_default_image_show', false);

-        $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page.

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if ($image->height >= 400) {

-                    $spacer_height = 0;

-                } else {

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

-                }

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

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

-                $slides++;

-            }

-        }// endfore

-    }

+		$preview_post_images = array();

+		if ($preview_get_images) {

+			foreach ($preview_get_images as $row) {

+				$preview_post_images[] = $row->src;

+			}

+		}

+		if (!empty($preview_post_images)) {

+			$post->post_images = implode(',', $preview_post_images);

+		}

+	}

+

+	if ($preview) {

+		$post_images = array();

+		if (isset($post->post_images) && !empty($post->post_images)) {

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

+			$post_images = explode(",", $post->post_images);

+		}

+

+		$main_slides = '';

+		$nav_slides = '';

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if (!empty($image)) {

+					$sizes = getimagesize(trim($image));

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

+					$height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

+

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

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

+					}

+

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

+						if ($image->height >= 400) {

+							$spacer_height = 0;

+						} else {

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

+						}

+

+						$image_title = isset($image->title) ? $image->title : '';

+

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

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

+						$slides++;

+					}

+				}

+			}// endfore

+		} //end if

+	} else {

+		$main_slides = '';

+		$nav_slides = '';

+		/**

+		 * Filter if default images should show on the details page.

+		 *

+		 * @param bool $use_default_image Default false.

+		 * @since 1.6.16

+		 */

+		$use_default_image = apply_filters('geodir_details_default_image_show', false);

+		$post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page.

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image->height >= 400) {

+					$spacer_height = 0;

+				} else {

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

+				}

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

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

+				$slides++;

+			}

+		}// endfore

+	}

 

-    if (!empty($post_images)) {

-        ?>

+	if (!empty($post_images)) {

+		?>

         <div class="geodir_flex-container">

             <div class="geodir_flex-loader"><i class="fa fa-refresh fa-spin"></i></div>

             <div id="geodir_slider" class="geodir_flexslider ">

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

         </div>

     <?php

-    }

+	}

 }

 

 add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);

@@ -1098,177 +1098,177 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+	global $preview, $post;?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

-    $taxonomies = array();

-

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-

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

-        $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

-        $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

-    } else {

-        $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

-    }

+	$taxonomies = array();

+

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+

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

+		$post_type = $post->listing_type;

+		$post_taxonomy = $post_type . 'category';

+		$post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

+	} else {

+		$post_type = $post->post_type;

+		$post_taxonomy = $post_type . 'category';

+	}

 //{	

-    $post_type_info = get_post_type_object($post_type);

-    $listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

-

-    if (!empty($post->post_tags)) {

-

-        if (taxonomy_exists($post_type . '_tags')):

-            $links = array();

-            $terms = array();

-            // to limit post tags

-            $post_tags = trim($post->post_tags, ",");

-            $post_id = isset($post->ID) ? $post->ID : '';

-            /**

-             * Filter the post tags.

-             *

-             * Allows you to filter the post tags output on the details page of a post.

-             *

-             * @since 1.0.0

-             * @param string $post_tags A comma seperated list of tags.

-             * @param int $post_id The current post id.

-             */

-            $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

-

-            $post->post_tags = $post_tags;

-            $post_tags = explode(",", trim($post->post_tags, ","));

-

-

-            foreach ($post_tags as $post_term) {

-

-                // fix slug creation order for tags & location

-                $post_term = trim($post_term);

-

-                $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

-                } else {

-                    $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

-                    $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

-                    $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

-                    $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

-                    $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

-                    $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

-                    if ($match_country || $match_region || $match_city) {

-                        $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    }

-                }

-

-                if (!is_wp_error($term) && is_object($term)) {

-

-                    // fix tag link on detail page

-                    if ($priority_location) {

-

-                        $tag_link = "<a href=''>$post_term</a>";

-                        /**

-                         * Filter the tag name on the details page.

-                         *

-                         * @since 1.5.6

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

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

-                        $links[] = $tag_link;

-                    }

-                    $terms[] = $term;

-                }

-                //

-            }

-            if (!isset($listing_label)) {

-                $listing_label = '';

-            }

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

-        endif;

-

-    }

-

-    if (!empty($post->{$post_taxonomy})) {

-        $links = array();

-        $terms = array();

-        $termsOrdered = array();

-        if (!is_array($post->{$post_taxonomy})) {

-            $post_term = explode(",", trim($post->{$post_taxonomy}, ","));

-        } else {

-            $post_term = $post->{$post_taxonomy};

+	$post_type_info = get_post_type_object($post_type);

+	$listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

+

+	if (!empty($post->post_tags)) {

+

+		if (taxonomy_exists($post_type . '_tags')):

+			$links = array();

+			$terms = array();

+			// to limit post tags

+			$post_tags = trim($post->post_tags, ",");

+			$post_id = isset($post->ID) ? $post->ID : '';

+			/**

+			 * Filter the post tags.

+			 *

+			 * Allows you to filter the post tags output on the details page of a post.

+			 *

+			 * @since 1.0.0

+			 * @param string $post_tags A comma seperated list of tags.

+			 * @param int $post_id The current post id.

+			 */

+			$post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

+

+			$post->post_tags = $post_tags;

+			$post_tags = explode(",", trim($post->post_tags, ","));

+

+

+			foreach ($post_tags as $post_term) {

+

+				// fix slug creation order for tags & location

+				$post_term = trim($post_term);

+

+				$priority_location = false;

+				if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

+					$term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+				} else {

+					$post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

+					$post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

+					$post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

+					$match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

+					$match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

+					$match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

+					if ($match_country || $match_region || $match_city) {

+						$priority_location = true;

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					} else {

+						$insert_term = wp_insert_term($post_term, $post_type . '_tags');

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					}

+				}

+

+				if (!is_wp_error($term) && is_object($term)) {

+

+					// fix tag link on detail page

+					if ($priority_location) {

+

+						$tag_link = "<a href=''>$post_term</a>";

+						/**

+						 * Filter the tag name on the details page.

+						 *

+						 * @since 1.5.6

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

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

+						$links[] = $tag_link;

+					}

+					$terms[] = $term;

+				}

+				//

+			}

+			if (!isset($listing_label)) {

+				$listing_label = '';

+			}

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

+		endif;

+

+	}

+

+	if (!empty($post->{$post_taxonomy})) {

+		$links = array();

+		$terms = array();

+		$termsOrdered = array();

+		if (!is_array($post->{$post_taxonomy})) {

+			$post_term = explode(",", trim($post->{$post_taxonomy}, ","));

+		} else {

+			$post_term = $post->{$post_taxonomy};

 			

 			if ($preview && !$is_backend_preview) {

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

 			}

-        }

-

-        $post_term = array_unique($post_term);

-        if (!empty($post_term)) {

-            foreach ($post_term as $post_term) {

-                $post_term = trim($post_term);

-

-                if ($post_term != ''):

-                    $term = get_term_by('id', $post_term, $post_taxonomy);

-

-                    if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

-                        /**

-                         * Filter the category name on the details page.

-                         *

-                         * @since 1.5.6

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

-                        $links[] = $term_link;

-                        $terms[] = $term;

-                    }

-                endif;

-            }

-            // order alphabetically

-            asort($links);

-            foreach (array_keys($links) as $key) {

-                $termsOrdered[$key] = $terms[$key];

-            }

-            $terms = $termsOrdered;

+		}

+

+		$post_term = array_unique($post_term);

+		if (!empty($post_term)) {

+			foreach ($post_term as $post_term) {

+				$post_term = trim($post_term);

+

+				if ($post_term != ''):

+					$term = get_term_by('id', $post_term, $post_taxonomy);

+

+					if (is_object($term)) {

+						$term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+						/**

+						 * Filter the category name on the details page.

+						 *

+						 * @since 1.5.6

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

+						$links[] = $term_link;

+						$terms[] = $term;

+					}

+				endif;

+			}

+			// order alphabetically

+			asort($links);

+			foreach (array_keys($links) as $key) {

+				$termsOrdered[$key] = $terms[$key];

+			}

+			$terms = $termsOrdered;

 

-        }

+		}

 

-        if (!isset($listing_label)) {

-            $listing_label = '';

-        }

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

+		if (!isset($listing_label)) {

+			$listing_label = '';

+		}

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

 

-    }

+	}

 

-    /**

-     * Filter the taxonomies array before output.

-     *

-     * @since 1.5.9

-     * @param array $taxonomies The array of cats and tags.

-     * @param string $post_type The post type being output.

-     * @param string $listing_label The post type label.

-     * @param string $listing_label The post type label with ucwords function.

-     */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+	/**

+	 * Filter the taxonomies array before output.

+	 *

+	 * @since 1.5.9

+	 * @param array $taxonomies The array of cats and tags.

+	 * @param string $post_type The post type being output.

+	 * @param string $listing_label The post type label.

+	 * @param string $listing_label The post type label with ucwords function.

+	 */

+	$taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

 

-    if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

-    }

+	if (isset($taxonomies[$post_taxonomy])) {

+		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

 }

 

@@ -1290,140 +1290,140 @@ 
 function geodir_action_details_micordata($post='')

 {

 

-    global $preview;

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

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

-        return;

-    }

-

-    // url

-    $c_url = geodir_curPageURL();

-

-    // post reviews

-    $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

-    if (empty($post_reviews)) {

-        $reviews = '';

-    } else {

-        foreach ($post_reviews as $review) {

-            $reviews[] = array(

-                "@type" => "Review",

-                "author" => $review->comment_author,

-                "datePublished" => $review->comment_date,

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

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

-                    "worstRating" => "1"

-                )

-            );

-        }

-

-    }

-

-    // post images

-    $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

-    if (empty($post_images)) {

-        $images = '';

-    } else {

-        $i_arr = array();

-        foreach ($post_images as $img) {

-            $i_arr[] = $img->src;

-        }

-

-        if (count($i_arr) == 1) {

-            $images = $i_arr[0];

-        } else {

-            $images = $i_arr;

-        }

-

-    }

-    //print_r($post);

-    // external links

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

-        $external_links = array_values($external_links);

-    }

-

-    // reviews

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    // schema type

-    $schema_type = 'LocalBusiness';

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

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

-        if($cat_schema){$schema_type = $cat_schema;}

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

-    }

-

-    $schema = array();

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

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

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

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

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

-    $schema['url'] = $c_url;

-    $schema['sameAs'] = $external_links;

-    $schema['image'] = $images;

-    $schema['address'] = array(

-        "@type" => "PostalAddress",

-        "streetAddress" => $post->post_address,

-        "addressLocality" => $post->post_city,

-        "addressRegion" => $post->post_region,

-        "addressCountry" => $post->post_country,

-        "postalCode" => $post->post_zip

-    );

-

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

-        $schema['geo'] = array(

-            "@type" => "GeoCoordinates",

-            "latitude" => $post->post_latitude,

-            "longitude" => $post->post_longitude

-        );

-    }

-

-    if($post_avgratings) {

-        $schema['aggregateRating'] = array(

-            "@type" => "AggregateRating",

-            "ratingValue" => $post_avgratings,

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

-            "worstRating" => "1",

-            "ratingCount" => $comment_count

-        );

-    }

-    $schema['review'] = $reviews;

-

-    /**

-     * Allow the schema JSON-LD info to be filtered.

-     *

-     * @since 1.5.4

-     * @since 1.5.7 Added $post variable.

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

-

-

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

-

-

-    $uploads = wp_upload_dir();

-    $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : '';

-

-    /**

-     * Show facebook open graph meta info

-     *

-     * @since 1.6.6

-     * @param string $facebook_og The open graph html to be filtered.

-     * @param object $post The post object.

-     */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+	global $preview;

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

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

+		return;

+	}

+

+	// url

+	$c_url = geodir_curPageURL();

+

+	// post reviews

+	$post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

+	if (empty($post_reviews)) {

+		$reviews = '';

+	} else {

+		foreach ($post_reviews as $review) {

+			$reviews[] = array(

+				"@type" => "Review",

+				"author" => $review->comment_author,

+				"datePublished" => $review->comment_date,

+				"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.

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

+					"worstRating" => "1"

+				)

+			);

+		}

+

+	}

+

+	// post images

+	$post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if (empty($post_images)) {

+		$images = '';

+	} else {

+		$i_arr = array();

+		foreach ($post_images as $img) {

+			$i_arr[] = $img->src;

+		}

+

+		if (count($i_arr) == 1) {

+			$images = $i_arr[0];

+		} else {

+			$images = $i_arr;

+		}

+

+	}

+	//print_r($post);

+	// external links

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

+		$external_links = array_values($external_links);

+	}

+

+	// reviews

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	// schema type

+	$schema_type = 'LocalBusiness';

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

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

+		if($cat_schema){$schema_type = $cat_schema;}

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

+	}

+

+	$schema = array();

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

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

+	$schema['name'] = $post->post_title;

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

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

+	$schema['url'] = $c_url;

+	$schema['sameAs'] = $external_links;

+	$schema['image'] = $images;

+	$schema['address'] = array(

+		"@type" => "PostalAddress",

+		"streetAddress" => $post->post_address,

+		"addressLocality" => $post->post_city,

+		"addressRegion" => $post->post_region,

+		"addressCountry" => $post->post_country,

+		"postalCode" => $post->post_zip

+	);

+

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

+		$schema['geo'] = array(

+			"@type" => "GeoCoordinates",

+			"latitude" => $post->post_latitude,

+			"longitude" => $post->post_longitude

+		);

+	}

+

+	if($post_avgratings) {

+		$schema['aggregateRating'] = array(

+			"@type" => "AggregateRating",

+			"ratingValue" => $post_avgratings,

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

+			"worstRating" => "1",

+			"ratingCount" => $comment_count

+		);

+	}

+	$schema['review'] = $reviews;

+

+	/**

+	 * Allow the schema JSON-LD info to be filtered.

+	 *

+	 * @since 1.5.4

+	 * @since 1.5.7 Added $post variable.

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

+

+

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

+

+

+	$uploads = wp_upload_dir();

+	$facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : '';

+

+	/**

+	 * Show facebook open graph meta info

+	 *

+	 * @since 1.6.6

+	 * @param string $facebook_og The open graph html to be filtered.

+	 * @param object $post The post object.

+	 */

+	echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

 

 

 

@@ -1443,7 +1443,7 @@ 
  */

 function geodir_action_details_next_prev()

 {

-    ?>

+	?>

     <div class="geodir-pos_navigation clearfix">

     <div

         class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

@@ -1461,15 +1461,15 @@ 
  */

 function geodir_action_before_single_post()

 {

-    global $post;

-    /**

-     * Called at the very start of the details page output, before the title section.

-     *

-     * @since 1.0.0

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

-     * @global WP_Post|null $post The current post, if available.

-     */

-    do_action('geodir_before_single_post', $post); // extra action	

+	global $post;

+	/**

+	 * Called at the very start of the details page output, before the title section.

+	 *

+	 * @since 1.0.0

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

+	 * @global WP_Post|null $post The current post, if available.

+	 */

+	do_action('geodir_before_single_post', $post); // extra action	

 }

 

 /**

@@ -1480,13 +1480,13 @@ 
  */

 function geodir_action_after_single_post($post)

 {

-    /**

-     * Called on the details page after the details page tabs section and before the next/prev buttons.

-     *

-     * @since 1.0.0

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

-     */

-    do_action('geodir_after_single_post', $post); // extra action	

+	/**

+	 * Called on the details page after the details page tabs section and before the next/prev buttons.

+	 *

+	 * @since 1.0.0

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

+	 */

+	do_action('geodir_after_single_post', $post); // extra action	

 }

 

 add_action('geodir_details_main_content', 'geodir_action_before_single_post', 10);

@@ -1512,168 +1512,168 @@ 
  */

 function geodir_action_listings_title()

 {

-    global $wp, $term;

-

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

-

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

-

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

-    $single_name = $post_type_info->labels->singular_name;

-

-    $taxonomy = geodir_get_taxonomies($gd_post_type, true);

-

-    $gd_country = get_query_var('gd_country');

-    $gd_region = get_query_var('gd_region');

-    $gd_city = get_query_var('gd_city');

-

-    if (!empty($term)) {

-        $location_name = '';

-        if ($gd_country != '' || $gd_region != '' || $gd_city != '') {

-            if ($gd_country != '') {

-                $location_name = geodir_sanitize_location_name('gd_country', $gd_country);

-            }

-

-            if ($gd_region != '') {

-                $location_name = geodir_sanitize_location_name('gd_region', $gd_region);

-            }

-

-            if ($gd_city != '') {

-                $location_name = geodir_sanitize_location_name('gd_city', $gd_city);

-            }

-        }

-

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

-        if (!empty($current_term)) {

-            $current_term_name = __(ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                $location_last_char = substr($location_name, -1);

-                $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-            } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-            }

-        } else {

-            if (count($taxonomy) > 1) {

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

-

-                if (!empty($current_term)) {

-                    $current_term_name = __(ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                        $location_last_char = substr($location_name, -1);

-                        $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-                    } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-                    }

-                }

-            }

-        }

+	global $wp, $term;

 

-    } else {

-        $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

-        $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

-        $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-        $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-        if (function_exists('get_actual_location_name')) {

-            $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

-            $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

-            $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

-        }

+	$list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+	$single_name = $post_type_info->labels->singular_name;

 

-        if ($gd_city != '') {

-            if ($gd_city_actual != '') {

-                $gd_city = $gd_city_actual;

-            } else {

-                $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);

-                $gd_city = preg_replace('/[_-]/', ' ', $gd_city);

-                $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

-            }

+	$taxonomy = geodir_get_taxonomies($gd_post_type, true);

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

-        } else if ($gd_region != '') {

-            if ($gd_region_actual != '') {

-                $gd_region = $gd_region_actual;

-            } else {

-                $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);

-                $gd_region = preg_replace('/[_-]/', ' ', $gd_region);

-                $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

-            }

+	$gd_country = get_query_var('gd_country');

+	$gd_region = get_query_var('gd_region');

+	$gd_city = get_query_var('gd_city');

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

-        } else if ($gd_country != '') {

-            if ($gd_country_actual != '') {

-                $gd_country = $gd_country_actual;

-            } else {

-                $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);

-                $gd_country = preg_replace('/[_-]/', ' ', $gd_country);

-                $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

-        }

-    }

-

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

-    }

-    /** 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 */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-

-    $title = $list_title;

-    $gd_page = '';

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

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

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

-        }

+	if (!empty($term)) {

+		$location_name = '';

+		if ($gd_country != '' || $gd_region != '' || $gd_city != '') {

+			if ($gd_country != '') {

+				$location_name = geodir_sanitize_location_name('gd_country', $gd_country);

+			}

 

-    }

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

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

-        }

+			if ($gd_region != '') {

+				$location_name = geodir_sanitize_location_name('gd_region', $gd_region);

+			}

 

-    }

+			if ($gd_city != '') {

+				$location_name = geodir_sanitize_location_name('gd_city', $gd_city);

+			}

+		}

+

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

+		if (!empty($current_term)) {

+			$current_term_name = __(ucfirst($current_term->name), 'geodirectory');

+			if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+				$location_last_char = substr($location_name, -1);

+				$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+				$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+			} else {

+				$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+			}

+		} else {

+			if (count($taxonomy) > 1) {

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

+

+				if (!empty($current_term)) {

+					$current_term_name = __(ucfirst($current_term->name), 'geodirectory');

+					if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+						$location_last_char = substr($location_name, -1);

+						$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+						$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+					} else {

+						$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+					}

+				}

+			}

+		}

+

+	} else {

+		$gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+

+		$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+

+		if (function_exists('get_actual_location_name')) {

+			$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+			$gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+			$gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

+		}

+

+		if ($gd_city != '') {

+			if ($gd_city_actual != '') {

+				$gd_city = $gd_city_actual;

+			} else {

+				$gd_city = preg_replace('/-(\d+)$/', '', $gd_city);

+				$gd_city = preg_replace('/[_-]/', ' ', $gd_city);

+				$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

+			}

 

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

+		} else if ($gd_region != '') {

+			if ($gd_region_actual != '') {

+				$gd_region = $gd_region_actual;

+			} else {

+				$gd_region = preg_replace('/-(\d+)$/', '', $gd_region);

+				$gd_region = preg_replace('/[_-]/', ' ', $gd_region);

+				$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

+			}

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

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

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+		} else if ($gd_country != '') {

+			if ($gd_country_actual != '') {

+				$gd_country = $gd_country_actual;

+			} else {

+				$gd_country = preg_replace('/-(\d+)$/', '', $gd_country);

+				$gd_country = preg_replace('/[_-]/', ' ', $gd_country);

+				$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

+			}

 

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

-        /**

-         * Filter the listing page title.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the category page.

-         */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+		}

+	}

+

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	}

+	/** 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 */

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

+

+

+	$title = $list_title;

+	$gd_page = '';

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

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

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

+		}

+

+	}

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

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

+		}

+

+	}

+

+

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

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

+

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

+		/**

+		 * Filter the listing page title.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the category page.

+		 */

+		apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1686,46 +1686,46 @@ 
  */

 function geodir_action_listings_description()

 {

-    global $wp_query;

-    $current_term = $wp_query->get_queried_object();

+	global $wp_query;

+	$current_term = $wp_query->get_queried_object();

 

-    $gd_post_type = geodir_get_current_posttype();

-    if (isset($current_term->term_id) && $current_term->term_id != '') {

+	$gd_post_type = geodir_get_current_posttype();

+	if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

-        $saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

-        if ($term_desc && !$saved_data) {

-            $saved_data = $term_desc;

-        }

+		$term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+		$saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

+		if ($term_desc && !$saved_data) {

+			$saved_data = $term_desc;

+		}

 

-        // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

-        }

+		// stop payment manager filtering content length

+		$filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

+		if ( false !== $filter_priority ) {

+			remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+		}

 

-        /**

-         * Apply the core filter `the_content` filter to the variable string.

-         *

-         * This is a WordPress core filter that does many things.

-         *

-         * @since 1.0.0

-         * @param string $var The string to apply the filter to.

-         */

-        $cat_description = apply_filters('the_content', $saved_data);

+		/**

+		 * Apply the core filter `the_content` filter to the variable string.

+		 *

+		 * This is a WordPress core filter that does many things.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to apply the filter to.

+		 */

+		$cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

-        }

+		if ( false !== $filter_priority ) {

+			add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+		}

 

-        if ($cat_description) {

-            ?>

+		if ($cat_description) {

+			?>

 

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

-        }

+		}

 

-    }

+	}

 }

 

 // action for adding the listings page top widget area

@@ -1744,11 +1744,11 @@ 
  */

 function geodir_action_geodir_sidebar_listings_top()

 {

-    if (get_option('geodir_show_listing_top_section')) { ?>

+	if (get_option('geodir_show_listing_top_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

             <?php dynamic_sidebar('geodir_listing_top'); ?>

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

     <?php }

@@ -1771,35 +1771,35 @@ 
  */

 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_open_replace'])) {

-        $text = $tc['geodir_sidebar_left_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_left_open_id'])) {

-        $id = $tc['geodir_sidebar_left_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_left_open_class'])) {

-        $class = $tc['geodir_sidebar_left_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_open_replace'])) {

+		$text = $tc['geodir_sidebar_left_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_left_open_id'])) {

+		$id = $tc['geodir_sidebar_left_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_left_open_class'])) {

+		$class = $tc['geodir_sidebar_left_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1815,13 +1815,13 @@ 
  */

 function geodir_action_sidebar_left_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_close_replace'])) {

-        $text = $tc['geodir_sidebar_left_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_close_replace'])) {

+		$text = $tc['geodir_sidebar_left_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1834,7 +1834,7 @@ 
  */

 function geodir_listing_left_section()

 {

-    if (get_option('geodir_show_listing_left_section')) { ?>

+	if (get_option('geodir_show_listing_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -1852,20 +1852,20 @@ 
  */

 function geodir_action_listings_sidebar_left()

 {

-    if (get_option('geodir_show_listing_left_section')) {

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

-        do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) left sidebar content.

-         *

-         * All the content for the listings page left sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_left_inside');

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

-        do_action('geodir_sidebar_left_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_left_section')) {

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

+		do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) left sidebar content.

+		 *

+		 * All the content for the listings page left sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_left_inside');

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

+		do_action('geodir_sidebar_left_close', 'listings-page');

+	}

 }

 

 /**

@@ -1878,7 +1878,7 @@ 
  */

 function geodir_listing_right_section()

 {

-    if (get_option('geodir_show_listing_right_section')) { ?>

+	if (get_option('geodir_show_listing_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -1896,20 +1896,20 @@ 
  */

 function geodir_action_listings_sidebar_right()

 {

-    if (get_option('geodir_show_listing_right_section')) {

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

-        do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) right sidebar content.

-         *

-         * All the content for the listings page right sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_right_inside');

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

-        do_action('geodir_sidebar_right_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_right_section')) {

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

+		do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) right sidebar content.

+		 *

+		 * All the content for the listings page right sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_right_inside');

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

+		do_action('geodir_sidebar_right_close', 'listings-page');

+	}

 }

 

 

@@ -1926,23 +1926,23 @@ 
  */

 function geodir_action_main_content_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_open_replace'])) {

-        $text = $tc['geodir_main_content_open_replace'];

-    } else {

-        $text = '<main id="[id]" class="[class]" role="main">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_open_replace'])) {

+		$text = $tc['geodir_main_content_open_replace'];

+	} else {

+		$text = '<main id="[id]" class="[class]" role="main">';

+	}

 

-    if (!empty($tc['geodir_main_content_open_id'])) {

-        $id = $tc['geodir_main_content_open_id'];

-    }

-    if (!empty($tc['geodir_main_content_open_class'])) {

-        $class = $tc['geodir_main_content_open_class'];

-    }

+	if (!empty($tc['geodir_main_content_open_id'])) {

+		$id = $tc['geodir_main_content_open_id'];

+	}

+	if (!empty($tc['geodir_main_content_open_class'])) {

+		$class = $tc['geodir_main_content_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1955,13 +1955,13 @@ 
  */

 function geodir_action_main_content_close()

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_close_replace'])) {

-        $text = $tc['geodir_main_content_close_replace'];

-    } else {

-        $text = '</main><!-- main ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_close_replace'])) {

+		$text = $tc['geodir_main_content_close_replace'];

+	} else {

+		$text = '</main><!-- main ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1973,14 +1973,14 @@ 
  */

 function geodir_action_listings_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_listing_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_listing_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_listings_content_inside', 'geodir_action_listings_content_inside', 10);

@@ -1996,47 +1996,47 @@ 
  */

 function geodir_action_listings_content()

 {

-    /**

-     * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @param string $id The id for the div. Usually 'geodir-main-content'.

-     * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @see 'geodir_main_content_close' Where the oposing closing tag is added.

-     */

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

-    /**

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

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_listing');

-    echo '</div>';

-

-    /**

-     * This actions calls the listings list content. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_listings_content_inside');

-

-    /**

-     * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_listing');

-

-    /**

-     * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @see 'geodir_main_content_open' Where the oposing opening tag is added.

-     */

-    do_action('geodir_main_content_close', 'listings-page');

+	/**

+	 * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @param string $id The id for the div. Usually 'geodir-main-content'.

+	 * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @see 'geodir_main_content_close' Where the oposing closing tag is added.

+	 */

+	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.'">';

+	/**

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

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_listing');

+	echo '</div>';

+

+	/**

+	 * This actions calls the listings list content. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_listings_content_inside');

+

+	/**

+	 * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_listing');

+

+	/**

+	 * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_main_content_open' Where the oposing opening tag is added.

+	 */

+	do_action('geodir_main_content_close', 'listings-page');

 }

 

 

@@ -2051,10 +2051,10 @@ 
  */

 function geodir_action_sidebar_listings_bottom_section()

 {

-    if (get_option('geodir_show_listing_bottom_section')) { ?>

+	if (get_option('geodir_show_listing_bottom_section')) { ?>

         <div class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

             <?php dynamic_sidebar('geodir_listing_bottom'); ?>

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

     <?php }

@@ -2074,38 +2074,38 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

-    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 */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

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

-

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

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

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

-        }

+	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 */

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

+

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

+

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

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

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

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

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

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

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

 

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

-    echo $title;

-    echo '</h1></header>';

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

+	echo $title;

+	echo '</h1></header>';

 }

 

 add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);

@@ -2136,61 +2136,61 @@ 
  */

 function geodir_action_add_listing_form()

 {

-    global $cat_display, $post_cat, $current_user, $gd_session;

-    $page_id = get_the_ID();

-    $post = '';

-    $title = '';

-    $desc = '';

-    $kw_tags = '';

-    $required_msg = '';

-    $submit_button = '';

-

-    $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

-

-    $thumb_img_arr = array();

-    $curImages = '';

-

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

-        global $post;

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

-        $listing_type = $post->listing_type;

-        $title = $post->post_title;

-        $desc = $post->post_desc;

-        $post_cat = $post->post_category;

-

-        $kw_tags = $post->post_tags;

-        $curImages = isset($post->post_images) ? $post->post_images : '';

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

-        global $post, $post_images;

-

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

-        $thumb_img_arr = geodir_get_images($post->ID);

-        if ($thumb_img_arr) {

-            foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

-            }

-        }

+	global $cat_display, $post_cat, $current_user, $gd_session;

+	$page_id = get_the_ID();

+	$post = '';

+	$title = '';

+	$desc = '';

+	$kw_tags = '';

+	$required_msg = '';

+	$submit_button = '';

+

+	$ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

+

+	$thumb_img_arr = array();

+	$curImages = '';

+

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

+		global $post;

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

+		$listing_type = $post->listing_type;

+		$title = $post->post_title;

+		$desc = $post->post_desc;

+		$post_cat = $post->post_category;

+

+		$kw_tags = $post->post_tags;

+		$curImages = isset($post->post_images) ? $post->post_images : '';

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

+		global $post, $post_images;

+

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

+		$thumb_img_arr = geodir_get_images($post->ID);

+		if ($thumb_img_arr) {

+			foreach ($thumb_img_arr as $post_img) {

+				$curImages .= $post_img->src . ',';

+			}

+		}

 

-        $listing_type = $post->post_type;

-        $title = $post->post_title;

-        $desc = $post->post_content;

-        $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

-    } else {

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

-    }

+		$listing_type = $post->post_type;

+		$title = $post->post_title;

+		$desc = $post->post_content;

+		$kw_tags = $post->post_tags;

+		$kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+	} else {

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

+	}

 

-    if ($current_user->ID != '0') {

-        $user_login = true;

-    }

+	if ($current_user->ID != '0') {

+		$user_login = true;

+	}

 

-    $post_type_info = geodir_get_posttype_info($listing_type);

+	$post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+	$cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

     

-    $package_info = array();

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

-    ?>

+	$package_info = array();

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

+	?>

     <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);?>"/>

@@ -2201,114 +2201,114 @@ 
         <?php } if (isset($_REQUEST['backandedit'])) { ?>

             <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

         <?php

-        } 

-        /**

-         * Called at the very top of the add listing page form for frontend.

-         *

-         * This is called just before the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_detail_fields');

-        ?>

+		} 

+		/**

+		 * Called at the very top of the add listing page form for frontend.

+		 *

+		 * This is called just before the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_detail_fields');

+		?>

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

         <?php

-        /**

-         * Called at the top of the add listing page form for frontend.

-         *

-         * This is called after the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_main_form_fields');

-        ?>

+		/**

+		 * Called at the top of the add listing page form for frontend.

+		 *

+		 * This is called after the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		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

-                /**

-                 * Filter the add listing page title input label.

-                 *

-                 * @since 1.6.11

-                 * @param string $title The title to be output.

-                 * @param string $cpt_singular_name The singular title of the curent CPT.

-                 * @param string $listing_type The CPT being requested. ie: gd_place.

-                 */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+				/**

+				 * Filter the add listing page title input label.

+				 *

+				 * @since 1.6.11

+				 * @param string $title The title to be output.

+				 * @param string $cpt_singular_name The singular title of the curent CPT.

+				 * @param string $listing_type The CPT being requested. ie: gd_place.

+				 */

+				echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><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>

         </div>

         <?php

-        $show_editor = get_option('geodir_tiny_editor_on_add_listing');

-        $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false;

-        /**

-         * Filter whether to show or don't show the editor.

-         *

-         * @since 1.6.16

-         * @param bool $show_editor If true the editor will be available for description field.

-         * @param object $package_info The listing package.

-         * @param string $listing_type The current post type.

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

-         */

-        $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);

-

-        $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

-        $desc_limit = '';

-        /**

-         * Filter the add listing description field character limit number.

-         *

-         * @since 1.0.0

-         * @param int $desc_limit The amount of characters to limit the description to.

-         */

-        $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);

-        /**

-         * Filter the add listing description field text.

-         *

-         * @since 1.0.0

-         * @param string $desc The text for the description field.

-         * @param int $desc_limit The character limit number if any.

-         */

-        $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

-        $desc_limit_msg = '';

-        /**

-         * Filter the add listing description limit message.

-         *

-         * This is the message shown if there is a limit applied to the amount of characters the description can use.

-         *

-         * @since 1.0.0

-         * @param string $desc_limit_msg The limit message string if any.

-         * @param int $desc_limit The character limit numer if any.

-         */

-        $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

+		$show_editor = get_option('geodir_tiny_editor_on_add_listing');

+		$show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false;

+		/**

+		 * Filter whether to show or don't show the editor.

+		 *

+		 * @since 1.6.16

+		 * @param bool $show_editor If true the editor will be available for description field.

+		 * @param object $package_info The listing package.

+		 * @param string $listing_type The current post type.

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

+		 */

+		$show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);

+

+		$desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

+		$desc_limit = '';

+		/**

+		 * Filter the add listing description field character limit number.

+		 *

+		 * @since 1.0.0

+		 * @param int $desc_limit The amount of characters to limit the description to.

+		 */

+		$desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);

+		/**

+		 * Filter the add listing description field text.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc The text for the description field.

+		 * @param int $desc_limit The character limit number if any.

+		 */

+		$desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

+		$desc_limit_msg = '';

+		/**

+		 * Filter the add listing description limit message.

+		 *

+		 * This is the message shown if there is a limit applied to the amount of characters the description can use.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc_limit_msg The limit message string if any.

+		 * @param int $desc_limit The character limit numer if any.

+		 */

+		$desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

-        $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

-            /**

-             * Called on the add listing page form for frontend just before the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_description_field');

+		$desc_class = '';

+		if ($desc_limit === '' || (int)$desc_limit > 0) {

+			/**

+			 * Called on the add listing page form for frontend just before the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_description_field');

             

-            $desc_class = ' required_field';

-        } else {

-            $desc_class = ' hidden';

-        }

-        ?>

+			$desc_class = ' required_field';

+		} else {

+			$desc_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

             <label><?php

-                /**

-                 * Filter the add listing page description input label.

-                 *

-                 * @since 1.6.11

-                 * @param string $title The title to be output.

-                 * @param string $cpt_singular_name The singular title of the curent CPT.

-                 * @param string $listing_type The CPT being requested. ie: gd_place.

-                 */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+				/**

+				 * Filter the add listing page description input label.

+				 *

+				 * @since 1.6.11

+				 * @param string $title The title to be output.

+				 * @param string $cpt_singular_name The singular title of the curent CPT.

+				 * @param string $listing_type The CPT being requested. ie: gd_place.

+				 */

+				echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

-            if ($show_editor) {

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

-            ?>

+			if ($show_editor) {

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

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

         </div>

         <?php

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

-            /**

-             * Called on the add listing page form for frontend just after the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_description_field');

-        }

+		if ($desc_limit === '' || (int)$desc_limit > 0) {

+			/**

+			 * Called on the add listing page form for frontend just after the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_description_field');

+		}

         

-        $kw_tags = esc_attr(stripslashes($kw_tags));

-        $kw_tags_count = TAGKW_TEXT_COUNT;

-        $kw_tags_msg = TAGKW_MSG;

-        /**

-         * Filter the add listing tags character limit.

-         *

-         * @since 1.0.0

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

-        /**

-         * Filter the add listing tags field value.

-         *

-         * You can use the $_REQUEST values to check if this is a go back and edit value etc.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags The tag field value, usually a comma separated list of tags.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

-        /**

-         * Filter the add listing tags field message text.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags_msg The message shown under the field.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

+		$kw_tags = esc_attr(stripslashes($kw_tags));

+		$kw_tags_count = TAGKW_TEXT_COUNT;

+		$kw_tags_msg = TAGKW_MSG;

+		/**

+		 * Filter the add listing tags character limit.

+		 *

+		 * @since 1.0.0

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

+		/**

+		 * Filter the add listing tags field value.

+		 *

+		 * You can use the $_REQUEST values to check if this is a go back and edit value etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags The tag field value, usually a comma separated list of tags.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

+		/**

+		 * Filter the add listing tags field message text.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags_msg The message shown under the field.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

-        $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

-            /**

-             * Called on the add listing page form for frontend just before the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_listing_tags_field');

-        } else {

-            $tags_class = ' hidden';

-        }

-        ?>

+		$tags_class = '';

+		if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+			/**

+			 * Called on the add listing page form for frontend just before the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_listing_tags_field');

+		} else {

+			$tags_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

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

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

@@ -2379,90 +2379,90 @@ 
             <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

         </div>

         <?php

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

-            /**

-             * Called on the add listing page form for frontend just after the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_listing_tags_field');

-        }

+		if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+			/**

+			 * Called on the add listing page form for frontend just after the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_listing_tags_field');

+		}

         

-        $package_info = array();

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

+		$package_info = array();

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

         

-        // adjust values here

-        $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+		// adjust values here

+		$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-        $multiple = true; // allow multiple files upload

+		$multiple = true; // allow multiple files upload

 

-        $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+		$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-        $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+		$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-        $thumb_img_arr = array();

-        $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, ",");

+		$thumb_img_arr = array();

+		$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 ($curImages != '') {

-                $curImages_array = explode(',', $curImages);

-                $totImg = count($curImages_array);

-            }

+			if ($curImages != '') {

+				$curImages_array = explode(',', $curImages);

+				$totImg = count($curImages_array);

+			}

 

-            $listing_type = $post->listing_type;

+			$listing_type = $post->listing_type;

 

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

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

-            $listing_type = $post->post_type;

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

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

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

+			$listing_type = $post->post_type;

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

 

-        } else {

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

-        }

+		} else {

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

+		}

 

 

-        if (!empty($thumb_img_arr)) {

-            foreach ($thumb_img_arr as $img) {

-                //$curImages = $img->src.",";

-            }

-

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

-        }

+		if (!empty($thumb_img_arr)) {

+			foreach ($thumb_img_arr as $img) {

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

+			}

 

-        if ($curImages != '')

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

-        else

-            $svalue = '';

-

-        $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

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

-        /**

-         * Filter to be able to show/hide the image upload section of the add listing form.

-         *

-         * @since 1.0.0

-         * @param bool $show_image_input_box Set true to show. Set false to not show.

-         * @param string $listing_type The custom post type slug.

-         */

-        $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

-        if ($show_image_input_box) {

-            ?>

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

+		}

+

+		if ($curImages != '')

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

+		else

+			$svalue = '';

+

+		$image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

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

+		/**

+		 * Filter to be able to show/hide the image upload section of the add listing form.

+		 *

+		 * @since 1.0.0

+		 * @param bool $show_image_input_box Set true to show. Set false to not show.

+		 * @param string $listing_type The custom post type slug.

+		 */

+		$show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

+		if ($show_image_input_box) {

+			?>

 

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

-                } ?>

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

+				} ?>

                 <?php if ($image_limit > 1) {

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

-                } ?>

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

+				} ?>

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

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+				} ?>

             </h5>

 

             <div class="geodir_form_row clearfix" id="<?php echo $id; ?>dropbox"

@@ -2500,12 +2500,12 @@ 
         <?php } ?>

 

         <?php

-        /**

-         * Called on the add listing page form for frontend just after the image upload field.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_main_form_fields');?>

+		/**

+		 * Called on the add listing page form for frontend just after the image upload field.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_main_form_fields');?>

 

 

         <!-- add captcha code -->

@@ -2534,7 +2534,7 @@ 
 

     </form>

     <?php

-    wp_reset_query();

+	wp_reset_query();

 }

 

 /**

@@ -2545,7 +2545,7 @@ 
  */

 function geodir_add_listing_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_add_listing_sidebar');

+	dynamic_sidebar('geodir_add_listing_sidebar');

 }

 

 add_action('geodir_add_listing_sidebar_inside', 'geodir_add_listing_sidebar_widget_area', 10);

@@ -2560,16 +2560,16 @@ 
  */

 function geodir_action_add_listing_sidebar()

 {

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

-    do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

-    /**

-     * This is used to add the content to the add listing page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_add_listing_sidebar_inside');

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

-    do_action('geodir_sidebar_right_close', 'details-page');

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

+	do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

+	/**

+	 * This is used to add the content to the add listing page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_add_listing_sidebar_inside');

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

+	do_action('geodir_sidebar_right_close', 'details-page');

 }

 

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

@@ -2586,11 +2586,11 @@ 
  */

 function geodir_action_geodir_sidebar_signup_top()

 {

-    ?>

+	?>

     <div

         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'); ?>">

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

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

 <?php

@@ -2609,11 +2609,11 @@ 
 function geodir_action_signup_forms()

 {

 

-    global $user_login;

+	global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+	$is_enable_signup = get_option( 'users_can_register' );

     

-    ?>

+	?>

     <script type="text/javascript">

         <?php if ( $user_login ) { ?>

         setTimeout(function () {

@@ -2649,67 +2649,67 @@ 
         <?php } ?>

     </script><?php

 

-    global $errors;

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

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

-

-    if (!empty($errors)) {

-        foreach ($errors as $errorsObj) {

-            foreach ($errorsObj as $key => $val) {

-                for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

-                    $registration_error_msg = 1;

-                }

-            }

-        }

-    }

+	global $errors;

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

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

+

+	if (!empty($errors)) {

+		foreach ($errors as $errorsObj) {

+			foreach ($errorsObj as $key => $val) {

+				for ($i = 0; $i < count($val); $i++) {

+					echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+					$registration_error_msg = 1;

+				}

+			}

+		}

+	}

 

-    if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

-        ?>

+	if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

+		?>

 

         <div class="login_form">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

 

     <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

 

         <div class="registration_form">

             <?php

-            /**

-             * Contains registration form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+			/**

+			 * Contains registration form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

 

         <div class="login_form_l">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

         

         <?php if ( $is_enable_signup ) { ?>

             <div class="registration_form_r">

                 <?php

-                /**

-                 * Contains registration form template.

-                 *

-                 * @since 1.0.0

-                 */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+				/**

+				 * Contains registration form template.

+				 *

+				 * @since 1.0.0

+				 */

+				include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2741,66 +2741,66 @@ 
  */

 function geodir_action_author_page_title()

 {

-    global $term;

+	global $term;

 

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

-    $single_name = $post_type_info->labels->singular_name;

+	$list_title = $add_string_in_title . $post_type_info->labels->name;

+	$single_name = $post_type_info->labels->singular_name;

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type);

+	$taxonomy = geodir_get_taxonomies($gd_post_type);

 

-    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($term)) {

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

+		if (!empty($current_term))

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

+	}

 

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

-    /** 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 */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	}

+	/** 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 */

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

 

-    $title = $list_title;

-    if(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{

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

-        }

+	$title = $list_title;

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

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

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

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

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

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

 

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

-        /**

-         * Filter the author page title text.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the page.

-         */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

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

+		/**

+		 * Filter the author page title text.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the page.

+		 */

+		apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

 }

 

 

@@ -2818,11 +2818,11 @@ 
  */

 function geodir_action_geodir_sidebar_author_top()

 {

-    if (get_option('geodir_show_author_top_section')) { ?>

+	if (get_option('geodir_show_author_top_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

             <?php dynamic_sidebar('geodir_author_top'); ?>

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

     <?php }

@@ -2838,7 +2838,7 @@ 
  */

 function geodir_author_left_section()

 {

-    if (get_option('geodir_show_author_left_section')) { ?>

+	if (get_option('geodir_show_author_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -2859,19 +2859,19 @@ 
  */

 function geodir_action_author_sidebar_left()

 {

-    if (get_option('geodir_show_author_left_section')) {

+	if (get_option('geodir_show_author_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

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

-        do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_left_inside');

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

-        do_action('geodir_sidebar_left_close', 'author-page');

-    }

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

+		do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_left_inside');

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

+		do_action('geodir_sidebar_left_close', 'author-page');

+	}

 }

 

 /**

@@ -2884,7 +2884,7 @@ 
  */

 function geodir_author_right_section()

 {

-    if (get_option('geodir_show_author_right_section')) { ?>

+	if (get_option('geodir_show_author_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -2904,18 +2904,18 @@ 
  */

 function geodir_action_author_sidebar_right()

 {

-    if (get_option('geodir_show_author_right_section')) {

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

-        do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_right_inside');

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

-        do_action('geodir_sidebar_right_close', 'author-page');

-    }

+	if (get_option('geodir_show_author_right_section')) {

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

+		do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_right_inside');

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

+		do_action('geodir_sidebar_right_close', 'author-page');

+	}

 }

 

 /**

@@ -2927,14 +2927,14 @@ 
  */

 function geodir_action_author_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_author_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_author_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_author_content_inside', 'geodir_action_author_content_inside', 10);

@@ -2949,22 +2949,22 @@ 
  */

 function geodir_action_author_content()

 {

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

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

-    echo '<div class="clearfix">';

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

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the author page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_author_content_inside');

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

-    do_action('geodir_after_listing');

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

-    do_action('geodir_main_content_close', 'author-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

+	echo '<div class="clearfix">';

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the author page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_author_content_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_after_listing');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'author-page');

 }

 

 add_action('geodir_sidebar_author_bottom_section', 'geodir_action_sidebar_author_bottom_section', 10);

@@ -2978,11 +2978,11 @@ 
  */

 function geodir_action_sidebar_author_bottom_section()

 {

-    if (get_option('geodir_show_author_bottom_section')) { ?>

+	if (get_option('geodir_show_author_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

             <?php dynamic_sidebar('geodir_author_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3001,23 +3001,23 @@ 
  */

 function geodir_action_search_page_title()

 {

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$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;}

+	$pt_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() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

-    /** 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 */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /** This action is documented in geodirectory_template_actions.php */

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+	}

+	/** 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 */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/** This action is documented in geodirectory_template_actions.php */

+		apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3033,11 +3033,11 @@ 
  */

 function geodir_action_geodir_sidebar_search_top()

 {

-    if (get_option('geodir_show_search_top_section')) { ?>

+	if (get_option('geodir_show_search_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

             <?php dynamic_sidebar('geodir_search_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3053,7 +3053,7 @@ 
  */

 function geodir_search_left_section()

 {

-    if (get_option('geodir_show_search_left_section')) { ?>

+	if (get_option('geodir_show_search_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -3073,19 +3073,19 @@ 
  */

 function geodir_action_search_sidebar_left()

 {

-    if (get_option('geodir_show_search_left_section')) {

+	if (get_option('geodir_show_search_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'search-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'search-page');

+	}

 }

 

 /**

@@ -3098,7 +3098,7 @@ 
  */

 function geodir_search_right_section()

 {

-    if (get_option('geodir_show_search_right_section')) { ?>

+	if (get_option('geodir_show_search_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -3118,18 +3118,18 @@ 
  */

 function geodir_action_search_sidebar_right()

 {

-    if (get_option('geodir_show_search_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'search-page');

-    }

+	if (get_option('geodir_show_search_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'search-page');

+	}

 }

 

 

@@ -3144,11 +3144,11 @@ 
  */

 function geodir_action_sidebar_search_bottom_section()

 {

-    if (get_option('geodir_show_search_bottom_section')) { ?>

+	if (get_option('geodir_show_search_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

             <?php dynamic_sidebar('geodir_search_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3163,14 +3163,14 @@ 
  */

 function geodir_action_search_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_search_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_search_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_search_content_inside', 'geodir_action_search_content_inside', 10);

@@ -3186,22 +3186,22 @@ 
  */

 function geodir_action_search_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

-    echo '<div class="clearfix">';

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the search page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_search_content_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_after_listing');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'search-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

+	echo '<div class="clearfix">';

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the search page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_search_content_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_after_listing');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'search-page');

 }

 

 ###############################################

@@ -3224,11 +3224,11 @@ 
  */

 function geodir_action_geodir_sidebar_home_top()

 {

-    if (get_option('geodir_show_home_top_section')) { ?>

+	if (get_option('geodir_show_home_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

             <?php dynamic_sidebar('geodir_home_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3244,7 +3244,7 @@ 
  */

 function geodir_home_left_section()

 {

-    if (get_option('geodir_show_home_left_section')) { ?>

+	if (get_option('geodir_show_home_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_left'); ?>

         </div><!-- end geodir-content-left -->

@@ -3266,19 +3266,19 @@ 
  */

 function geodir_action_home_sidebar_left()

 {

-    if (get_option('geodir_show_home_left_section')) {

+	if (get_option('geodir_show_home_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'home-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'home-page');

+	}

 }

 

 /**

@@ -3291,7 +3291,7 @@ 
  */

 function geodir_home_right_section()

 {

-    if (get_option('geodir_show_home_right_section')) { ?>

+	if (get_option('geodir_show_home_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_right'); ?>

         </div><!-- end geodir-content-right -->

@@ -3312,18 +3312,18 @@ 
  */

 function geodir_action_home_sidebar_right()

 {

-    if (get_option('geodir_show_home_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'home-page');

-    }

+	if (get_option('geodir_show_home_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'home-page');

+	}

 }

 

 /**

@@ -3334,7 +3334,7 @@ 
  */

 function geodir_action_home_content_inside()

 {

-    dynamic_sidebar('geodir_home_content');

+	dynamic_sidebar('geodir_home_content');

 }

 

 add_action('geodir_home_content_inside', 'geodir_action_home_content_inside', 10);

@@ -3349,28 +3349,28 @@ 
  */

 function geodir_action_home_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

-    /**

-     * This called before the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_home_content');

-    /**

-     * This is used to add the content to the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_home_content_inside');

-    /**

-     * This is called after the homepage main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_home_content');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'home-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

+	/**

+	 * This called before the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_home_content');

+	/**

+	 * This is used to add the content to the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_home_content_inside');

+	/**

+	 * This is called after the homepage main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_home_content');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'home-page');

 }

 

 add_action('geodir_sidebar_location_bottom_section', 'geodir_action_sidebar_home_bottom_section', 10);

@@ -3385,11 +3385,11 @@ 
  */

 function geodir_action_sidebar_home_bottom_section()

 {

-    if (get_option('geodir_show_home_bottom_section')) { ?>

+	if (get_option('geodir_show_home_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

             <?php dynamic_sidebar('geodir_home_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3417,13 +3417,13 @@ 
  */

 function geodir_filter_listing_page_title($list_title)

 {

-    if (is_search() && trim(get_search_query()) == '') {

-        $gd_post_type = geodir_get_current_posttype();

-        $post_type_info = get_post_type_object($gd_post_type);

+	if (is_search() && trim(get_search_query()) == '') {

+		$gd_post_type = geodir_get_current_posttype();

+		$post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

-    }

-    return $list_title;

+		$list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+	}

+	return $list_title;

 }

 

 add_action('geodir_message_not_found_on_listing', 'geodir_display_message_not_found_on_listing');

@@ -3438,62 +3438,62 @@ 
  * @param string $gd_page The geodirectory page type. Default null.

  */

 function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

-    global $post;

-

-    $gd_page_id = NULL;

-    if ($gd_page == 'home-page' && geodir_is_page('home')) {

-        $gd_page_id = geodir_home_page_id();

-    } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {

-        $gd_page_id = geodir_preview_page_id();

-    } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {

-        $gd_page_id = geodir_add_listing_page_id();

-    } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {

-        $gd_page_id = geodir_success_page_id();

-    } else if ($gd_page == 'location-page' && geodir_is_page('location')) {

-        $gd_page_id = geodir_location_page_id();

-    } else if ($gd_page == 'info-page' && geodir_is_page('info')) {

-        $gd_page_id = geodir_info_page_id();

-    } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {

-        $gd_page_id = geodir_login_page_id();

-    } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {

-        $gd_page_id = geodir_payment_checkout_page_id();

-    } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {

-        $gd_page_id = geodir_payment_invoices_page_id();

-    }

-

-    if (!$gd_page_id > 0) {

-        return;

-    }

+	global $post;

+

+	$gd_page_id = NULL;

+	if ($gd_page == 'home-page' && geodir_is_page('home')) {

+		$gd_page_id = geodir_home_page_id();

+	} else if ($gd_page == 'details-page' && geodir_is_page('preview')) {

+		$gd_page_id = geodir_preview_page_id();

+	} else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {

+		$gd_page_id = geodir_add_listing_page_id();

+	} else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {

+		$gd_page_id = geodir_success_page_id();

+	} else if ($gd_page == 'location-page' && geodir_is_page('location')) {

+		$gd_page_id = geodir_location_page_id();

+	} else if ($gd_page == 'info-page' && geodir_is_page('info')) {

+		$gd_page_id = geodir_info_page_id();

+	} else if ($gd_page == 'signup-page' && geodir_is_page('login')) {

+		$gd_page_id = geodir_login_page_id();

+	} else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {

+		$gd_page_id = geodir_payment_checkout_page_id();

+	} else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {

+		$gd_page_id = geodir_payment_invoices_page_id();

+	}

+

+	if (!$gd_page_id > 0) {

+		return;

+	}

     

-    $display = 'before';

-    /**

-     * Filter the position to display the page content.

-     *

-     * @since 1.6.3

-     *

-     * @param string $display Position to add the post content.

-     * @param string $gd_page The geodirectory page type.

-     */

-    $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);

-

-    if ($position !== $display) {

-        return;

-    }

-

-    $gd_post = $post;

+	$display = 'before';

+	/**

+	 * Filter the position to display the page content.

+	 *

+	 * @since 1.6.3

+	 *

+	 * @param string $display Position to add the post content.

+	 * @param string $gd_page The geodirectory page type.

+	 */

+	$display = apply_filters('geodir_add_page_content_position', $display, $gd_page);

+

+	if ($position !== $display) {

+		return;

+	}

+

+	$gd_post = $post;

     

-    setup_postdata(get_post($gd_page_id));

+	setup_postdata(get_post($gd_page_id));

 

-    if (get_the_content()) {

-        ?>

+	if (get_the_content()) {

+		?>

         <section class="entry-content clearfix" itemprop="articleBody"><?php the_content(); ?></section>

         <?php

-    }

+	}

 

-    $post = $gd_post;

-    if (!empty($gd_post) && is_object($gd_post)) {

-        setup_postdata($gd_post);

-    }

+	$post = $gd_post;

+	if (!empty($gd_post) && is_object($gd_post)) {

+		setup_postdata($gd_post);

+	}

 

 }

 add_action('geodir_add_page_content', 'geodir_add_page_content', 10, 2);

@@ -3514,13 +3514,13 @@ 
  * @return string Filtered SQL JOIN clause.

  */

 function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

-    global $plugin_prefix;

+	global $plugin_prefix;

 

-    if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

-    }

+	if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+		$join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

+	}

     

-    return $join;

+	return $join;

 }

 add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

 add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

@@ -3542,31 +3542,31 @@ 
  * @return string Filtered SQL WHERE clause.

  */

 function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $post_locations = '';

-        $post_locations_var = array();

+	if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+		$post_locations = '';

+		$post_locations_var = array();

         

-        if ( !empty( $post->country_slug ) ) {

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

-        }

-

-        if ( !empty( $post->region_slug ) ) {

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

-        }

-

-        if ( !empty( $post->city_slug ) ) {

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

-        }

+		if ( !empty( $post->country_slug ) ) {

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "%,[" . $post->country_slug . "]";

+		}

+

+		if ( !empty( $post->region_slug ) ) {

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "%,[" . $post->region_slug . "],%";

+		}

+

+		if ( !empty( $post->city_slug ) ) {

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "[" . $post->city_slug . "],%";

+		}

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

-    }

+		$where .= $wpdb->prepare( $post_locations, $post_locations_var );

+	}

     

-    return $where;

+	return $where;

 }

 add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

 add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file

Spacing +183 added lines, -183 removed lines

@@ -283,7 +283,7 @@ 
 

     //php

     if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+        include_once('geodirectory-functions/compatibility/'.$tc['geodir_theme_compat_code'].'.php');

     }

 

     //geodir_full_page_class

@@ -453,13 +453,13 @@ 
 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -573,13 +573,13 @@ 
 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -677,7 +677,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -736,10 +736,10 @@ 
 

     $json = '{';

     $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

+    $json .= '"t": "'.$json_title.'",';

+    $json .= '"lt": "'.$post_latitude.'",';

+    $json .= '"ln": "'.$post_longitude.'",';

+    $json .= '"i":"'.$term_icon.'"';

     $json .= '}';

 

     $post->marker_json = $json;

@@ -966,7 +966,7 @@ 
      * @param string $class The class to use. Default is 'entry-header'.

      */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.stripslashes(get_the_title()).'</h1></header>';

 }

 

 

@@ -1020,7 +1020,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)) {

@@ -1032,9 +1032,9 @@ 
 

                         $image_title = isset($image->title) ? $image->title : '';

 

-                        $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;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                        $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;" /></li>';

+                        $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:48px;margin:0 auto;" /></li>';

                         $slides++;

                     }

                 }

@@ -1060,10 +1060,10 @@ 
                 } else {

                     $spacer_height = ((400 - $image->height) / 2);

                 }

-                $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>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                $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>';

+                $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

         }// endfore

@@ -1098,7 +1098,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1107,11 +1107,11 @@ 
 

     if ($preview && !$is_backend_preview) {

         $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

         $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

     } else {

         $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

     }

 //{	

     $post_type_info = get_post_type_object($post_type);

@@ -1119,7 +1119,7 @@ 
 

     if (!empty($post->post_tags)) {

 

-        if (taxonomy_exists($post_type . '_tags')):

+        if (taxonomy_exists($post_type.'_tags')):

             $links = array();

             $terms = array();

             // to limit post tags

@@ -1146,8 +1146,8 @@ 
                 $post_term = trim($post_term);

 

                 $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+                if ($insert_term = term_exists($post_term, $post_type.'_tags')) {

+                    $term = get_term_by('id', $insert_term['term_id'], $post_type.'_tags');

                 } else {

                     $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

                     $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

@@ -1157,10 +1157,10 @@ 
                     $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

                     if ($match_country || $match_region || $match_city) {

                         $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $insert_term = wp_insert_term($post_term, $post_type.'_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     }

                 }

 

@@ -1177,12 +1177,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>";

+                        $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;

@@ -1192,7 +1192,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+            $taxonomies[$post_type.'_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

         endif;

 

     }

@@ -1220,7 +1220,7 @@ 
                     $term = get_term_by('id', $post_term, $post_taxonomy);

 

                     if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+                        $term_link = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>$term->name</a>";

                         /**

                          * Filter the category name on the details page.

                          *

@@ -1228,7 +1228,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;

                     }

@@ -1246,7 +1246,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

 

     }

 

@@ -1259,14 +1259,14 @@ 
      * @param string $listing_label The post type label.

      * @param string $listing_label The post type label with ucwords function.

      */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+    $taxonomies = apply_filters('geodir_details_taxonomies_output', $taxonomies, $post_type, $listing_label, geodir_ucwords($listing_label));

 

     if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+        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

@@ -1287,11 +1287,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;

     }

@@ -1312,7 +1312,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"

                 )

@@ -1340,13 +1340,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);

     }

 

@@ -1356,17 +1356,17 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

+    if (isset($post->default_category) && $post->default_category) {

         $cat_schema = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if ($cat_schema) {$schema_type = $cat_schema; }

+        if (!$schema_type && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "https://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_title;

-    $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;

@@ -1380,7 +1380,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,

@@ -1388,7 +1388,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1407,10 +1407,10 @@ 
      * @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>';

+    echo '<script type="application/ld+json">'.json_encode($schema).'</script>';

 

 

     $uploads = wp_upload_dir();

@@ -1423,7 +1423,7 @@ 
      * @param string $facebook_og The open graph html to be filtered.

      * @param object $post The post object.

      */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+    echo apply_filters('geodir_details_facebook_og', $facebook_og, $post);

 

 

 

@@ -1446,9 +1446,9 @@ 
     ?>

     <div class="geodir-pos_navigation clearfix">

     <div

-        class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

+        class="geodir-post_left"><?php previous_post_link('%link', ''.__('Previous', 'geodirectory'), false) ?></div>

     <div

-        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory') . '', false) ?></div>

+        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory').'', false) ?></div>

     </div><?php

 }

 

@@ -1517,12 +1517,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

     if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+    $list_title = $add_string_in_title.__($post_type_info->labels->name, 'geodirectory');

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type, true);

@@ -1550,12 +1550,12 @@ 
         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term)) {

             $current_term_name = __(ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                 $location_last_char = substr($location_name, -1);

                 $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

             } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

             }

         } else {

             if (count($taxonomy) > 1) {

@@ -1563,12 +1563,12 @@ 
 

                 if (!empty($current_term)) {

                     $current_term_name = __(ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                         $location_last_char = substr($location_name, -1);

                         $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                        $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

                     } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                        $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

                     }

                 }

             }

@@ -1596,7 +1596,7 @@ 
                 $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_city."'";

         } else if ($gd_region != '') {

             if ($gd_region_actual != '') {

                 $gd_region = $gd_region_actual;

@@ -1606,7 +1606,7 @@ 
                 $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_region."'";

         } else if ($gd_country != '') {

             if ($gd_country_actual != '') {

                 $gd_country = $gd_country_actual;

@@ -1616,12 +1616,12 @@ 
                 $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_country."'";

         }

     }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__(ucfirst($post_type_info->labels->name), 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

     }

     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

@@ -1631,26 +1631,26 @@ 
 

     $title = $list_title;

     $gd_page = '';

-    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;

         }

 

@@ -1664,16 +1664,16 @@ 
      * @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 '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the listing page title.

          *

          * @since 1.0.0

          * @param string $list_title The title for the category page.

          */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', $title).'</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1692,16 +1692,16 @@ 
     $gd_post_type = geodir_get_current_posttype();

     if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+        $term_desc = term_description($current_term->term_id, $gd_post_type.'_tags');

         $saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

         if ($term_desc && !$saved_data) {

             $saved_data = $term_desc;

         }

 

         // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        $filter_priority = has_filter('the_content', 'geodir_payments_the_content');

+        if (false !== $filter_priority) {

+            remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         /**

@@ -1715,14 +1715,14 @@ 
         $cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        if (false !== $filter_priority) {

+            add_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1772,13 +1772,13 @@ 
 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -2083,11 +2083,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;

         }

 

@@ -2101,9 +2101,9 @@ 
      * @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 '<header class="'.$class_header.'"><h1 class="'.$class.'">';

     echo $title;

     echo '</h1></header>';

 }

@@ -2117,7 +2117,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

 }

 

@@ -2152,7 +2152,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;

@@ -2167,7 +2167,7 @@ 
         $thumb_img_arr = geodir_get_images($post->ID);

         if ($thumb_img_arr) {

             foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

+                $curImages .= $post_img->src.',';

             }

         }

 

@@ -2175,7 +2175,7 @@ 
         $title = $post->post_title;

         $desc = $post->post_content;

         $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type.'_tags', array('fields' => 'names')));

     } else {

         $listing_type = sanitize_text_field($_REQUEST['listing_type']);

     }

@@ -2186,20 +2186,20 @@ 
 

     $post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing', 'geodirectory');

     

     $package_info = array();

     $package_info = geodir_post_package_info($package_info, $post);

     ?>

-    <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);?>"/>

+    <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); ?>"/>

         <?php if ($page_id) { ?>

-        <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id;?>"/>

+        <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id; ?>"/>

         <?php } if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

-            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']);?>"/>

+            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']); ?>"/>

         <?php } if (isset($_REQUEST['backandedit'])) { ?>

-            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

+            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']); ?>"/>

         <?php

         } 

         /**

@@ -2211,7 +2211,7 @@ 
          */

         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

         /**

          * Called at the top of the add listing page form for frontend.

@@ -2232,10 +2232,10 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+                echo apply_filters('geodir_add_listing_title_label', sprintf(__('%s Title', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><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

         $show_editor = get_option('geodir_tiny_editor_on_add_listing');

@@ -2281,7 +2281,7 @@ 
         $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

         $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just before the description field.

              *

@@ -2294,7 +2294,7 @@ 
             $desc_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

+        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class; ?>">

             <label><?php

                 /**

                  * Filter the add listing page description input label.

@@ -2304,7 +2304,7 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+                echo apply_filters('geodir_add_listing_description_label', sprintf(__('%s Description', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

             if ($show_editor) {

                 $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

@@ -2313,16 +2313,16 @@ 
                     <?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>

+                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea" maxlength="<?php echo $desc_limit; ?>"><?php echo $desc; ?></textarea>

             <?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

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just after the description field.

              *

@@ -2361,7 +2361,7 @@ 
         $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

         $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just before the tags field.

              *

@@ -2372,14 +2372,14 @@ 
             $tags_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

+        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class; ?>">

             <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

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just after the tags field.

              *

@@ -2405,7 +2405,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, ",");

 

@@ -2418,7 +2418,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']);

 

@@ -2432,7 +2432,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2453,15 +2453,15 @@ 
         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>';

+                    echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

                 } ?>

                 <?php if ($image_limit > 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

                 } ?>

                 <?php if ($image_limit == '') {

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

                 } ?>

             </h5>

 

@@ -2476,11 +2476,11 @@ 
                 <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"

-                          id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+                          id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

                     <?php if ($width && $height): ?>

                         <span class="plupload-resize"></span>

                         <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -2493,7 +2493,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>

 

@@ -2505,7 +2505,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

@@ -2516,7 +2516,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>

@@ -2526,10 +2526,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>

@@ -2591,7 +2591,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

 }

@@ -2611,11 +2611,11 @@ 
 

     global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+    $is_enable_signup = get_option('users_can_register');

     

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2632,7 +2632,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2657,7 +2657,7 @@ 
         foreach ($errors as $errorsObj) {

             foreach ($errorsObj as $key => $val) {

                 for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+                    echo "<div class=error_msg_fix>".$val[$i].'</div>';

                     $registration_error_msg = 1;

                 }

             }

@@ -2674,10 +2674,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

 

-    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

+    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup) { ?>

 

         <div class="registration_form">

             <?php

@@ -2686,7 +2686,7 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

@@ -2698,10 +2698,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

         

-        <?php if ( $is_enable_signup ) { ?>

+        <?php if ($is_enable_signup) { ?>

             <div class="registration_form_r">

                 <?php

                 /**

@@ -2709,7 +2709,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+                include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2746,12 +2746,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

     if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

+    $list_title = $add_string_in_title.$post_type_info->labels->name;

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type);

@@ -2759,12 +2759,12 @@ 
     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) . "'";

+            $list_title .= __(' in', 'geodirectory')." '".geodir_ucwords($current_term->name)."'";

     }

 

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($post_type_info->labels->name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

     /** This action is documented in geodirectory_template_actions.php */

@@ -2773,11 +2773,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;

         }

 

@@ -2791,16 +2791,16 @@ 
      * @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 '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the author page title text.

          *

          * @since 1.0.0

          * @param string $list_title The title for the page.

          */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+        apply_filters('geodir_author_page_title_text', $title).'</h1></header>';

 }

 

 

@@ -3005,19 +3005,19 @@ 
     $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() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($pt_name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

     /** 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 */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /** This action is documented in geodirectory_template_actions.php */

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', wptexturize($list_title)).'</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3421,7 +3421,7 @@ 
         $gd_post_type = geodir_get_current_posttype();

         $post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+        $list_title = __('Search', 'geodirectory').' '.__(ucfirst($post_type_info->labels->name), 'geodirectory').__(' :', 'geodirectory');

     }

     return $list_title;

 }

@@ -3437,7 +3437,7 @@ 
  * @param string $position Position to add the post content. 'before' or 'after'. Default 'before'.

  * @param string $gd_page The geodirectory page type. Default null.

  */

-function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

+function geodir_add_page_content($position = 'before', $gd_page = '') {

     global $post;

 

     $gd_page_id = NULL;

@@ -3513,17 +3513,17 @@ 
  * @param WP_Post $post           WP_Post object.

  * @return string Filtered SQL JOIN clause.

  */

-function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_join($join, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $plugin_prefix;

 

-    if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

+    if (!empty($post->post_type) && in_array($post->post_type, geodir_get_posttypes())) {

+        $join .= " INNER JOIN ".$plugin_prefix.$post->post_type."_detail AS gd ON gd.post_id = p.ID";

     }

     

     return $join;

 }

-add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

-add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

+add_filter('get_previous_post_join', 'geodir_previous_next_post_join', 10, 5);

+add_filter('get_next_post_join', 'geodir_previous_next_post_join', 10, 5);

 

 /**

  * Filters the WHERE clause in the SQL for an adjacent post query.

@@ -3541,32 +3541,32 @@ 
  * @param WP_Post $post          WP_Post object.

  * @return string Filtered SQL WHERE clause.

  */

-function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_where($where, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+    if (!empty($post->post_type) && (!empty($post->country_slug) || !empty($post->region_slug) || !empty($post->city_slug)) && in_array($post->post_type, geodir_get_posttypes())) {

         $post_locations = '';

         $post_locations_var = array();

         

-        if ( !empty( $post->country_slug ) ) {

+        if (!empty($post->country_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

+            $post_locations_var[] = "%,[".$post->country_slug."]";

         }

 

-        if ( !empty( $post->region_slug ) ) {

+        if (!empty($post->region_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

+            $post_locations_var[] = "%,[".$post->region_slug."],%";

         }

 

-        if ( !empty( $post->city_slug ) ) {

+        if (!empty($post->city_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

+            $post_locations_var[] = "[".$post->city_slug."],%";

         }

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

+        $where .= $wpdb->prepare($post_locations, $post_locations_var);

     }

     

     return $where;

 }

-add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

-add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file
+add_filter('get_previous_post_where', 'geodir_previous_next_post_where', 10, 5);

+add_filter('get_next_post_where', 'geodir_previous_next_post_where', 10, 5);
\ No newline at end of file

geodirectory-functions/listing_filters.php

Braces +30 added lines, -19 removed lines

@@ -16,7 +16,9 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

+    if (!session_id()) {
+    	session_start();
+    }
     global $geodir_add_location_url;

 

     $geodir_add_location_url = NULL;

@@ -86,7 +88,9 @@ 
 

     if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') {
+        	$_REQUEST['scat'] = '';
+        }
         //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

         if (isset($_REQUEST['sdist'])) {

@@ -198,8 +202,9 @@ 
         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

         geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+        if (!is_admin()) {
+                    add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+        }
 

         // advanced filter for popular post view widget

         global $wp_query;

@@ -349,8 +354,9 @@ 
     $sort_by = '';

     $orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+    if (get_query_var('order_by')) {
+            $sort_by = get_query_var('order_by');
+    }
 

     /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

@@ -370,14 +376,16 @@ 
         $orderby .= " distance,";

     }

 

-    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) {
+            $sort_by = esc_attr($_REQUEST['sort_by']);
+    }
 

 

     if ($sort_by == '') {

         $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

+        if (!empty($default_sort)) {
+                    $sort_by = $default_sort;
+        }
     }

 

     /*

@@ -572,8 +580,9 @@ 
 

             add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+            if ($snear != '') {
+                            add_filter('posts_where', 'searching_filter_where', 1);
+            }
 

             add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

@@ -727,10 +736,11 @@ 
 

     $where = '';

     $better_search_terms = '';

-    if (isset($_REQUEST['stype']))

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

+    if (isset($_REQUEST['stype'])) {
+            $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));
+    } else {
+            $post_types = 'gd_place';
+    }
 

     if ($s != '') {

         $keywords = explode(" ", $s);

@@ -767,7 +777,7 @@ 
     if($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else{$taxonomies='';}

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -887,8 +897,9 @@ 
             $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

             $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

             $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

+        } else {
+                    $where .= " AND $wpdb->posts.post_author = $user_id";
+        }
 

         if ($user_id == (int)get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

Indentation +528 added lines, -528 removed lines

@@ -16,10 +16,10 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

-    global $geodir_add_location_url;

+	if (!session_id()) session_start();

+	global $geodir_add_location_url;

 

-    $geodir_add_location_url = NULL;

+	$geodir_add_location_url = NULL;

 }

 

 /**

@@ -33,18 +33,18 @@ 
  */

 function geodir_modified_query($query)

 {

-    if ($query->is_main_query() && (

-            (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            || geodir_is_page('listing')

-            || geodir_is_page('author')

-            || geodir_is_page('search')

-            || geodir_is_page('detail'))

-    ) {

-

-        $query->set('is_geodir_loop', true);

-    }

+	if ($query->is_main_query() && (

+			(geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

+			|| geodir_is_page('listing')

+			|| geodir_is_page('author')

+			|| geodir_is_page('search')

+			|| geodir_is_page('detail'))

+	) {

+

+		$query->set('is_geodir_loop', true);

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -67,81 +67,81 @@ 
  */

 function set_listing_request($query )

 {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

 

-    // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    /* remove all pre filters */

-    remove_all_filters('query');

-    remove_all_filters('posts_search');

-    remove_all_filters('posts_fields');

-    remove_all_filters('posts_join');

-    remove_all_filters('posts_orderby');

-    remove_all_filters('posts_where');

+	/* remove all pre filters */

+	remove_all_filters('query');

+	remove_all_filters('posts_search');

+	remove_all_filters('posts_fields');

+	remove_all_filters('posts_join');

+	remove_all_filters('posts_orderby');

+	remove_all_filters('posts_where');

 

 

-    if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

+	if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

-        //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

+		if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+		//if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

-        if (isset($_REQUEST['sdist'])) {

-            ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

-        } elseif (get_option('geodir_search_dist') != '') {

-            $dist = get_option('geodir_search_dist');

+		if (isset($_REQUEST['sdist'])) {

+			($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

+		} elseif (get_option('geodir_search_dist') != '') {

+			$dist = get_option('geodir_search_dist');

 

-        } else {

-            $dist = 25000;

-        } //  Distance

+		} else {

+			$dist = 25000;

+		} //  Distance

 

-        if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

-        } else {

-            $mylat = (float)geodir_get_current_city_lat();

-        } //  Latatude

+		if (isset($_REQUEST['sgeo_lat'])) {

+			$mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+		} else {

+			$mylat = (float)geodir_get_current_city_lat();

+		} //  Latatude

 

-        if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

-        } else {

-            $mylon = (float)geodir_get_current_city_lng();

-        } //  Distance

+		if (isset($_REQUEST['sgeo_lon'])) {

+			$mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+		} else {

+			$mylon = (float)geodir_get_current_city_lng();

+		} //  Distance

 

-        if (isset($_REQUEST['snear'])) {

-            $snear = trim(esc_attr($_REQUEST['snear']));

-        }

+		if (isset($_REQUEST['snear'])) {

+			$snear = trim(esc_attr($_REQUEST['snear']));

+		}

 

-        if (isset($_REQUEST['s'])) {

-            $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

-        }

+		if (isset($_REQUEST['s'])) {

+			$s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

+		}

 

-        if ($snear == 'NEAR ME') {

-            $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

-            $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

-            $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

-        }

+		if ($snear == 'NEAR ME') {

+			$ip = $_SERVER['REMOTE_ADDR'];

+			$addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+			$mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

+			$mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

+		}

 

 

-        if (strstr($s, ',')) {

-            $s_AA = str_replace(" ", "", $s);

-            $s_A = explode(",", $s_AA);

-            $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

-        } else {

-            $s_A = '"' . $s . '"';

-        }

+		if (strstr($s, ',')) {

+			$s_AA = str_replace(" ", "", $s);

+			$s_A = explode(",", $s_AA);

+			$s_A = implode('","', $s_A);

+			$s_A = '"' . $s_A . '"';

+		} else {

+			$s_A = '"' . $s . '"';

+		}

 

-        if (strstr($s, ' ')) {

-            $s_SA = explode(" ", $s);

-        } else {

-            $s_SA = '';

-        }

+		if (strstr($s, ' ')) {

+			$s_SA = explode(" ", $s);

+		} else {

+			$s_SA = '';

+		}

 

-    endif;

+	endif;

 

 

 

@@ -162,56 +162,56 @@ 
  */

 function geodir_listing_loop_filter($query)

 {

-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

 

-    // fix wp_reset_query for popular post view widget

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix wp_reset_query for popular post view widget

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    $geodir_post_type = geodir_get_current_posttype();

-

-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

-

-        if (isset($wp_query->query[$taxonomies[0]])) {

-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);

-            $request_term = end($request_term);

-            if (!term_exists($request_term)) {

-                $args = array('number' => '1',);

-                $terms_arr = get_terms($taxonomies[0], $args);

-                foreach ($terms_arr as $location_term) {

-                    $term_arr = $location_term;

-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

-                }

-                $wp_query->queried_object_id = 1;

-                $wp_query->queried_object = $term_arr;

-                //print_r($wp_query) ;

-            }

-        }

+	$geodir_post_type = geodir_get_current_posttype();

+

+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

+

+		if (isset($wp_query->query[$taxonomies[0]])) {

+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);

+			$request_term = end($request_term);

+			if (!term_exists($request_term)) {

+				$args = array('number' => '1',);

+				$terms_arr = get_terms($taxonomies[0], $args);

+				foreach ($terms_arr as $location_term) {

+					$term_arr = $location_term;

+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

+				}

+				$wp_query->queried_object_id = 1;

+				$wp_query->queried_object = $term_arr;

+				//print_r($wp_query) ;

+			}

+		}

 

-    }

-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

-

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

-

-        add_filter('posts_fields', 'geodir_posts_fields', 1);

-        add_filter('posts_join', 'geodir_posts_join', 1);

-        geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

-

-        // advanced filter for popular post view widget

-        global $wp_query;

-        if (!is_admin()) {

-            if (!empty($wp_query->query['with_pics_only'])) {

-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);

-            }

-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);

-        }

+	}

+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-    }

-    return $query;

+		$table = $plugin_prefix . $geodir_post_type . '_detail';

+

+		add_filter('posts_fields', 'geodir_posts_fields', 1);

+		add_filter('posts_join', 'geodir_posts_join', 1);

+		geodir_post_where();

+		if (!is_admin())

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+

+		// advanced filter for popular post view widget

+		global $wp_query;

+		if (!is_admin()) {

+			if (!empty($wp_query->query['with_pics_only'])) {

+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);

+			}

+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);

+		}

+

+	}

+	return $query;

 }

 

 

@@ -230,67 +230,67 @@ 
  * @return string Modified fields query string.

  */

 function geodir_posts_fields($fields) {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

-    // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+	// Filter-Location-Manager to add location table.

+	$fields .= ", " . $table . ".* ";

 

 	if ($snear != '' || $gd_session->get('all_near_me')) {

-        $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+		$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

 		if ($gd_session->get('all_near_me')) {

-            $mylat = $gd_session->get('user_lat');

-            $mylon = $gd_session->get('user_lon');

-        }

-

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    }

-

-    global $s;

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+			$mylat = $gd_session->get('user_lat');

+			$mylon = $gd_session->get('user_lon');

+		}

 

+		$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	}

 

-        if (count($keywords) > 1) {

-            $parts = array(

-                'AND' => 'gd_alltitlematch_part',

-                'OR' => 'gd_titlematch_part'

-            );

-            $gd_titlematch_part = "";

-            foreach ($parts as $key => $part) {

-                $gd_titlematch_part .= " CASE WHEN ";

-                $count = 0;

-                foreach ($keywords as $keyword) {

-                    $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+	global $s;

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+

+		if (count($keywords) > 1) {

+			$parts = array(

+				'AND' => 'gd_alltitlematch_part',

+				'OR' => 'gd_titlematch_part'

+			);

+			$gd_titlematch_part = "";

+			foreach ($parts as $key => $part) {

+				$gd_titlematch_part .= " CASE WHEN ";

+				$count = 0;

+				foreach ($keywords as $keyword) {

+					$keyword = trim($keyword);

+					$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

 					$count++;

-                    if ($count < count($keywords)) {

-                       // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

+					if ($count < count($keywords)) {

+					   // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

-                    } else {

-                        //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

+					} else {

+						//$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

-                    }

-                }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

-            }

-        } else {

-            $gd_titlematch_part = "";

-        }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

+					}

+				}

+				$gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+			}

+		} else {

+			$gd_titlematch_part = "";

+		}

+		$s = stripslashes_deep( $s );

+		$s = wp_specialchars_decode($s,ENT_QUOTES);

 		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -307,26 +307,26 @@ 
  */

 function geodir_posts_join($join)

 {

-    global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

+	global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

 

-    ########### WPML ###########

+	########### WPML ###########

 

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

-        }

+	if (function_exists('icl_object_id')) {

+		global $sitepress;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		if ($lang_code) {

+			$join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

-    //===old code start

-    //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

+	$join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+	//===old code start

+	//$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

-    return $join;

+	return $join;

 }

 

 

@@ -344,15 +344,15 @@ 
  */

 function geodir_posts_orderby($orderby)

 {

-    global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

+	global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

 

-    $sort_by = '';

-    $orderby = ' ';

+	$sort_by = '';

+	$orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+	if (get_query_var('order_by'))

+		$sort_by = get_query_var('order_by');

 

-    /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

+	/*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

     }

 

@@ -366,133 +366,133 @@ 
     }*/

 

 

-    if ($snear != '') {

-        $orderby .= " distance,";

-    }

+	if ($snear != '') {

+		$orderby .= " distance,";

+	}

 

-    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+	if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

+		$sort_by = esc_attr($_REQUEST['sort_by']);

 

 

-    if ($sort_by == '') {

-        $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

-    }

+	if ($sort_by == '') {

+		$default_sort = geodir_get_posts_default_sort($geodir_post_type);

+		if (!empty($default_sort))

+			$sort_by = $default_sort;

+	}

 

-    /*

+	/*

     if search by term & no location then order always "relevance"

     if search by location then order always "nearest"

     */

-    if (is_main_query() && geodir_is_page('search')) {

-        $search_term = get_query_var('s');

+	if (is_main_query() && geodir_is_page('search')) {

+		$search_term = get_query_var('s');

 

-        if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

-            $sort_by = 'az';

-        }

+		if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

+			$sort_by = 'az';

+		}

 

-        if ($snear != '' &&  $sort_by!='farthest') {

-            $sort_by = 'nearest';

-        }

-    }

-

-    switch ($sort_by):

-        case 'newest':

-            $orderby = "$wpdb->posts.post_date desc, ";

-            break;

-        case 'oldest':

-            $orderby = "$wpdb->posts.post_date asc, ";

-            break;

-        case 'low_review':

-        case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

-            break;

-        case 'high_review':

-        case 'rating_count_desc':

-            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

-            break;

-        case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

-            break;

-        case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

-            break;

-        case 'featured':

-            $orderby = $table . ".is_featured asc, ";

-            break;

-        case 'nearest':

-            $orderby = " distance asc, ";

-            break;

-        case 'farthest':

-            $orderby = " distance desc, ";

-            break;

-        case 'random':

-            $orderby = " rand(), ";

-            break;

-        case 'az':

-            $orderby = "$wpdb->posts.post_title asc, ";

-            break;

-        // sort by rating

-        case 'overall_rating_desc':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

-            break;

-        case 'overall_rating_asc':

-            $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

-            break;

-        default:

-

-            break;

-    endswitch;

-

-    if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {

-        if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {

-            $orderby = "$wpdb->posts.comment_count DESC, ";

-            $sort_by = 'comment_count_desc';

-        } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {

-            $orderby = "$wpdb->posts.comment_count ASC, ";

-            $sort_by = 'comment_count_asc';

-        }

-    }

+		if ($snear != '' &&  $sort_by!='farthest') {

+			$sort_by = 'nearest';

+		}

+	}

 

-    global $s;

+	switch ($sort_by):

+		case 'newest':

+			$orderby = "$wpdb->posts.post_date desc, ";

+			break;

+		case 'oldest':

+			$orderby = "$wpdb->posts.post_date asc, ";

+			break;

+		case 'low_review':

+		case 'rating_count_asc':

+			$orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+			break;

+		case 'high_review':

+		case 'rating_count_desc':

+			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+			break;

+		case 'low_rating':

+			$orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+			break;

+		case 'high_rating':

+			$orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+			break;

+		case 'featured':

+			$orderby = $table . ".is_featured asc, ";

+			break;

+		case 'nearest':

+			$orderby = " distance asc, ";

+			break;

+		case 'farthest':

+			$orderby = " distance desc, ";

+			break;

+		case 'random':

+			$orderby = " rand(), ";

+			break;

+		case 'az':

+			$orderby = "$wpdb->posts.post_title asc, ";

+			break;

+		// sort by rating

+		case 'overall_rating_desc':

+			$orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+			break;

+		case 'overall_rating_asc':

+			$orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

+			break;

+		default:

+

+			break;

+	endswitch;

+

+	if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {

+		if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {

+			$orderby = "$wpdb->posts.comment_count DESC, ";

+			$sort_by = 'comment_count_desc';

+		} else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {

+			$orderby = "$wpdb->posts.comment_count ASC, ";

+			$sort_by = 'comment_count_asc';

+		}

+	}

 

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

-        if ($sort_by == 'nearest' || $sort_by == 'farthest') {

-            if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

-            } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

-            }

-        } else {

-            if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

-            } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

-            }

-        }

-    }

+	global $s;

+

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+		if ($sort_by == 'nearest' || $sort_by == 'farthest') {

+			if (count($keywords) > 1) {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+			} else {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+			}

+		} else {

+			if (count($keywords) > 1) {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+			} else {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+			}

+		}

+	}

 

-    /**

-     * Filter order by SQL.

-     *

-     * @since 1.0.0

-     * @param string $orderby The orderby query string.

-     * @param string $sort_by Sortby query string.

-     * @param string $table Listing table name.

-     */

-    $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

+	/**

+	 * Filter order by SQL.

+	 *

+	 * @since 1.0.0

+	 * @param string $orderby The orderby query string.

+	 * @param string $sort_by Sortby query string.

+	 * @param string $table Listing table name.

+	 */

+	$orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+	$orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

-    return $orderby;

+	return $orderby;

 }

 

 

@@ -510,53 +510,53 @@ 
 function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

+	if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

 

-        $sort_array = explode('_', $sort_by);

+		$sort_array = explode('_', $sort_by);

 

-        $sort_by_count = count($sort_array);

+		$sort_by_count = count($sort_array);

 

-        $order = $sort_array[$sort_by_count - 1];

+		$order = $sort_array[$sort_by_count - 1];

 

-        if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

+		if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+			$sort_by = str_replace('_' . $order, '', $sort_by);

 

-            switch ($sort_by):

+			switch ($sort_by):

 

-                case 'post_date':

-                case 'comment_count':

+				case 'post_date':

+				case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

-                    break;

+					$orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+					break;

 

-                case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

-                    break;

+				case 'distance':

+					$orderby = $sort_by . " " . $order . ", ";

+					break;

 

 

-                // sort by rating

-                case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+				// sort by rating

+				case 'overall_rating':

+					$orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

 

-                    break;

+					break;

 

 

-                default:

-                    if (geodir_column_exist($table, $sort_by)) {

+				default:

+					if (geodir_column_exist($table, $sort_by)) {

 						$orderby = $table . "." . $sort_by . " " . $order . ", ";

 					}

-                    break;

+					break;

 

-            endswitch;

+			endswitch;

 

-        }

+		}

 

-    }

+	}

 

-    return $orderby;

+	return $orderby;

 }

 

 /**

@@ -571,34 +571,34 @@ 
 {

 

 

-    global $wpdb, $geodir_post_type, $table, $s, $snear;

+	global $wpdb, $geodir_post_type, $table, $s, $snear;

 

-    if (!is_admin()) {

+	if (!is_admin()) {

 

-        if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            add_filter('posts_where', 'geodir_edit_listing_where', 1);

+		if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			add_filter('posts_where', 'geodir_edit_listing_where', 1);

 

-        } elseif ((is_search() && $_REQUEST['geodir_search'])) {

+		} elseif ((is_search() && $_REQUEST['geodir_search'])) {

 

-            add_filter('posts_where', 'searching_filter_where', 1);

+			add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+			if ($snear != '')

+				add_filter('posts_where', 'searching_filter_where', 1);

 

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

-        } elseif (geodir_is_page('author')) {

+		} elseif (geodir_is_page('author')) {

 

-            add_filter('posts_where', 'author_filter_where', 1);

+			add_filter('posts_where', 'author_filter_where', 1);

 

-        }

+		}

 

-        //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+		//if (!geodir_is_page('detail'))

+			add_filter('posts_where', 'geodir_default_where', 1);/**/

 

-        //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

+		//add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

-    }

+	}

 }

 

 /**

@@ -613,13 +613,13 @@ 
  */

 function geodir_preview_post_cap($allcaps, $caps, $args)

 {

-    $user_id = get_current_user_id();

-    if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

+	$user_id = get_current_user_id();

+	if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

 

-        $allcaps['edit_posts'] = true;

-    }

-    //print_r($allcaps);

-    return $allcaps;

+		$allcaps['edit_posts'] = true;

+	}

+	//print_r($allcaps);

+	return $allcaps;

 }

 

 

@@ -634,9 +634,9 @@ 
  */

 function geodir_edit_listing_where($where)

 {

-    global $wpdb;

-    $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

-    return $where;

+	global $wpdb;

+	$where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

+	return $where;

 }

 

 

@@ -653,29 +653,29 @@ 
  */

 function geodir_default_where($where)

 {

-    global $wp_query, $wpdb;

-

-    //print_r($wp_query);

-    ########### WPML ###########

-

-    if (function_exists('icl_object_id')) {

-        global $sitepress, $table_prefix;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

-        //echo '##########'.$q_post_type;

-        if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

-            //$where .= " AND icl_t.language_code = '$lang_code' ";

-        }

+	global $wp_query, $wpdb;

 

-    }

-    ########### WPML ###########

+	//print_r($wp_query);

+	########### WPML ###########

+

+	if (function_exists('icl_object_id')) {

+		global $sitepress, $table_prefix;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		$q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

+		//echo '##########'.$q_post_type;

+		if ($lang_code && $q_post_type) {

+			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+			//$where .= " AND icl_t.language_code = '$lang_code' ";

+		}

+

+	}

+	########### WPML ###########

 

 

-    return $where = str_replace("0 = 1", "1=1", $where);

+	return $where = str_replace("0 = 1", "1=1", $where);

 

-    /* ====== old code start ===

+	/* ====== old code start ===

     $where = str_replace("0 = 1", "1=1", $where);

     $country = get_query_var('gd_country');

     $region = get_query_var('gd_region');

@@ -716,108 +716,108 @@ 
  * @return string Modified where query string.

  */

 function searching_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

+	global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

 

-    $search_term = 'OR';

-    $search_term = 'AND';

-    $geodir_custom_search = '';

-    $category_search_range = '';

+	$search_term = 'OR';

+	$search_term = 'AND';

+	$geodir_custom_search = '';

+	$category_search_range = '';

 

-    if (is_single() && get_query_var('post_type')) {

+	if (is_single() && get_query_var('post_type')) {

 		return $where;

 	}

 

-    if (is_tax()) {

+	if (is_tax()) {

 		return $where;

 	}

 

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

-

-    $where = '';

-    $better_search_terms = '';

-    if (isset($_REQUEST['stype']))

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

-

-    if ($s != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+	$s  = wp_specialchars_decode($s ,ENT_QUOTES);

+	$s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

 

-        if (!empty($keywords)) {

-            foreach ($keywords as $keyword) {

-                $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

-                if ($keyword != '') {

-                    /**

-                     * Filter the search query keywords SQL.

-                     *

-                     * @since 1.5.9

-                     * @package GeoDirectory

-                     * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

-                     * @param array $keywords The array of keywords for the query.

-                     * @param string $keyword The single keyword being searched.

-                     */

+	$where = '';

+	$better_search_terms = '';

+	if (isset($_REQUEST['stype']))

+		$post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

+	else

+		$post_types = 'gd_place';

+

+	if ($s != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+		if (!empty($keywords)) {

+			foreach ($keywords as $keyword) {

+				$keyword = trim($keyword);

+				$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+				if ($keyword != '') {

+					/**

+					 * Filter the search query keywords SQL.

+					 *

+					 * @since 1.5.9

+					 * @package GeoDirectory

+					 * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

+					 * @param array $keywords The array of keywords for the query.

+					 * @param string $keyword The single keyword being searched.

+					 */

 					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

-                }

-            }

-        }

-    }

+				}

+			}

+		}

+	}

 

-    /* get taxonomy */

-    $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

-        $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+	/* get taxonomy */

+	$taxonomies = geodir_get_taxonomies($post_types, true);

+	if($taxonomies) {

+		$taxonomies = implode("','", $taxonomies);

+		$taxonomies = "'" . $taxonomies . "'";

+	}else{$taxonomies='';}

 

-    $content_where = $terms_where = '';

+	$content_where = $terms_where = '';

 	if ($s != '') {

-        /**

-         * Filter the search query content where values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

-         */

+		/**

+		 * Filter the search query content where values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

+		 */

 		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

-        /**

-         * Filter the search query term values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

-         */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+		/**

+		 * Filter the search query term values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

+		 */

+		$terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 

-    if ($snear != '') {

+	if ($snear != '') {

 

 

-        if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

-            $dist = $gd_session->get('near_me_range');

-        }

-        $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lat1 = $mylat - ($dist / 69);

-        $lat2 = $mylat + ($dist / 69);

+		if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

+			$dist = $gd_session->get('near_me_range');

+		}

+		$lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lat1 = $mylat - ($dist / 69);

+		$lat2 = $mylat + ($dist / 69);

 

-        $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

-        $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

-        $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

-        $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

+		$rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

+		$rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

+		$rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

+		$rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

 

 

 

-	    $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+		$where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

 			                    $content_where 

 								OR ($wpdb->posts.ID IN( 

 										SELECT $wpdb->term_relationships.object_id as post_id 

@@ -834,13 +834,13 @@ 
 						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

 						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

 

-        if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

-            $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

-        }

+		if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

+			$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+			$where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+		}

 

-    } else {

-        $where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+	} else {

+		$where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

                             $content_where  

 							OR ( $wpdb->posts.ID IN(	

 									SELECT $wpdb->term_relationships.object_id as post_id                     

@@ -854,19 +854,19 @@ 
 					) 

 				AND $wpdb->posts.post_type in ('$post_types')

 				AND ($wpdb->posts.post_status = 'publish') ";

-    }

+	}

 

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {

+	if ( function_exists( 'icl_object_id' ) ) {

 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

-        }

-    }

-    ########### WPML ###########

+			$where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+		}

+	}

+	########### WPML ###########

 

-    return $where;

+	return $where;

 }

 

 

@@ -881,45 +881,45 @@ 
  * @return string Modified where query string.

  */

 function author_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $curr;

+	global $wpdb, $geodir_post_type, $table, $curr;

 

-    $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+	$curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

+	$user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

 

-    if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

-    } else {

-        $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

-    }

+	if (isset($_REQUEST['stype'])) {

+		$where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+	} else {

+		$where = " AND $wpdb->posts.post_type IN ('gd_place') ";

+	}

 

-    if ($user_id > 0) {

-        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-            $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

-            $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

-            $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

-

-        if ($user_id == (int)get_current_user_id()) {

-            $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

-        } else {

-            $where .= " AND $wpdb->posts.post_status = 'publish' ";

-        }

-    } else {

-        $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

-    }

+	if ($user_id > 0) {

+		if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

+			$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

+			$user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

+			$where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

+		} else

+			$where .= " AND $wpdb->posts.post_author = $user_id";

+

+		if ($user_id == (int)get_current_user_id()) {

+			$where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

+		} else {

+			$where .= " AND $wpdb->posts.post_status = 'publish' ";

+		}

+	} else {

+		$where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

+	}

 

-    ########### WPML ###########

-    if (function_exists('icl_object_id')) {

-        $lang_code = ICL_LANGUAGE_CODE;

-        if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

-        }

+	########### WPML ###########

+	if (function_exists('icl_object_id')) {

+		$lang_code = ICL_LANGUAGE_CODE;

+		if ($lang_code) {

+			$where .= " AND icl_t.language_code='" . $lang_code . "' ";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

 

-    return $where;

+	return $where;

 }

 

 /**

@@ -934,11 +934,11 @@ 
  */

 function geodir_filter_widget_join($join)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

-    }

-    return $join;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	}

+	return $join;

 }

 

 /**

@@ -953,42 +953,42 @@ 
  */

 function geodir_filter_widget_where($where)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

-    }

-    if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

-    }

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

-    }

-    if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

-    }

-    return $where;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['show_featured_only'])) {

+		$where .= " AND " . $table . ".is_featured = '1'";

+	}

+	if (!empty($wp_query->query['show_special_only'])) {

+		$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+	}

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+	}

+	if (!empty($wp_query->query['with_videos_only'])) {

+		$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+	}

+	return $where;

 }

 

 

 function geodir_related_posts_fields($fields) {

-    global $wp_query, $wpdb, $table, $post;

+	global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+	$fields .= ", " . $table . ".* ";

 

-    $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+	$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

-    $mylat = $post->post_latitude;

-    $mylon = $post->post_longitude;

+	$mylat = $post->post_latitude;

+	$mylon = $post->post_longitude;

 

-    $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    return $fields;

+	$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

-        && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

-        && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

-    ) {

-        add_filter('posts_fields', 'geodir_related_posts_fields', 1);

-    }

+	if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+		&& isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

+		&& isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

+	) {

+		add_filter('posts_fields', 'geodir_related_posts_fields', 1);

+	}

 }

 add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
\ No newline at end of file

Spacing +76 added lines, -76 removed lines

@@ -65,7 +65,7 @@ 
  * @global string $s_A Extra parameters.

  * @global string $s_SA Extra parameters.

  */

-function set_listing_request($query )

+function set_listing_request($query)

 {

     global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

@@ -99,15 +99,15 @@ 
         } //  Distance

 

         if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+            $mylat = (float) esc_attr($_REQUEST['sgeo_lat']);

         } else {

-            $mylat = (float)geodir_get_current_city_lat();

+            $mylat = (float) geodir_get_current_city_lat();

         } //  Latatude

 

         if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+            $mylon = (float) esc_attr($_REQUEST['sgeo_lon']);

         } else {

-            $mylon = (float)geodir_get_current_city_lng();

+            $mylon = (float) geodir_get_current_city_lng();

         } //  Distance

 

         if (isset($_REQUEST['snear'])) {

@@ -120,7 +120,7 @@ 
 

         if ($snear == 'NEAR ME') {

             $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));

             $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

             $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

         }

@@ -130,9 +130,9 @@ 
             $s_AA = str_replace(" ", "", $s);

             $s_A = explode(",", $s_AA);

             $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

+            $s_A = '"'.$s_A.'"';

         } else {

-            $s_A = '"' . $s . '"';

+            $s_A = '"'.$s.'"';

         }

 

         if (strstr($s, ' ')) {

@@ -193,7 +193,7 @@ 
     }

     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+        $table = $plugin_prefix.$geodir_post_type.'_detail';

 

         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

@@ -233,7 +233,7 @@ 
     global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

     // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

 	if ($snear != '' || $gd_session->get('all_near_me')) {

         $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

@@ -243,16 +243,16 @@ 
             $mylon = $gd_session->get('user_lon');

         }

 

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+        $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";

     }

 

     global $s;

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

 

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -270,24 +270,24 @@ 
                 $count = 0;

                 foreach ($keywords as $keyword) {

                     $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                    $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

 					$count++;

                     if ($count < count($keywords)) {

                        // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." ";

                     } else {

                         //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ";

                     }

                 }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.",";

             }

         } else {

             $gd_titlematch_part = "";

         }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

-		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

+        $s = stripslashes_deep($s);

+        $s = wp_specialchars_decode($s, ENT_QUOTES);

+		$fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s));

     }

 

     return $fields;

@@ -316,13 +316,13 @@ 
         $lang_code = ICL_LANGUAGE_CODE;

         $default_lang_code = $sitepress->get_default_language();

         if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+            $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID";

         }

 

     }

     ########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+    $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID)  ";

     //===old code start

     //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

@@ -391,7 +391,7 @@ 
             $sort_by = 'az';

         }

 

-        if ($snear != '' &&  $sort_by!='farthest') {

+        if ($snear != '' && $sort_by != 'farthest') {

             $sort_by = 'nearest';

         }

     }

@@ -405,20 +405,20 @@ 
             break;

         case 'low_review':

         case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+            $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, ";

             break;

         case 'high_review':

         case 'rating_count_desc':

-            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+            $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, ";

             break;

         case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+            $orderby = "( ".$table.".overall_rating  ) ASC, ".$table.".rating_count ASC,  ";

             break;

         case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'featured':

-            $orderby = $table . ".is_featured asc, ";

+            $orderby = $table.".is_featured asc, ";

             break;

         case 'nearest':

             $orderby = " distance asc, ";

@@ -434,10 +434,10 @@ 
             break;

         // sort by rating

         case 'overall_rating_desc':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'overall_rating_asc':

-            $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

+            $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, ";

             break;

         default:

 

@@ -458,24 +458,24 @@ 
 

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

         }

         if ($sort_by == 'nearest' || $sort_by == 'farthest') {

             if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

             } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

             }

         } else {

             if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby;

             } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby;

             }

         }

     }

@@ -490,7 +490,7 @@ 
      */

     $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+    $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

     return $orderby;

 }

@@ -512,7 +512,7 @@ 
 

     global $wpdb;

 

-    if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

+    if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) {

 

         $sort_array = explode('_', $sort_by);

 

@@ -522,31 +522,31 @@ 
 

         if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+            $sort_by = str_replace('_'.$order, '', $sort_by);

 

             switch ($sort_by):

 

                 case 'post_date':

                 case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+                    $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", ";

                     break;

 

                 case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

+                    $orderby = $sort_by." ".$order.", ";

                     break;

 

 

                 // sort by rating

                 case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+                    $orderby = " ".$table.".".$sort_by."  ".$order.", ".$table.".rating_count ".$order.", ";

 

                     break;

 

 

                 default:

                     if (geodir_column_exist($table, $sort_by)) {

-						$orderby = $table . "." . $sort_by . " " . $order . ", ";

+						$orderby = $table.".".$sort_by." ".$order.", ";

 					}

                     break;

 

@@ -594,7 +594,7 @@ 
         }

 

         //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+            add_filter('posts_where', 'geodir_default_where', 1); /**/

 

         //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

@@ -665,7 +665,7 @@ 
         $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

         //echo '##########'.$q_post_type;

         if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";

             //$where .= " AND icl_t.language_code = '$lang_code' ";

         }

 

@@ -732,8 +732,8 @@ 
 	}

 

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+    $s = wp_specialchars_decode($s, ENT_QUOTES);

+    $s_A = wp_specialchars_decode($s_A, ENT_QUOTES);

 

     $where = '';

     $better_search_terms = '';

@@ -744,9 +744,9 @@ 
 

     if ($s != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -755,7 +755,7 @@ 
         if (!empty($keywords)) {

             foreach ($keywords as $keyword) {

                 $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

                 if ($keyword != '') {

                     /**

                      * Filter the search query keywords SQL.

@@ -766,7 +766,7 @@ 
                      * @param array $keywords The array of keywords for the query.

                      * @param string $keyword The single keyword being searched.

                      */

-					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

+					$better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword);

                 }

             }

         }

@@ -774,10 +774,10 @@ 
 

     /* get taxonomy */

     $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

+    if ($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+        $taxonomies = "'".$taxonomies."'";

+    } else {$taxonomies = ''; }

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -788,7 +788,7 @@ 
          * @package GeoDirectory

          * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

          */

-		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

+		$content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

         /**

          * Filter the search query term values.

          *

@@ -796,7 +796,7 @@ 
          * @package GeoDirectory

          * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

          */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+        $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 

     if ($snear != '') {

@@ -831,12 +831,12 @@ 
 							)

 						AND $wpdb->posts.post_type in ('{$post_types}')

 						AND ($wpdb->posts.post_status = 'publish')

-						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

-						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

+						AND ( ".$table.".post_latitude between $rlat1 and $rlat2 )

+						AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) ";

 

         if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

             $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+            $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist;

         }

 

     } else {

@@ -857,11 +857,11 @@ 
     }

 

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {

+    if (function_exists('icl_object_id')) {

 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";

         }

     }

     ########### WPML ###########

@@ -884,10 +884,10 @@ 
     global $wpdb, $geodir_post_type, $table, $curr;

 

     $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+    $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0;

 

     if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);

     } else {

         $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

     }

@@ -900,7 +900,7 @@ 
         } else

             $where .= " AND $wpdb->posts.post_author = $user_id";

 

-        if ($user_id == (int)get_current_user_id()) {

+        if ($user_id == (int) get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

         } else {

             $where .= " AND $wpdb->posts.post_status = 'publish' ";

@@ -913,7 +913,7 @@ 
     if (function_exists('icl_object_id')) {

         $lang_code = ICL_LANGUAGE_CODE;

         if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

+            $where .= " AND icl_t.language_code='".$lang_code."' ";

         }

 

     }

@@ -936,7 +936,7 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+        $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )";

     }

     return $join;

 }

@@ -955,16 +955,16 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

+        $where .= " AND ".$table.".is_featured = '1'";

     }

     if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )";

     }

     if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+        $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id";

     }

     if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )";

     }

     return $where;

 }

@@ -973,18 +973,18 @@ 
 function geodir_related_posts_fields($fields) {

     global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

     $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

     $mylat = $post->post_latitude;

     $mylon = $post->post_longitude;

 

-    $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+    $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";

     return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

         && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

         && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

     ) {

geodirectory-functions/location_functions.php

Braces +31 added lines, -22 removed lines

@@ -61,11 +61,12 @@ 
 function geodir_is_default_location_set()

 {

     $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

-}

+    if (!empty($default_location)) {
+            return true;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns location slug using location string.

@@ -259,8 +260,9 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+        if ($geodir_location->is_default) {
+                    update_option('geodir_default_location', $geodir_location);
+        }
 

         return $geodir_location->location_id;

 

@@ -308,9 +310,10 @@ 
     $status = $data->status;

     if ($status == "OK") {

         return $data->results[0]->address_components;

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns current location terms.

@@ -334,16 +337,19 @@ 
         }

 

         $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '' && $country) {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

         $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '' && $region) {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

         $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '' && $city) {
+                    $location_array['gd_city'] = urldecode($city);
+        }
     } else {

         if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

             return $location_array;

@@ -355,14 +361,17 @@ 
 

         $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '') {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '') {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '') {
+                    $location_array['gd_city'] = urldecode($city);
+        }
 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

Doc Comments +5 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return object

+ * @return string

  */

 function geodir_get_default_location()

 {

@@ -276,7 +276,7 @@ 
  * @package GeoDirectory

  * @param int $min The minimum number. Default: 0.

  * @param int $max The maximum number. Default: 1.

- * @return float

+ * @return integer

  */

 function geodir_random_float($min = 0, $max = 1)

 {

@@ -594,6 +594,9 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

+/**
+ * @param string $sep
+ */
 function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

 

     global $wp;

Indentation +378 added lines, -378 removed lines

@@ -9,10 +9,10 @@ 
  */

 function geodir_get_current_city_lat()

 {

-    $location = geodir_get_default_location();

-    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

+	$location = geodir_get_default_location();

+	$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

 

-    return $lat;

+	return $lat;

 }

 

 /**

@@ -25,9 +25,9 @@ 
  */

 function geodir_get_current_city_lng()

 {

-    $location = geodir_get_default_location();

-    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

-    return $lng;

+	$location = geodir_get_default_location();

+	$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

+	return $lng;

 }

 

 

@@ -40,15 +40,15 @@ 
  */

 function geodir_get_default_location()

 {

-    /**

-     * Filter the default location.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_result The default location object.

-     */

-    return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

+	/**

+	 * Filter the default location.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_result The default location object.

+	 */

+	return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

 }

 

 /**

@@ -60,11 +60,11 @@ 
  */

 function geodir_is_default_location_set()

 {

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location))

+		return true;

+	else

+		return false;

 }

 

 /**

@@ -78,15 +78,15 @@ 
 function create_location_slug($location_string)

 {

 

-    /**

-     * Filter the location slug.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_string Sanitized location string.

-     */

-    return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

+	/**

+	 * Filter the location slug.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_string Sanitized location string.

+	 */

+	return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

 

 }

 

@@ -100,15 +100,15 @@ 
  */

 function geodir_get_location($id = '')

 {

-    /**

-     * Filter the location information.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $id The location ID.

-     */

-    return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

+	/**

+	 * Filter the location information.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $id The location ID.

+	 */

+	return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

 }

 

 /**

@@ -122,28 +122,28 @@ 
  */

 function geodir_get_country_dl($post_country = '', $prefix = '')

 {

-    global $wpdb;

+	global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+	$rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

     

-    $ISO2 = array();

-    $countries = array();

+	$ISO2 = array();

+	$countries = array();

     

-    foreach ($rows as $row) {

-        $ISO2[$row->Country] = $row->ISO2;

-        $countries[$row->Country] = __($row->Country, 'geodirectory');

-    }

+	foreach ($rows as $row) {

+		$ISO2[$row->Country] = $row->ISO2;

+		$countries[$row->Country] = __($row->Country, 'geodirectory');

+	}

     

-    asort($countries);

+	asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

-    foreach ($countries as $country => $name) {

-        $ccode = $ISO2[$country];

+	$out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+	foreach ($countries as $country => $name) {

+		$ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

-    }

+		$out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+	}

 

-    echo $out_put;

+	echo $out_put;

 }

 

 

@@ -158,40 +158,40 @@ 
 function geodir_location_form_submit()

 {

 

-    global $wpdb, $plugin_prefix;

-    if (isset($_REQUEST['add_location'])) {

+	global $wpdb, $plugin_prefix;

+	if (isset($_REQUEST['add_location'])) {

 

-        $location_info = array(

-            'city' => $_REQUEST['city'],

-            'region' => $_REQUEST['region'],

-            'country' => $_REQUEST['country'],

-            'geo_lat' => $_REQUEST['latitude'],

-            'geo_lng' => $_REQUEST['longitude'],

-            'is_default' => $_REQUEST['is_default'],

-            'update_city' => $_REQUEST['update_city']

-        );

+		$location_info = array(

+			'city' => $_REQUEST['city'],

+			'region' => $_REQUEST['region'],

+			'country' => $_REQUEST['country'],

+			'geo_lat' => $_REQUEST['latitude'],

+			'geo_lng' => $_REQUEST['longitude'],

+			'is_default' => $_REQUEST['is_default'],

+			'update_city' => $_REQUEST['update_city']

+		);

 

-        $old_location = geodir_get_default_location();

+		$old_location = geodir_get_default_location();

 

-        $locationid = geodir_add_new_location($location_info);

+		$locationid = geodir_add_new_location($location_info);

 

-        $default_location = geodir_get_location($locationid);

+		$default_location = geodir_get_location($locationid);

 

-        //UPDATE AND DELETE LISTING

-        $posttype = geodir_get_posttypes();

-        if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

+		//UPDATE AND DELETE LISTING

+		$posttype = geodir_get_posttypes();

+		if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

-            foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+			foreach ($posttype as $posttypeobj) {

+				$post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

 

-                $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

-                    array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

-                );

-                $wpdb->query($sql);

-            }

-        }

-    }

+				$sql = $wpdb->prepare(

+					"UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+					array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

+				);

+				$wpdb->query($sql);

+			}

+		}

+	}

 }

 

 /**

@@ -215,37 +215,37 @@ 
  */

 function geodir_add_new_location($location_info = array())

 {

-    global $wpdb;

-

-    if (!empty($location_info)) {

-        $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

-        $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

-        $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

-        $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

-        $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

-        $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

-        $country_slug = create_location_slug(__($location_country, 'geodirectory'));

-        $region_slug = create_location_slug($location_region);

-        $city_slug = create_location_slug($location_city);

+	global $wpdb;

+

+	if (!empty($location_info)) {

+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

+		$location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

+		$location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

+		$location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

+		$is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

+		$country_slug = create_location_slug(__($location_country, 'geodirectory'));

+		$region_slug = create_location_slug($location_region);

+		$city_slug = create_location_slug($location_city);

         

-        /**

-         * Filter add new location data.

-         *

-         * @since 1.0.0

-         */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

-            'country' => $location_country,

-            'region' => $location_region,

-            'city' => $location_city,

-            'country_slug' => $country_slug,

-            'region_slug' => $region_slug,

-            'city_slug' => $city_slug,

-            'city_latitude' => $location_lat,

-            'city_longitude' => $location_lng,

-            'is_default' => $is_default

-        ));

-

-        /* // Not allowed to create country in DB : 2016-12-09

+		/**

+		 * Filter add new location data.

+		 *

+		 * @since 1.0.0

+		 */

+		$geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+			'country' => $location_country,

+			'region' => $location_region,

+			'city' => $location_city,

+			'country_slug' => $country_slug,

+			'region_slug' => $region_slug,

+			'city_slug' => $city_slug,

+			'city_latitude' => $location_lat,

+			'city_longitude' => $location_lng,

+			'is_default' => $is_default

+		));

+

+		/* // Not allowed to create country in DB : 2016-12-09

         if ($geodir_location->country) {

 

             $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

@@ -259,14 +259,14 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+		if ($geodir_location->is_default)

+			update_option('geodir_default_location', $geodir_location);

 

-        return $geodir_location->location_id;

+		return $geodir_location->location_id;

 

-    } else {

-        return false;

-    }

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -280,7 +280,7 @@ 
  */

 function geodir_random_float($min = 0, $max = 1)

 {

-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);

+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);

 }

 

 /**

@@ -294,22 +294,22 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

-    $status = $data->status;

-    if ($status == "OK") {

-        return $data->results[0]->address_components;

-    } else

-        return false;

+	$url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

+	$status = $data->status;

+	if ($status == "OK") {

+		return $data->results[0]->address_components;

+	} else

+		return false;

 }

 

 /**

@@ -326,70 +326,70 @@ 
  */

 function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '')

 {

-    global $wp, $gd_session;

-    $location_array = array();

-    if ($location_array_from == 'session') {

-        if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

-            return $location_array;

-        }

+	global $wp, $gd_session;

+	$location_array = array();

+	if ($location_array_from == 'session') {

+		if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

+			return $location_array;

+		}

 

-        $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+		$country = $gd_session->get('gd_country');

+		if ($country != '' && $country)

+			$location_array['gd_country'] = urldecode($country);

 

-        $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+		$region = $gd_session->get('gd_region');

+		if ($region != '' && $region)

+			$location_array['gd_region'] = urldecode($region);

 

-        $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

-    } else {

-        if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

-            return $location_array;

-        }

+		$city = $gd_session->get('gd_city');

+		if ($city != '' && $city)

+			$location_array['gd_city'] = urldecode($city);

+	} else {

+		if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

+			return $location_array;

+		}

 

-        $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

 

-        $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

 

-        $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+		$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+		if ($country != '')

+			$location_array['gd_country'] = urldecode($country);

 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+		if ($region != '')

+			$location_array['gd_region'] = urldecode($region);

 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+		if ($city != '')

+			$location_array['gd_city'] = urldecode($city);

 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

 			$location_array = geodir_get_current_location_terms('session');

 		}

-    }

+	}

 

 	/**

 	 * Filter the location terms.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_array {

+	 *    Attributes of the location_array.

+	 *

+	 *    @type string $gd_country The country slug.

+	 *    @type string $gd_region The region slug.

+	 *    @type string $gd_city The city slug.

 	 *

-     * @param array $location_array {

-     *    Attributes of the location_array.

-     *

-     *    @type string $gd_country The country slug.

-     *    @type string $gd_region The region slug.

-     *    @type string $gd_city The city slug.

-     *

-     * }

+	 * }

 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

 	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

 

-    return $location_array;

+	return $location_array;

 

 }

 

@@ -402,24 +402,24 @@ 
  * @return bool|string

  */

 function geodir_get_location_link($which_location = 'current') {

-    $location_link = get_permalink(geodir_location_page_id());

-

-    if ($which_location == 'base') {

-        return $location_link;

-    } else {

-        $location_terms = geodir_get_current_location_terms();

-

-        if (!empty($location_terms)) {

-            if (get_option('permalink_structure') != '') {

-                $location_terms = implode("/", $location_terms);

-                $location_terms = rtrim($location_terms, '/');

-                $location_link .= $location_terms;

-            } else {

-                $location_link = geodir_getlink($location_link, $location_terms);

-            }

-        }

-    }

-    return $location_link;

+	$location_link = get_permalink(geodir_location_page_id());

+

+	if ($which_location == 'base') {

+		return $location_link;

+	} else {

+		$location_terms = geodir_get_current_location_terms();

+

+		if (!empty($location_terms)) {

+			if (get_option('permalink_structure') != '') {

+				$location_terms = implode("/", $location_terms);

+				$location_terms = rtrim($location_terms, '/');

+				$location_link .= $location_terms;

+			} else {

+				$location_link = geodir_getlink($location_link, $location_terms);

+			}

+		}

+	}

+	return $location_link;

 }

 

 /**

@@ -432,34 +432,34 @@ 
  * @return array|bool Returns address on success.

  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

-    $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

+	$url = is_ssl() ? 'https:' : 'http:';

+	$url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

     

-    if (!empty($data) && !empty($data->address)) {

-        $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+	if (!empty($data) && !empty($data->address)) {

+		$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

+		$formatted_address = (array)$data->address;

         

-        foreach ( $data->address as $key => $value ) {

-            if (!in_array($key, $address_fields)) {

-                unset($formatted_address[$key]);

-            }

-        }

-        $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

+		foreach ( $data->address as $key => $value ) {

+			if (!in_array($key, $address_fields)) {

+				unset($formatted_address[$key]);

+			}

+		}

+		$data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

         

-        return $data;

-    } else {

-        return false;

-    }

+		return $data;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -471,47 +471,47 @@ 
  * @return string Returns the country.

  */

 function geodir_get_normal_country($country) {

-    global $wpdb;

-    if ($result = geodir_get_country_by_name($country)) {

-        return $result;

-    }

+	global $wpdb;

+	if ($result = geodir_get_country_by_name($country)) {

+		return $result;

+	}

     

-    if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

+	if (defined('POST_LOCATION_TABLE')) {

+		$rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

-    }

+		$rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

+	}

     

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

-        return $result;

-    }

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

-        return $result;

-    }

+	if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

-        return $result;

-    }

+	if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -523,16 +523,16 @@ 
  * @return string Country ISO2 code.

  */

 function geodir_get_country_iso2($country) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -545,16 +545,16 @@ 
  * @return string|null Country ISO2 code.

  */

 function geodir_get_country_by_name($country, $iso2 = false) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+		return $result;

+	}

     

-    return NULL;

+	return NULL;

 }

 

 

@@ -574,130 +574,130 @@ 
  */

 function geodir_replace_location_variables($content, $location_array = array(), $sep = NULL, $gd_page = '') {

 

-    if (empty($content)) {

-        return $content;

-    }

+	if (empty($content)) {

+		return $content;

+	}

 

 

-    $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page);

+	$location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page);

 

-    if (!empty($location_replace_vars)) {

-        foreach ($location_replace_vars as $search => $replace) {

-            if (!empty($search) && strpos($content, $search) !== false) {

-                $content = str_replace($search, $replace, $content);

-            }

-        }

-    }

+	if (!empty($location_replace_vars)) {

+		foreach ($location_replace_vars as $search => $replace) {

+			if (!empty($search) && strpos($content, $search) !== false) {

+				$content = str_replace($search, $replace, $content);

+			}

+		}

+	}

 

-    return $content;

+	return $content;

 }

 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

 function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

 

-    global $wp;

+	global $wp;

     

-    $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

-

-    if (empty($location_array)) {

-        $location_array = geodir_get_current_location_terms('query_vars');

-    }

-

-    $location_terms = array();

-    $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

-    $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

-    $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

-    $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

-

-    $location_names = array();

-    foreach ($location_terms as $type => $location) {

-        $location_name = $location;

-

-        if (!empty($location_name)) {

-            if ($location_manager) {

-                $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                $location_name = get_actual_location_name($location_type, $location, true);

-            } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                $location_name = __(geodir_ucwords($location_name), 'geodirectory');

-            }

-        }

+	$location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

+

+	if (empty($location_array)) {

+		$location_array = geodir_get_current_location_terms('query_vars');

+	}

+

+	$location_terms = array();

+	$location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

+	$location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

+	$location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

+	$location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

+

+	$location_names = array();

+	foreach ($location_terms as $type => $location) {

+		$location_name = $location;

+

+		if (!empty($location_name)) {

+			if ($location_manager) {

+				$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+				$location_name = get_actual_location_name($location_type, $location, true);

+			} else {

+				$location_name = preg_replace( '/-(\d+)$/', '', $location_name);

+				$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+				$location_name = __(geodir_ucwords($location_name), 'geodirectory');

+			}

+		}

 

-        $location_names[$type] = $location_name;

-    }

-

-    $location_single = '';

-    foreach ($location_terms as $type => $location) {

-        if (!empty($location)) {

-            if (!empty($location_names[$type])) {

-                $location_single = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                    $location_single = get_actual_location_name($location_type, $location, true);

-                } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                    $location_single = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

-            break;

-        }

-    }

-

-    $full_location = array();

-    if (!empty($location_array)) {

-        $location_array = array_reverse($location_array);

-

-        foreach ($location_array as $type => $location) {

-            if (!empty($location_names[$type])) {

-                $location_name = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                    $location_name = get_actual_location_name($location_type, $location, true);

-                } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                    $location_name = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

+		$location_names[$type] = $location_name;

+	}

+

+	$location_single = '';

+	foreach ($location_terms as $type => $location) {

+		if (!empty($location)) {

+			if (!empty($location_names[$type])) {

+				$location_single = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+					$location_single = get_actual_location_name($location_type, $location, true);

+				} else {

+					$location_name = preg_replace( '/-(\d+)$/', '', $location);

+					$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+					$location_single = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+			break;

+		}

+	}

+

+	$full_location = array();

+	if (!empty($location_array)) {

+		$location_array = array_reverse($location_array);

+

+		foreach ($location_array as $type => $location) {

+			if (!empty($location_names[$type])) {

+				$location_name = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+					$location_name = get_actual_location_name($location_type, $location, true);

+				} else {

+					$location_name = preg_replace( '/-(\d+)$/', '', $location);

+					$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+					$location_name = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+

+			$full_location[] = $location_name;

+		}

 

-            $full_location[] = $location_name;

-        }

+		if (!empty($full_location)) {

+			$full_location = array_unique($full_location);

+		}

+	}

+	$full_location = !empty($full_location) ? implode(', ', $full_location): '';

 

-        if (!empty($full_location)) {

-            $full_location = array_unique($full_location);

-        }

-    }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

-

-    $location_replace_vars = array();

-    $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

-    $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

-    $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

-

-    foreach ($location_names as $type => $name) {

-        $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

-    }

-

-    /**

-     * Filter the location terms variables to search & replace.

-     *

-     * @since   1.6.16

-     * @package GeoDirectory

-     *

-     * @param array $location_replace_vars The array of search & replace variables.

-     * @param array $location_array The array of location variables.

-     * @param string $gd_page       The page being filtered.

-     * @param string $sep           The separator.

-     */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+	$location_replace_vars = array();

+	$location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

+	$location_replace_vars['%%location%%'] = $full_location;

+	$location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

+	$location_replace_vars['%%location_single%%'] = $location_single;

+	$location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

+

+	foreach ($location_names as $type => $name) {

+		$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+

+		$location_replace_vars['%%location_' . $location_type . '%%'] = $name;

+		$location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

+	}

+

+	/**

+	 * Filter the location terms variables to search & replace.

+	 *

+	 * @since   1.6.16

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_replace_vars The array of search & replace variables.

+	 * @param array $location_array The array of location variables.

+	 * @param string $gd_page       The page being filtered.

+	 * @param string $sep           The separator.

+	 */

+	return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

 }
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -124,7 +124,7 @@ 
 {

     global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");

     

     $ISO2 = array();

     $countries = array();

@@ -136,11 +136,11 @@ 
     

     asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+    $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';

     foreach ($countries as $country => $name) {

         $ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+        $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';

     }

 

     echo $out_put;

@@ -182,10 +182,10 @@ 
         if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

             foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+                $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location

 

                 $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+                    "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

                     array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

                 );

                 $wpdb->query($sql);

@@ -233,7 +233,7 @@ 
          *

          * @since 1.0.0

          */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+        $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,

             'country' => $location_country,

             'region' => $location_region,

             'city' => $location_city,

@@ -294,7 +294,7 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng);

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -387,7 +387,7 @@ 
 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

-	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

+	$location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);

 

     return $location_array;

 

@@ -433,7 +433,7 @@ 
  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

     $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -447,9 +447,9 @@ 
     

     if (!empty($data) && !empty($data->address)) {

         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+        $formatted_address = (array) $data->address;

         

-        foreach ( $data->address as $key => $value ) {

+        foreach ($data->address as $key => $value) {

             if (!in_array($key, $address_fields)) {

                 unset($formatted_address[$key]);

             }

@@ -477,7 +477,7 @@ 
     }

     

     if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -487,7 +487,7 @@ 
             }

         }

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -525,10 +525,10 @@ 
 function geodir_get_country_iso2($country) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

         return $result;

     }

     

@@ -547,10 +547,10 @@ 
 function geodir_get_country_by_name($country, $iso2 = false) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {

         return $result;

     }

     

@@ -594,7 +594,7 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

-function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

+function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = '') {

 

     global $wp;

     

@@ -619,8 +619,8 @@ 
                 $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                 $location_name = get_actual_location_name($location_type, $location, true);

             } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                $location_name = preg_replace('/-(\d+)$/', '', $location_name);

+                $location_name = preg_replace('/[_-]/', ' ', $location_name);

                 $location_name = __(geodir_ucwords($location_name), 'geodirectory');

             }

         }

@@ -638,8 +638,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_single = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_single = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -659,8 +659,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_name = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_name = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -672,20 +672,20 @@ 
             $full_location = array_unique($full_location);

         }

     }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

+    $full_location = !empty($full_location) ? implode(', ', $full_location) : '';

 

     $location_replace_vars = array();

     $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

     $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

+    $location_replace_vars['%%in_location%%'] = $full_location != '' ? __('in', 'geodirectory').' '.$full_location : '';

     $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

+    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __('in', 'geodirectory').' '.$location_single : '';

 

     foreach ($location_names as $type => $name) {

         $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

 

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

+        $location_replace_vars['%%location_'.$location_type.'%%'] = $name;

+        $location_replace_vars['%%in_location_'.$location_type.'%%'] = !empty($name) ? __('in', 'geodirectory').' '.$name : '';

     }

 

     /**

@@ -699,5 +699,5 @@ 
      * @param string $gd_page       The page being filtered.

      * @param string $sep           The separator.

      */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+    return apply_filters('geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep);

 }
\ No newline at end of file

geodirectory-functions/custom_functions.php

Braces +5 added lines, -5 removed lines

@@ -2256,7 +2256,7 @@ 
 

 	if ( $new_style ) {

 		$default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>';

-	}else{

+	} else{

 		$default_search_button_label = 'Search';

 	}

 	if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {

@@ -2283,7 +2283,7 @@ 
 	if ( $new_style ) {

 	?>

 		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button>

-<?php }else{?>

+<?php } else{?>

 		<input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>"

 	       class="geodir_submit_search <?php echo $fa_class; ?>"/>

 	<?php }

@@ -2333,17 +2333,17 @@ 
 			if ( $new_style ) {

 				echo "</div>";

 			}

-		}else{

+		} else{

 			if(! empty( $post_types )){

 				$pt_arr = (array)$post_types;

 				echo '<input type="hidden" name="stype" value="' . key( $pt_arr  ) . '"  />';

-			}else{

+			} else{

 				echo '<input type="hidden" name="stype" value="gd_place"  />';

 			}

 

 		}

 

-	}elseif ( ! empty( $post_types ) ) {

+	} elseif ( ! empty( $post_types ) ) {

 		echo '<input type="hidden" name="stype" value="gd_place"  />';

 	}

 }

Doc Comments +3 added lines, -6 removed lines

@@ -161,7 +161,7 @@ 
  * @param object|string $post The post object.

  * @param string $post_type   The post type.

  *

- * @return object Returns filtered package info as an object.

+ * @return string Returns filtered package info as an object.

  */

 function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {

 	$package_info['pid']              = 0;

@@ -2489,7 +2489,7 @@ 
  *

  * @since 1.5.0

  *

- * @return True if WPML is active else False.

+ * @return boolean if WPML is active else False.

  */

 function geodir_is_wpml() {

     if (function_exists('icl_object_id')) {

@@ -2561,7 +2561,6 @@ 
  * @since 1.6.16 Sync reviews if sync comments allowed.

  *

  * @param int $post_id The Post ID.

- * @param string $lang Language code for translating post.

  * @param array $request_info The post details in an array.

  */

 function geodir_wpml_duplicate_listing($post_id, $request_info) {

@@ -2645,7 +2644,7 @@ 
  * @param int $master_post_id Original Post ID.

  * @param int $tr_post_id Translation Post ID.

  * @param string $lang Language code for translating post.

- * @return bool True for success, False for fail.

+ * @return boolean|null True for success, False for fail.

  */

 function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {

     global $sitepress, $wpdb;

@@ -2888,8 +2887,6 @@ 
  *

  * @since 1.6.16

  *

- * @param string $post_type WP post type or WP texonomy. Ex: gd_place.

- * @param bool $taxonomy Whether $post_type is taxonomy or not.

  * @return bool True if review star disabled, otherwise false.

  */ 

 function geodir_rating_disabled_post_types() {

Spacing +668 added lines, -668 removed lines

@@ -52,31 +52,31 @@ 
 				jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);

 			}

 

-			jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {

+			jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {

 				//alert(data );

 			});

 		}

 	</script>

 	<div class="geodir-list-view-select">

 		<select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);">

-			<?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?>

-			<option value=""><?php _e( 'View:', 'geodirectory' ); ?></option>

+			<?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>

+			<option value=""><?php _e('View:', 'geodirectory'); ?></option>

 			<option

-				value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option>

+				value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>

 			<option

-				value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option>

+				value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>

 			<option

-				value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option>

+				value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>

 			<option

-				value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option>

+				value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>

 			<option

-				value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option>

+				value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>

 		</select>

 	</div>

 	<?php

 }

 

-add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 );

+add_action('geodir_before_listing', 'geodir_list_view_select', 100);

 

 /**

  * Limit the listing excerpt.

@@ -91,9 +91,9 @@ 
  * @global object $post          The current post object.

  * @return string The modified excerpt.

  */

-function geodir_max_excerpt( $charlength ) {

+function geodir_max_excerpt($charlength) {

 	global $post;

-	if ( $charlength == '0' ) {

+	if ($charlength == '0') {

 		return;

 	}

 	$out = '';

@@ -101,46 +101,46 @@ 
 	$temp_post = $post;

 	$excerpt   = get_the_excerpt();

 

-	$charlength ++;

-	$excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' );

-	if ( mb_strlen( $excerpt ) > $charlength ) {

-		if ( mb_strlen( $excerpt_more ) > 0 && mb_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( mb_strlen( $excerpt_more ) );

-			$subex = mb_substr( $excerpt, 0, $excut );

-			if ( $charlength > 0 && mb_strlen( $subex ) > $charlength ) {

-				$subex = mb_substr( $subex, 0, $charlength );

+	$charlength++;

+	$excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');

+	if (mb_strlen($excerpt) > $charlength) {

+		if (mb_strlen($excerpt_more) > 0 && mb_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (mb_strlen($excerpt_more));

+			$subex = mb_substr($excerpt, 0, $excut);

+			if ($charlength > 0 && mb_strlen($subex) > $charlength) {

+				$subex = mb_substr($subex, 0, $charlength);

 			}

 			$out .= $subex;

 		} else {

-			$subex   = mb_substr( $excerpt, 0, $charlength - 5 );

-			$exwords = explode( ' ', $subex );

-			$excut   = - ( mb_strlen( $exwords[ count( $exwords ) - 1 ] ) );

-			if ( $excut < 0 ) {

-				$out .= mb_substr( $subex, 0, $excut );

+			$subex   = mb_substr($excerpt, 0, $charlength - 5);

+			$exwords = explode(' ', $subex);

+			$excut   = - (mb_strlen($exwords[count($exwords) - 1]));

+			if ($excut < 0) {

+				$out .= mb_substr($subex, 0, $excut);

 			} else {

 				$out .= $subex;

 			}

 		}

-		$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 		/**

 		 * Filter excerpt read more text.

 		 *

 		 * @since 1.0.0

 		 */

-		$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+		$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 		$out .= '</a>';

 

 	} else {

-		if ( mb_strlen( $excerpt_more ) > 0 && mb_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( mb_strlen( $excerpt_more ) );

-			$out .= mb_substr( $excerpt, 0, $excut );

-			$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		if (mb_strlen($excerpt_more) > 0 && mb_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (mb_strlen($excerpt_more));

+			$out .= mb_substr($excerpt, 0, $excut);

+			$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 			/**

 			 * Filter excerpt read more text.

 			 *

 			 * @since 1.0.0

 			 */

-			$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+			$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 			$out .= '</a>';

 		} else {

 			$out .= $excerpt;

@@ -163,7 +163,7 @@ 
  *

  * @return object Returns filtered package info as an object.

  */

-function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {

+function geodir_post_package_info($package_info, $post = '', $post_type = '') {

 	$package_info['pid']              = 0;

 	$package_info['days']             = 0;

 	$package_info['amount']           = 0;

@@ -192,7 +192,7 @@ 
 	 * @param object|string $post  The post object.

 	 * @param string $post_type    The post type.

 	 */

-	return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type );

+	return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);

 

 }

 

@@ -220,11 +220,11 @@ 
  *

  * }

  */

-function geodir_send_inquiry( $request ) {

+function geodir_send_inquiry($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = $request['inq_name'];

 	$youremail     = $request['inq_email'];

@@ -235,26 +235,26 @@ 
 	$author_id  = '';

 	$post_title = '';

 

-	if ( $request['pid'] ) {

+	if ($request['pid']) {

 

 		$productinfosql = $wpdb->prepare(

 			"select ID,post_author,post_title from $wpdb->posts where ID =%d",

-			array( $request['pid'] )

+			array($request['pid'])

 		);

-		$productinfo    = $wpdb->get_row( $productinfosql );

+		$productinfo = $wpdb->get_row($productinfosql);

 

 		$author_id  = $productinfo->post_author;

 		$post_title = $productinfo->post_title;

 	}

 

-	$post_title = '<a href="' . get_permalink( $pid ) . '">' . $post_title . '</a>';

+	$post_title = '<a href="'.get_permalink($pid).'">'.$post_title.'</a>';

 

-	$user_info = get_userdata( $author_id );

-	$to_email  = geodir_get_post_meta( $pid, 'geodir_email', true );

-	$to_name   = geodir_get_client_name( $author_id );

+	$user_info = get_userdata($author_id);

+	$to_email  = geodir_get_post_meta($pid, 'geodir_email', true);

+	$to_name   = geodir_get_client_name($author_id);

 

-	if ( $to_email == '' ) {

-		$to_email = get_option( 'admin_email' );

+	if ($to_email == '') {

+		$to_email = get_option('admin_email');

 	}

 

 	/**

@@ -275,10 +275,10 @@ 
 	 * }

 	 * @param string $type     The form type, default: `Enquiry`.

 	 */

-	do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' );

+	do_action('geodir_after_send_enquiry', $request, 'Enquiry');

 

 	$client_message = $frnd_comments;

-	$client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.';

+	$client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';

 	/**

 	 * Filter client message text.

 	 *

@@ -286,7 +286,7 @@ 
 	 *

 	 * @param string $client_message Client message text.

 	 */

-	$client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message );

+	$client_message = apply_filters('geodir_inquiry_email_msg', $client_message);

 

 	/**

 	 * Called before the send enquiry email is sent.

@@ -305,12 +305,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_enquiry_email', $request );

-	if ( $to_email ) {

+	do_action('geodir_before_send_enquiry_email', $request);

+	if ($to_email) {

 		// strip slashes message

-		$client_message = stripslashes_deep( $client_message );

+		$client_message = stripslashes_deep($client_message);

 

-		geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email

+		geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email

 	}

 

 	/**

@@ -330,12 +330,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_enquiry_email', $request );

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&send_inquiry=success";

+	do_action('geodir_after_send_enquiry_email', $request);

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&send_inquiry=success";

 	} else {

-		$url = $url . "?send_inquiry=success";

+		$url = $url."?send_inquiry=success";

 	}

 	/**

 	 * Filter redirect url after the send enquiry email is sent.

@@ -344,8 +344,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 

 }

@@ -374,11 +374,11 @@ 
  * }

  * @global object $wpdb        WordPress Database object.

  */

-function geodir_send_friend( $request ) {

+function geodir_send_friend($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = $request['yourname'];

 	$youremail     = $request['youremail'];

@@ -387,13 +387,13 @@ 
 	$pid           = $request['pid'];

 	$to_email      = $request['to_email'];

 	$to_name       = $request['to_name'];

-	if ( $request['pid'] ) {

+	if ($request['pid']) {

 		$productinfosql = $wpdb->prepare(

 			"select ID,post_title from $wpdb->posts where ID =%d",

-			array( $request['pid'] )

+			array($request['pid'])

 		);

-		$productinfo    = $wpdb->get_results( $productinfosql );

-		foreach ( $productinfo as $productinfoObj ) {

+		$productinfo = $wpdb->get_results($productinfosql);

+		foreach ($productinfo as $productinfoObj) {

 			$post_title = $productinfoObj->post_title;

 		}

 	}

@@ -417,8 +417,8 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_to_friend_email', $request );

-	geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email

+	do_action('geodir_before_send_to_friend_email', $request);

+	geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email

 

 	/**

 	 * Called after the send to friend email is sent.

@@ -439,13 +439,13 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_to_friend_email', $request );

+	do_action('geodir_after_send_to_friend_email', $request);

 

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&sendtofrnd=success";

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&sendtofrnd=success";

 	} else {

-		$url = $url . "?sendtofrnd=success";

+		$url = $url."?sendtofrnd=success";

 	}

 	/**

 	 * Filter redirect url after the send to friend email is sent.

@@ -454,8 +454,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 }

 

@@ -469,8 +469,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_before_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_before_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '<div class="geodir-company_info field-group">';

 			break;

@@ -480,7 +480,7 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >';

+			echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';

 			break;

 		case 'reviews' :

 			echo '<div id="reviews-wrap" class="clearfix"> ';

@@ -504,8 +504,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_after_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_after_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '</div>';

 			break;

@@ -536,25 +536,25 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_posts_default_sort( $post_type ) {

+function geodir_get_posts_default_sort($post_type) {

 

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where	post_type= %s and is_active=%d and is_default=%d", array(

+		$sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where	post_type= %s and is_active=%d and is_default=%d", array(

 			$post_type,

 			1,

 			1

-		) ) );

+		)));

 

-		if ( ! empty( $sort_field_info ) ) {

+		if (!empty($sort_field_info)) {

 			return $sort_field_info;

 		}

 

@@ -574,20 +574,20 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_sort_options( $post_type ) {

+function geodir_get_sort_options($post_type) {

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

+		$sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

 			$post_type,

 			1

-		) ) );

+		)));

 

 		/**

 		 * Filter post sort options.

@@ -597,7 +597,7 @@ 
 		 * @param array $sort_field_info Unfiltered sort field array.

 		 * @param string $post_type      Post type.

 		 */

-		return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type );

+		return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);

 	}

 

 }

@@ -618,63 +618,63 @@ 
 	 *

 	 * @since 1.4.4

 	 */

-	if ( is_search() ) {

+	if (is_search()) {

 		return;

 	}

 

 	$sort_by = '';

 

-	if ( isset( $_REQUEST['sort_by'] ) ) {

+	if (isset($_REQUEST['sort_by'])) {

 		$sort_by = $_REQUEST['sort_by'];

 	}

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$sort_options = geodir_get_sort_options( $gd_post_type );

+	$sort_options = geodir_get_sort_options($gd_post_type);

 

 

 	$sort_field_options = '';

 

-	if ( ! empty( $sort_options ) ) {

-		foreach ( $sort_options as $sort ) {

-			$sort = stripslashes_deep( $sort ); // strip slashes

+	if (!empty($sort_options)) {

+		foreach ($sort_options as $sort) {

+			$sort = stripslashes_deep($sort); // strip slashes

 

-			$label = __( $sort->site_title, 'geodirectory' );

+			$label = __($sort->site_title, 'geodirectory');

 

-			if ( $sort->field_type == 'random' ) {

+			if ($sort->field_type == 'random') {

 				$key = $sort->field_type;

-				( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->htmlvar_name == 'comment_count' ) {

+			if ($sort->htmlvar_name == 'comment_count') {

 				$sort->htmlvar_name = 'rating_count';

 			}

 

-			if ( $sort->sort_asc ) {

-				$key   = $sort->htmlvar_name . '_asc';

+			if ($sort->sort_asc) {

+				$key   = $sort->htmlvar_name.'_asc';

 				$label = $sort->site_title;

-				if ( $sort->asc_title ) {

+				if ($sort->asc_title) {

 					$label = $sort->asc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->sort_desc ) {

-				$key   = $sort->htmlvar_name . '_desc';

+			if ($sort->sort_desc) {

+				$key   = $sort->htmlvar_name.'_desc';

 				$label = $sort->site_title;

-				if ( $sort->desc_title ) {

+				if ($sort->desc_title) {

 					$label = $sort->desc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

 		}

 	}

 

-	if ( $sort_field_options != '' ) {

+	if ($sort_field_options != '') {

 

 		?>

 

@@ -683,9 +683,9 @@ 
 			<select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;">

 

 				<option

-					value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {

+					value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {

 					echo 'selected="selected"';

-				} ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php

+				} ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php

 

 				echo $sort_field_options; ?>

 

@@ -713,9 +713,9 @@ 
  *

  * @return string Returns the section title.

  */

-function geodir_advance_customfields_heading( $title, $field_type ) {

+function geodir_advance_customfields_heading($title, $field_type) {

 

-	if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {

+	if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {

 		$title = '';

 	}

 

@@ -737,19 +737,19 @@ 
  * @global object $gd_session       GeoDirectory Session object.

  * @return string Returns related posts html.

  */

-function geodir_related_posts_display( $request ) {

-	if ( ! empty( $request ) ) {

-		$before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : '';

-		$after_title  = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : '';

-

-		$title               = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' );

-		$post_number         = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5';

-		$relate_to           = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category';

-		$layout              = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf';

-		$add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0';

-		$listing_width       = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : '';

-		$list_sort           = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest';

-		$character_count     = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : '';

+function geodir_related_posts_display($request) {

+	if (!empty($request)) {

+		$before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : '';

+		$after_title  = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : '';

+

+		$title               = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');

+		$post_number         = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5';

+		$relate_to           = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category';

+		$layout              = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf';

+		$add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0';

+		$listing_width       = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : '';

+		$list_sort           = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest';

+		$character_count     = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : '';

 

 		global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon;

 		$related_parent_lat   = !empty($post->post_latitude) ? $post->post_latitude : '';

@@ -757,10 +757,10 @@ 
 		$arr_detail_page_tabs = geodir_detail_page_tabs_list();

 

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

-		if ( isset($post->post_type) && in_array( $post->post_type, $related_listing_array ) ) {

+		if (isset($post->post_type) && in_array($post->post_type, $related_listing_array)) {

 			$arr_detail_page_tabs['related_listing']['is_display'] = true;

 		}

 

@@ -772,90 +772,90 @@ 
 		$tax_field         = 'id';

 		$category          = array();

 

-		if ( isset( $_REQUEST['backandedit'] ) ) {

-			$post      = (object) $gd_session->get( 'listing' );

+		if (isset($_REQUEST['backandedit'])) {

+			$post      = (object) $gd_session->get('listing');

 			$post_type = $post->listing_type;

-			if ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {

+			if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

 				$post_id = $_REQUEST['pid'];

 			}

-		} elseif ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {

-			$post      = geodir_get_post_info( $_REQUEST['pid'] );

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$post      = geodir_get_post_info($_REQUEST['pid']);

 			$post_type = $post->post_type;

 			$post_id   = $_REQUEST['pid'];

-		} elseif ( isset( $post->post_type ) && $post->post_type != '' ) {

+		} elseif (isset($post->post_type) && $post->post_type != '') {

 			$post_type = $post->post_type;

 			$post_id   = $post->ID;

 		}

 

-		if ( $relate_to == 'category' ) {

+		if ($relate_to == 'category') {

 

-			$category_taxonomy = $post_type . $relate_to;

-			if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {

-				$category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );

+			$category_taxonomy = $post_type.$relate_to;

+			if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {

+				$category = explode(',', trim($post->{$category_taxonomy}, ','));

 			}

 

-		} elseif ( $relate_to == 'tags' ) {

+		} elseif ($relate_to == 'tags') {

 

-			$category_taxonomy = $post_type . '_' . $relate_to;

-			if ( $post->post_tags != '' ) {

-				$category = explode( ',', trim( $post->post_tags, ',' ) );

+			$category_taxonomy = $post_type.'_'.$relate_to;

+			if ($post->post_tags != '') {

+				$category = explode(',', trim($post->post_tags, ','));

 			}

 			$tax_field = 'name';

 		}

 

 		/* --- return false in invalid request --- */

-		if ( empty( $category ) ) {

+		if (empty($category)) {

 			return false;

 		}

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

 		/* --- return false in invalid request --- */

 

 		$location_url = '';

-		if ( $add_location_filter != '0' ) {

+		if ($add_location_filter != '0') {

 			$location_url             = array();

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

-			$gd_city = get_query_var( 'gd_city' );

+			$gd_city = get_query_var('gd_city');

 

-			if ( $gd_city ) {

-				$gd_country = get_query_var( 'gd_country' );

-				$gd_region  = get_query_var( 'gd_region' );

+			if ($gd_city) {

+				$gd_country = get_query_var('gd_country');

+				$gd_region  = get_query_var('gd_region');

 			} else {

 				$location = geodir_get_default_location();

 

-				$gd_country = isset( $location->country_slug ) ? $location->country_slug : '';

-				$gd_region  = isset( $location->region_slug ) ? $location->region_slug : '';

-				$gd_city    = isset( $location->city_slug ) ? $location->city_slug : '';

+				$gd_country = isset($location->country_slug) ? $location->country_slug : '';

+				$gd_region  = isset($location->region_slug) ? $location->region_slug : '';

+				$gd_city    = isset($location->city_slug) ? $location->city_slug : '';

 			}

 

-			if ( $geodir_show_location_url == 'all' ) {

+			if ($geodir_show_location_url == 'all') {

 				$location_url[] = $gd_country;

 				$location_url[] = $gd_region;

-			} else if ( $geodir_show_location_url == 'country_city' ) {

+			} else if ($geodir_show_location_url == 'country_city') {

 				$location_url[] = $gd_country;

-			} else if ( $geodir_show_location_url == 'region_city' ) {

+			} else if ($geodir_show_location_url == 'region_city') {

 				$location_url[] = $gd_region;

 			}

 

 			$location_url[] = $gd_city;

 

-			$location_url = implode( '/', $location_url );

+			$location_url = implode('/', $location_url);

 		}

 

 

-		if ( ! empty( $category ) ) {

+		if (!empty($category)) {

 			global $geodir_add_location_url;

 			$geodir_add_location_url = '0';

-			if ( $add_location_filter != '0' ) {

+			if ($add_location_filter != '0') {

 				$geodir_add_location_url = '1';

 			}

-			$viewall_url             = get_term_link( (int) $category[0], $post_type . $category_taxonomy );

+			$viewall_url             = get_term_link((int) $category[0], $post_type.$category_taxonomy);

 			$geodir_add_location_url = null;

 		}

 		ob_start();

@@ -865,24 +865,24 @@ 
 		<div class="geodir_locations geodir_location_listing">

 

 			<?php

-			if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {

+			if (isset($request['is_widget']) && $request['is_widget'] == '1') {

 				/** geodir_before_title filter Documented in geodirectory_widgets.php */

-				$before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' );

+				$before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');

 				/** geodir_after_title filter Documented in geodirectory_widgets.php */

-				$after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' );

+				$after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');

 				?>

 				<div class="location_list_heading clearfix">

-					<?php echo $before_title . $title . $after_title; ?>

+					<?php echo $before_title.$title.$after_title; ?>

 				</div>

 				<?php

 			}

 			$query_args = array(

 				'posts_per_page'   => $post_number,

 				'is_geodir_loop'   => true,

-				'gd_location'      => ( $add_location_filter ) ? true : false,

+				'gd_location'      => ($add_location_filter) ? true : false,

 				'post_type'        => $post_type,

 				'order_by'         => $list_sort,

-				'post__not_in'     => array( $post_id ),

+				'post__not_in'     => array($post_id),

 				'excerpt_length'   => $character_count,

 				'related_listings' => $is_display

 			);

@@ -893,7 +893,7 @@ 
 				'terms'    => $category

 			);

 

-			$query_args['tax_query'] = array( $tax_query );

+			$query_args['tax_query'] = array($tax_query);

 

 			global $gridview_columns, $post;

 

@@ -905,21 +905,21 @@ 
 			 * @param array $query_args The query array.

 			 * @param array $request Related posts request array.

 			 */

-			$query_args = apply_filters( 'geodir_related_posts_widget_query_args', $query_args, $request );

+			$query_args = apply_filters('geodir_related_posts_widget_query_args', $query_args, $request);

 

-			query_posts( $query_args );

+			query_posts($query_args);

 

-			if ( strstr( $layout, 'gridview' ) ) {

-				$listing_view_exp = explode( '_', $layout );

+			if (strstr($layout, 'gridview')) {

+				$listing_view_exp = explode('_', $layout);

 				$gridview_columns = $layout;

 				$layout           = $listing_view_exp[0];

-			} else if ( $layout == 'list' ) {

+			} else if ($layout == 'list') {

 				$gridview_columns = '';

 			}

 			$related_posts = true;

 

 			$related_nearest = false;

-			if ( $list_sort == 'nearest' ) {

+			if ($list_sort == 'nearest') {

 				$related_nearest = true;

 			}

 

@@ -929,14 +929,14 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			$template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'listing-listview' ) );

+			$template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('listing-listview'));

 

 			/**

 			 * Includes related listing listview template.

 			 *

 			 * @since 1.0.0

 			 */

-			include( $template );

+			include($template);

 

 			wp_reset_query();

 			$post            = $origi_post;

@@ -964,12 +964,12 @@ 
 function geodir_category_count_script() {

 	global $geodir_post_category_str;

 

-	if ( ! empty( $geodir_post_category_str ) ) {

-		$geodir_post_category_str = serialize( $geodir_post_category_str );

+	if (!empty($geodir_post_category_str)) {

+		$geodir_post_category_str = serialize($geodir_post_category_str);

 	}

 

-	$all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' );

-	$script                         = "var post_category_array = " . json_encode( $all_var ) . ';';

+	$all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8');

+	$script                         = "var post_category_array = ".json_encode($all_var).';';

 	echo '<script>';

 	echo $script;

 	echo '</script>';

@@ -984,8 +984,8 @@ 
  * @return string Returns the default language.

  */

 function geodir_get_map_default_language() {

-	$geodir_default_map_language = get_option( 'geodir_default_map_language' );

-	if ( empty( $geodir_default_map_language ) ) {

+	$geodir_default_map_language = get_option('geodir_default_map_language');

+	if (empty($geodir_default_map_language)) {

 		$geodir_default_map_language = 'en';

 	}

 

@@ -996,7 +996,7 @@ 
 	 *

 	 * @param string $geodir_default_map_language Default map language.

 	 */

-	return apply_filters( 'geodir_default_map_language', $geodir_default_map_language );

+	return apply_filters('geodir_default_map_language', $geodir_default_map_language);

 }

 

 /**

@@ -1007,7 +1007,7 @@ 
  * @return string Returns the api key.

  */

 function geodir_get_map_api_key() {

-	$key = get_option( 'geodir_google_api_key' );

+	$key = get_option('geodir_google_api_key');

 

 	/**

 	 * Filter Google maps api key.

@@ -1016,7 +1016,7 @@ 
 	 *

 	 * @param string $key Google maps api key.

 	 */

-	return apply_filters( 'geodir_google_api_key', $key );

+	return apply_filters('geodir_google_api_key', $key);

 }

 

 

@@ -1035,20 +1035,20 @@ 
 	global $wp, $post, $wp_query, $wpdb, $geodir_addon_list;

 

 	$is_geodir_page = geodir_is_geodir_page();

-	if ( ! $is_geodir_page ) {

+	if (!$is_geodir_page) {

 		return;

 	}// if non GD page, bail

 

 	$use_gd_meta = true;

-	if ( class_exists( 'WPSEO_Frontend' ) || class_exists( 'All_in_One_SEO_Pack' ) ) {

+	if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

 		$use_gd_meta = false;

 

-		if ( geodir_is_page( 'search' ) ) {

+		if (geodir_is_page('search')) {

 			$use_gd_meta = true;

 		}

 	}

 

-	if ( ! $use_gd_meta ) {

+	if (!$use_gd_meta) {

 		return;

 	}// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.

 

@@ -1056,170 +1056,170 @@ 
 

 	$all_postypes = geodir_get_posttypes();

 

-	$geodir_taxonomies = geodir_get_taxonomies( '', true );

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

 	$meta_desc = '';

 	$meta_key  = '';

-	if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {

+	if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {

 		/**

 		 * Filter SEO meta location description.

 		 *

 		 * @since 1.0.0

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' );

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', '');

 		$meta_desc .= '';

 	}

-	if ( have_posts() && is_single() OR is_page() ) {

-		while ( have_posts() ) {

+	if (have_posts() && is_single() OR is_page()) {

+		while (have_posts()) {

 			the_post();

 

-			if ( has_excerpt() ) {

-				$out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) );

+			if (has_excerpt()) {

+				$out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt()));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode(get_the_excerpt()));

 				}

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt );

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);

 			} else {

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content );

-				$out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);

+				$out_excerpt = strip_tags(strip_shortcodes($out_excerpt));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content

 				}

-				$out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' );

+				$out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-');

 			}

 

 			$meta_desc .= $out_excerpt;

 		}

-	} elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		if ( is_category() ) {

-			$meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . ucfirst( single_cat_title( "", false ) );

-		} elseif ( is_tag() ) {

-			$meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . ucfirst( single_tag_title( "", false ) );

+	} elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		if (is_category()) {

+			$meta_desc .= __("Posts related to Category:", 'geodirectory')." ".ucfirst(single_cat_title("", false));

+		} elseif (is_tag()) {

+			$meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".ucfirst(single_tag_title("", false));

 		}

-	} elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		$meta_desc .= isset( $current_term->description ) ? $current_term->description : '';

+	} elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		$meta_desc .= isset($current_term->description) ? $current_term->description : '';

 	}

 

 

 	$geodir_post_type       = geodir_get_current_posttype();

-	$geodir_post_type_info  = get_post_type_object( $geodir_post_type );

-	$geodir_is_page_listing = geodir_is_page( 'listing' ) ? true : false;

-

-	$category_taxonomy = geodir_get_taxonomies( $geodir_post_type );

-	$tag_taxonomy      = geodir_get_taxonomies( $geodir_post_type, true );

-

-	$geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false;

-	$geodir_is_tag      = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false;

-

-	$geodir_is_search        = geodir_is_page( 'search' ) ? true : false;

-	$geodir_is_location      = geodir_is_page( 'location' ) ? true : false;

-	$geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

-	$godir_location_terms    = geodir_get_current_location_terms( 'query_vars' );

-	$gd_city                 = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null;

-	$gd_region               = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null;

-	$gd_country              = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null;

-	$replace_location        = __( 'Everywhere', 'geodirectory' );

+	$geodir_post_type_info  = get_post_type_object($geodir_post_type);

+	$geodir_is_page_listing = geodir_is_page('listing') ? true : false;

+

+	$category_taxonomy = geodir_get_taxonomies($geodir_post_type);

+	$tag_taxonomy      = geodir_get_taxonomies($geodir_post_type, true);

+

+	$geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false;

+	$geodir_is_tag      = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false;

+

+	$geodir_is_search        = geodir_is_page('search') ? true : false;

+	$geodir_is_location      = geodir_is_page('location') ? true : false;

+	$geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

+	$godir_location_terms    = geodir_get_current_location_terms('query_vars');

+	$gd_city                 = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null;

+	$gd_region               = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null;

+	$gd_country              = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null;

+	$replace_location        = __('Everywhere', 'geodirectory');

 	$location_id             = null;

-	if ( $geodir_location_manager ) {

-		$sql           = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) );

-		$location_id   = (int) $wpdb->get_var( $sql );

+	if ($geodir_location_manager) {

+		$sql           = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));

+		$location_id   = (int) $wpdb->get_var($sql);

 		$location_type = geodir_what_is_current_location();

-		if ( $location_type == 'city' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) );

-		} elseif ( $location_type == 'region' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) );

-		} elseif ( $location_type == 'country' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) );

-			$replace_location = __( $replace_location, 'geodirectory' );

+		if ($location_type == 'city') {

+			$replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));

+		} elseif ($location_type == 'region') {

+			$replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));

+		} elseif ($location_type == 'country') {

+			$replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));

+			$replace_location = __($replace_location, 'geodirectory');

 		}

-		$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');

 		$current_location = '';

-		if ( $country != '' ) {

-			$current_location = get_actual_location_name( 'country', $country, true );

+		if ($country != '') {

+			$current_location = get_actual_location_name('country', $country, true);

 		}

-		if ( $region != '' ) {

-			$current_location = get_actual_location_name( 'region', $region );

+		if ($region != '') {

+			$current_location = get_actual_location_name('region', $region);

 		}

-		if ( $city != '' ) {

-			$current_location = get_actual_location_name( 'city', $city );

+		if ($city != '') {

+			$current_location = get_actual_location_name('city', $city);

 		}

 		$replace_location = $current_location != '' ? $current_location : $replace_location;

 	}

 

 	$geodir_meta_keys = '';

 	$geodir_meta_desc = '';

-	if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {

-		if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {

-			$geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

+	if ($is_geodir_page && !empty($geodir_post_type_info)) {

+		if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {

+			$geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

 

-			$geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc;

-			$geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

 

-			if ( $geodir_is_category ) {

-				$category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null;

-				if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {

+			if ($geodir_is_category) {

+				$category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;

+				if (isset($category->term_id) && !empty($category->term_id)) {

 					$category_id   = $category->term_id;

-					$category_desc = trim( $category->description ) != '' ? trim( $category->description ) : get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type );

-					if ( $location_id ) {

-						$option_name    = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id;

-						$cat_loc_option = get_option( $option_name );

-

-						$gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

-						if ( ! $gd_cat_loc_default ) {

-							$option_name   = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id;

-							$option        = get_option( $option_name );

-							$category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc;

+					$category_desc = trim($category->description) != '' ? trim($category->description) : get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type);

+					if ($location_id) {

+						$option_name    = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id;

+						$cat_loc_option = get_option($option_name);

+

+						$gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

+						if (!$gd_cat_loc_default) {

+							$option_name   = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id;

+							$option        = get_option($option_name);

+							$category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc;

 						}

 					}

-					$geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc;

+					$geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".ucfirst(single_cat_title("", false)).'. '.$category_desc;

 				}

-			} else if ( $geodir_is_tag ) {

-				$geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc;

+			} else if ($geodir_is_tag) {

+				$geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;

 			}

 		}

 	}

 

 

 	$gd_page = '';

-	if ( geodir_is_page( 'home' ) ) {

+	if (geodir_is_page('home')) {

 		$gd_page   = 'home';

-		$meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'detail' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;

+	} elseif (geodir_is_page('detail')) {

 		$gd_page   = 'detail';

-		$meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'pt' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;

+	} elseif (geodir_is_page('pt')) {

 		$gd_page   = 'pt';

-		$meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'listing' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;

+	} elseif (geodir_is_page('listing')) {

 		$gd_page   = 'listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'location' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;

+	} elseif (geodir_is_page('location')) {

 		$gd_page   = 'location';

-		$meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc;

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc );

+		$meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);

 

-	} elseif ( geodir_is_page( 'search' ) ) {

+	} elseif (geodir_is_page('search')) {

 		$gd_page   = 'search';

-		$meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'add-listing' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;

+	} elseif (geodir_is_page('add-listing')) {

 		$gd_page   = 'add-listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'author' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;

+	} elseif (geodir_is_page('author')) {

 		$gd_page   = 'author';

-		$meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'login' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;

+	} elseif (geodir_is_page('login')) {

 		$gd_page   = 'login';

-		$meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'listing-success' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;

+	} elseif (geodir_is_page('listing-success')) {

 		$gd_page   = 'listing-success';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc;

+		$meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;

 	}

 

 

-	if ( $meta_desc ) {

-		$meta_desc = stripslashes_deep( $meta_desc );

+	if ($meta_desc) {

+		$meta_desc = stripslashes_deep($meta_desc);

 		/**

 		 * Filter page description to replace variables.

 		 *

@@ -1228,7 +1228,7 @@ 
 		 * @param string $title   The page description including variables.

 		 * @param string $gd_page The GeoDirectory page type if any.

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' );

+		$meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');

 

 		/**

 		 * Filter SEO meta description.

@@ -1237,49 +1237,49 @@ 
 		 *

 		 * @param string $meta_desc Meta description content.

 		 */

-		echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc );

+		echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);

 	}

 

 	// meta keywords

-	if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {

-		$place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) );

-		$place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) );

+	if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {

+		$place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));

+		$place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));

 

-		$meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) );

+		$meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));

 	} else {

 		$posttags = get_the_tags();

-		if ( $posttags ) {

-			foreach ( $posttags as $tag ) {

-				$meta_key .= $tag->name . ' ';

+		if ($posttags) {

+			foreach ($posttags as $tag) {

+				$meta_key .= $tag->name.' ';

 			}

 		} else {

-			$tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) );

+			$tags = get_tags(array('orderby' => 'count', 'order' => 'DESC'));

 			$xt   = 1;

 

-			foreach ( $tags as $tag ) {

-				if ( $xt <= 20 ) {

-					$meta_key .= $tag->name . ", ";

+			foreach ($tags as $tag) {

+				if ($xt <= 20) {

+					$meta_key .= $tag->name.", ";

 				}

 

-				$xt ++;

+				$xt++;

 			}

 		}

 	}

 

-	$meta_key         = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key;

-	$geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key;

-	if ( $geodir_meta_keys != '' ) {

-		$geodir_meta_keys = strip_tags( $geodir_meta_keys );

-		$geodir_meta_keys = esc_html( $geodir_meta_keys );

-		$geodir_meta_keys = geodir_strtolower( $geodir_meta_keys );

-		$geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' );

-		$geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys );

+	$meta_key         = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key;

+	$geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key;

+	if ($geodir_meta_keys != '') {

+		$geodir_meta_keys = strip_tags($geodir_meta_keys);

+		$geodir_meta_keys = esc_html($geodir_meta_keys);

+		$geodir_meta_keys = geodir_strtolower($geodir_meta_keys);

+		$geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, '');

+		$geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);

 

-		$meta_key = rtrim( trim( $geodir_meta_keys ), "," );

+		$meta_key = rtrim(trim($geodir_meta_keys), ",");

 	}

 

-	if ( $meta_key ) {

-		$meta_key = stripslashes_deep( $meta_key );

+	if ($meta_key) {

+		$meta_key = stripslashes_deep($meta_key);

 		/**

 		 * Filter SEO meta keywords.

 		 *

@@ -1287,7 +1287,7 @@ 
 		 *

 		 * @param string $meta_desc Meta keywords.

 		 */

-		echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key );

+		echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);

 	}

 

 }

@@ -1307,8 +1307,8 @@ 
 

 	$geodir_detail_page_tabs_array = geodir_detail_page_tabs_array();

 

-	foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {

-		$geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text'];

+	foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {

+		$geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text'];

 	}

 

 	return $geodir_detail_page_tabs_key_value_array;

@@ -1330,57 +1330,57 @@ 
 	 * @since 1.0.0

 	 */

 	$arr_tabs['post_profile'] = array(

-		'heading_text'  => __( 'Profile', 'geodirectory' ),

+		'heading_text'  => __('Profile', 'geodirectory'),

 		'is_active_tab' => true,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),

 		'tab_content'   => ''

 	);

-	$arr_tabs['post_info']    = array(

-		'heading_text'  => __( 'More Info', 'geodirectory' ),

+	$arr_tabs['post_info'] = array(

+		'heading_text'  => __('More Info', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_images'] = array(

-		'heading_text'  => __( 'Photos', 'geodirectory' ),

+		'heading_text'  => __('Photos', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_video'] = array(

-		'heading_text'  => __( 'Video', 'geodirectory' ),

+		'heading_text'  => __('Video', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['special_offers'] = array(

-		'heading_text'  => __( 'Special Offers', 'geodirectory' ),

+		'heading_text'  => __('Special Offers', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_map'] = array(

-		'heading_text'  => __( 'Map', 'geodirectory' ),

+		'heading_text'  => __('Map', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['reviews'] = array(

-		'heading_text'  => __( 'Reviews', 'geodirectory' ),

+		'heading_text'  => __('Reviews', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),

 		'tab_content'   => 'review display'

 	);

 

 	$arr_tabs['related_listing'] = array(

-		'heading_text'  => __( 'Related Listing', 'geodirectory' ),

+		'heading_text'  => __('Related Listing', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),

 		'tab_content'   => ''

 	);

 

@@ -1389,7 +1389,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs );

+	return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);

 

 

 }

@@ -1403,13 +1403,13 @@ 
  * @return mixed|array Tabs array.

  */

 function geodir_detail_page_tabs_list() {

-	$tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' );

+	$tabs_excluded = get_option('geodir_detail_page_tabs_excluded');

 	$tabs_array    = geodir_detail_page_tabs_array();

 

-	if ( ! empty( $tabs_excluded ) ) {

-		foreach ( $tabs_excluded as $tab ) {

-			if ( array_key_exists( $tab, $tabs_array ) ) {

-				unset( $tabs_array[ $tab ] );

+	if (!empty($tabs_excluded)) {

+		foreach ($tabs_excluded as $tab) {

+			if (array_key_exists($tab, $tabs_array)) {

+				unset($tabs_array[$tab]);

 			}

 		}

 	}

@@ -1433,58 +1433,58 @@ 
 function geodir_show_detail_page_tabs() {

 	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields, $preview;

 

-	$post_id            = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0;

-	$request_post_id    = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0;

-	$is_backend_preview = ( is_single() && ! empty( $_REQUEST['post_type'] ) && ! empty( $_REQUEST['preview'] ) && ! empty( $_REQUEST['p'] ) ) && is_super_admin() ? true : false; // skip if preview from backend

+	$post_id            = !empty($post) && isset($post->ID) ? (int) $post->ID : 0;

+	$request_post_id    = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

-	if ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {

-		$post = geodir_get_post_info( $request_post_id );

-		setup_postdata( $post );

+	if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {

+		$post = geodir_get_post_info($request_post_id);

+		setup_postdata($post);

 	}

 

-	$geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' );

+	$geodir_post_detail_fields = geodir_show_listing_info('moreinfo');

 

 

-	if ( geodir_is_page( 'detail' ) ) {

-		$video                 = geodir_get_video( $post->ID );

-		$special_offers        = geodir_get_special_offers( $post->ID );

+	if (geodir_is_page('detail')) {

+		$video                 = geodir_get_video($post->ID);

+		$special_offers        = geodir_get_special_offers($post->ID);

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

 

 

-		$excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' );

-		if ( ! $excluded_tabs ) {

+		$excluded_tabs = get_option('geodir_detail_page_tabs_excluded');

+		if (!$excluded_tabs) {

 			$excluded_tabs = array();

 		}

 

 		$related_listing = '';

-		if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {

+		if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {

 			$request = array(

-				'post_number'         => get_option( 'geodir_related_post_count' ),

-				'relate_to'           => get_option( 'geodir_related_post_relate_to' ),

-				'layout'              => get_option( 'geodir_related_post_listing_view' ),

-				'add_location_filter' => get_option( 'geodir_related_post_location_filter' ),

-				'list_sort'           => get_option( 'geodir_related_post_sortby' ),

-				'character_count'     => get_option( 'geodir_related_post_excerpt' )

+				'post_number'         => get_option('geodir_related_post_count'),

+				'relate_to'           => get_option('geodir_related_post_relate_to'),

+				'layout'              => get_option('geodir_related_post_listing_view'),

+				'add_location_filter' => get_option('geodir_related_post_location_filter'),

+				'list_sort'           => get_option('geodir_related_post_sortby'),

+				'character_count'     => get_option('geodir_related_post_excerpt')

 			);

 

-			if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {

-				$related_listing = geodir_get_detail_page_related_events( $request );

+			if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {

+				$related_listing = geodir_get_detail_page_related_events($request);

 			} else {

-				$related_listing = geodir_related_posts_display( $request );

+				$related_listing = geodir_related_posts_display($request);

 			}

 

 		}

 

-		$post_images = geodir_get_images( $post->ID, 'thumbnail' );

+		$post_images = geodir_get_images($post->ID, 'thumbnail');

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

-			foreach ( $post_images as $image ) {

-				$caption = ( ! empty( $image->caption ) ) ? $image->caption : '';

-				$thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">';

-				$thumb_image .= geodir_show_image( $image, 'thumbnail', true, false );

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				$caption = (!empty($image->caption)) ? $image->caption : '';

+				$thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">';

+				$thumb_image .= geodir_show_image($image, 'thumbnail', true, false);

 				$thumb_image .= '</a>';

 			}

 		}

@@ -1493,11 +1493,11 @@ 
 		$map_args['map_canvas_name'] = 'detail_page_map_canvas';

 		$map_args['width']           = '600';

 		$map_args['height']          = '300';

-		if ( $post->post_mapzoom ) {

-			$map_args['zoom'] = '' . $post->post_mapzoom . '';

+		if ($post->post_mapzoom) {

+			$map_args['zoom'] = ''.$post->post_mapzoom.'';

 		}

 		$map_args['autozoom']                 = false;

-		$map_args['scrollwheel']              = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1;

+		$map_args['scrollwheel']              = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;

 		$map_args['child_collapse']           = '0';

 		$map_args['enable_cat_filters']       = false;

 		$map_args['enable_text_search']       = false;

@@ -1506,43 +1506,43 @@ 
 		$map_args['enable_jason_on_load']     = true;

 		$map_args['enable_map_direction']     = true;

 		$map_args['map_class_name']           = 'geodir-map-detail-page';

-		$map_args['maptype']                  = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP';

-	} else if ( geodir_is_page( 'preview' ) ) {

-		$video          = isset( $post->geodir_video ) ? $post->geodir_video : '';

-		$special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : '';

+		$map_args['maptype']                  = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';

+	} else if (geodir_is_page('preview')) {

+		$video          = isset($post->geodir_video) ? $post->geodir_video : '';

+		$special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : '';

 

-		if ( isset( $post->post_images ) ) {

-			$post->post_images = trim( $post->post_images, "," );

+		if (isset($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

 		}

 

-		if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {

-			$post_images = explode( ",", $post->post_images );

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post_images = explode(",", $post->post_images);

 		}

 

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

-			foreach ( $post_images as $image ) {

-				if ( $image != '' ) {

-					$thumb_image .= '<a href="' . $image . '">';

-					$thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false );

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image != '') {

+					$thumb_image .= '<a href="'.$image.'">';

+					$thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);

 					$thumb_image .= '</a>';

 				}

 			}

 		}

 

 		global $map_jason;

-		$marker_json      = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array();

-		$marker_icon      = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : '';

-		$icon_size        = geodir_get_marker_size( $marker_icon );

+		$marker_json      = $post->marker_json != '' ? json_decode($post->marker_json, true) : array();

+		$marker_icon      = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : '';

+		$icon_size        = geodir_get_marker_size($marker_icon);

 		$marker_json['w'] = $icon_size['w'];

 		$marker_json['h'] = $icon_size['h'];

-		$map_jason[]      = json_encode( $marker_json );

+		$map_jason[]      = json_encode($marker_json);

 

-		$address_latitude  = isset( $post->post_latitude ) ? $post->post_latitude : '';

-		$address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : '';

-		$mapview           = isset( $post->post_mapview ) ? $post->post_mapview : '';

-		$mapzoom           = isset( $post->post_mapzoom ) ? $post->post_mapzoom : '';

-		if ( ! $mapzoom ) {

+		$address_latitude  = isset($post->post_latitude) ? $post->post_latitude : '';

+		$address_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+		$mapview           = isset($post->post_mapview) ? $post->post_mapview : '';

+		$mapzoom           = isset($post->post_mapzoom) ? $post->post_mapzoom : '';

+		if (!$mapzoom) {

 			$mapzoom = 12;

 		}

 

@@ -1565,37 +1565,37 @@ 
 		$map_args['map_class_name']           = 'geodir-map-preview-page';

 	}

 

-	$arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user

+	$arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user

 

 	$active_tab       = '';

 	$active_tab_name  = '';

 	$default_tab      = '';

 	$default_tab_name = '';

-	foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {

-		if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {

+	foreach ($arr_detail_page_tabs as $tab_index => $tabs) {

+		if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {

 			$active_tab      = $tab_index;

-			$active_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$active_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 

-		if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {

+		if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {

 			$default_tab      = $tab_index;

-			$default_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$default_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 	}

 

-	if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab acs a active tab if not any tab is active.

-		if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {

-			$arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false;

+	if ($active_tab === '' && $default_tab !== '') { // Make first tab acs a active tab if not any tab is active.

+		if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {

+			$arr_detail_page_tabs[$active_tab]['is_active_tab'] = false;

 		}

 

-		$arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true;

+		$arr_detail_page_tabs[$default_tab]['is_active_tab'] = true;

 		$active_tab                                            = $default_tab;

 		$active_tab_name                                       = $default_tab_name;

 	}

-	$tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false;

+	$tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;

 	?>

 	<div class="geodir-tabs" id="gd-tabs" style="position:relative;">

-		<?php if ( ! $tab_list ){ ?>

+		<?php if (!$tab_list) { ?>

 		<div id="geodir-tab-mobile-menu">

 			<i class="fa fa-bars"></i>

 			<span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>

@@ -1610,26 +1610,26 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_after_tab_list'

 			 */

-			do_action( 'geodir_before_tab_list' ); ?>

+			do_action('geodir_before_tab_list'); ?>

 			<?php

 

-			foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] ) {

+			foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {

+				if ($detail_page_tab['is_display']) {

 

-					if ( ! $tab_list ) {

+					if (!$tab_list) {

 						?>

 						<dt></dt> <!-- added to comply with validation -->

-						<dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a

+						<dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a

 								data-tab="#<?php echo $tab_index; ?>"

-								data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a>

+								data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a>

 						</dd>

 						<?php

 					}

 					ob_start() // start tab content buffering

 					?>

 					<li id="<?php echo $tab_index; ?>Tab">

-						<?php if ( $tab_list ) {

-							$tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />';

+						<?php if ($tab_list) {

+							$tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />';

 							/**

 							 * Filter the tab list title html.

 							 *

@@ -1639,7 +1639,7 @@ 
 							 * @param string $tab_index      The tab index type.

 							 * @param array $detail_page_tab The array of values including title text.

 							 */

-							echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab );

+							echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);

 						} ?>

 						<div id="<?php echo $tab_index; ?>" class="hash-offset"></div>

 						<?php

@@ -1650,7 +1650,7 @@ 
 						 *

 						 * @param string $tab_index The tab name ID.

 						 */

-						do_action( 'geodir_before_tab_content', $tab_index );

+						do_action('geodir_before_tab_content', $tab_index);

 

 						/**

 						 * Called before the details tab content is output per tab.

@@ -1660,21 +1660,21 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_before_tab_content'

 						 */

-						do_action( 'geodir_before_' . $tab_index . '_tab_content' );

+						do_action('geodir_before_'.$tab_index.'_tab_content');

 						/// write a code to generate content of each tab

-						switch ( $tab_index ) {

+						switch ($tab_index) {

 							case 'post_profile':

 								/**

 								 * Called before the listing description content on the details page tab.

 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_before_description_on_listing_detail' );

-								if ( geodir_is_page( 'detail' ) ) {

+								do_action('geodir_before_description_on_listing_detail');

+								if (geodir_is_page('detail')) {

 									the_content();

 								} else {

 									/** This action is documented in geodirectory_template_actions.php */

-									echo apply_filters( 'the_content', stripslashes( $post->post_desc ) );

+									echo apply_filters('the_content', stripslashes($post->post_desc));

 								}

 

 								/**

@@ -1682,7 +1682,7 @@ 
 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_after_description_on_listing_detail' );

+								do_action('geodir_after_description_on_listing_detail');

 								break;

 							case 'post_info':

 								echo $geodir_post_detail_fields;

@@ -1692,32 +1692,32 @@ 
 								break;

 							case 'post_video':

 								// some browsers hide $_POST data if used for embeds so we repalce with a placeholder

-								if ( $preview ) {

-									if ( $video ) {

-										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>";

+								if ($preview) {

+									if ($video) {

+										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";

 									}

 								} else {

 

 									// stop payment manager filtering content length

-									$filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-									if ( false !== $filter_priority ) {

-										remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+									$filter_priority = has_filter('the_content', 'geodir_payments_the_content');

+									if (false !== $filter_priority) {

+										remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);

 									}

 

 									/** This action is documented in geodirectory_template_actions.php */

-									echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also;

+									echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;

 

-									if ( false !== $filter_priority ) {

-										add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+									if (false !== $filter_priority) {

+										add_filter('the_content', 'geodir_payments_the_content', $filter_priority);

 									}

 								}

 								break;

 							case 'special_offers':

-								echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) );

+								echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));

 

 								break;

 							case 'post_map':

-								geodir_draw_map( $map_args );

+								geodir_draw_map($map_args);

 								break;

 							case 'reviews':

 								comments_template();

@@ -1726,7 +1726,7 @@ 
 								echo $related_listing;

 								break;

 							default: {

-								if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {

+								if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {

 									echo $detail_page_tab['tab_content'];

 								}

 							}

@@ -1738,7 +1738,7 @@ 
 						 *

 						 * @since 1.0.0

 						 */

-						do_action( 'geodir_after_tab_content', $tab_index );

+						do_action('geodir_after_tab_content', $tab_index);

 

 						/**

 						 * Called after the details tab content is output per tab.

@@ -1748,7 +1748,7 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_after_tab_content'

 						 */

-						do_action( 'geodir_after_' . $tab_index . '_tab_content' );

+						do_action('geodir_after_'.$tab_index.'_tab_content');

 						?> </li>

 					<?php

 					/**

@@ -1756,7 +1756,7 @@ 
 					 *

 					 * @since 1.0.0

 					 */

-					$arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() );

+					$arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());

 				} // end of if for is_display

 			}// end of foreach

 

@@ -1766,14 +1766,14 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_before_tab_list'

 			 */

-			do_action( 'geodir_after_tab_list' );

+			do_action('geodir_after_tab_list');

 			?>

-			<?php if ( ! $tab_list ){ ?></dl><?php } ?>

-		<ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"

+			<?php if (!$tab_list) { ?></dl><?php } ?>

+		<ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"

 		    style="position:relative;">

 			<?php

-			foreach ( $arr_detail_page_tabs as $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {

+			foreach ($arr_detail_page_tabs as $detail_page_tab) {

+				if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {

 					echo $detail_page_tab['tab_content'];

 				}// end of if

 			}// end of foreach

@@ -1783,11 +1783,11 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			do_action( 'geodir_add_tab_content' ); ?>

+			do_action('geodir_add_tab_content'); ?>

 		</ul>

 		<!--gd-tabs-content ul end-->

 	</div>

-	<?php if ( ! $tab_list ) { ?>

+	<?php if (!$tab_list) { ?>

 		<script>

 			if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {

 				hashVal = window.location.hash;

@@ -1819,31 +1819,31 @@ 
  *

  * @return mixed Image file.

  */

-function geodir_exif( $file ) {

-	if ( empty( $file ) || ! is_array( $file ) ) {

+function geodir_exif($file) {

+	if (empty($file) || !is_array($file)) {

 		return $file;

 	}

 

-	$file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : '';

-	if ( ! ( $file_path && file_exists( $file_path ) ) ) {

+	$file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : '';

+	if (!($file_path && file_exists($file_path))) {

 		return $file;

 	}

 	$file['file'] = $file_path;

 

-	if ( ! file_is_valid_image( $file_path ) ) {

+	if (!file_is_valid_image($file_path)) {

 		return $file; // Bail if file is not an image.

 	}

 

-	if ( ! function_exists( 'wp_get_image_editor' ) ) {

+	if (!function_exists('wp_get_image_editor')) {

 		return $file;

 	}

 

 	$mime_type = $file['type'];

 	$exif      = array();

-	if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {

+	if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {

 		try {

-			$exif = exif_read_data( $file_path );

-		} catch ( Exception $e ) {

+			$exif = exif_read_data($file_path);

+		} catch (Exception $e) {

 			$exif = array();

 		}

 	}

@@ -1852,13 +1852,13 @@ 
 	$flip        = false;

 	$modify      = false;

 	$orientation = 0;

-	if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {

-		switch ( (int) $exif['Orientation'] ) {

+	if (!empty($exif) && isset($exif['Orientation'])) {

+		switch ((int) $exif['Orientation']) {

 			case 1:

 				// do nothing

 				break;

 			case 2:

-				$flip   = array( false, true );

+				$flip   = array(false, true);

 				$modify = true;

 				break;

 			case 3:

@@ -1867,13 +1867,13 @@ 
 				$modify      = true;

 				break;

 			case 4:

-				$flip   = array( true, false );

+				$flip   = array(true, false);

 				$modify = true;

 				break;

 			case 5:

 				$orientation = - 90;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 6:

@@ -1884,7 +1884,7 @@ 
 			case 7:

 				$orientation = - 270;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 8:

@@ -1910,31 +1910,31 @@ 
 	 * @param int|null $quality Image Compression quality between 1-100% scale. Default null.

 	 * @param string $quality   Image mime type.

 	 */

-	$quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type );

-	if ( $quality !== null ) {

+	$quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);

+	if ($quality !== null) {

 		$modify = true;

 	}

 

-	if ( ! $modify ) {

+	if (!$modify) {

 		return $file; // no change

 	}

 

-	$image = wp_get_image_editor( $file_path );

-	if ( ! is_wp_error( $image ) ) {

-		if ( $rotate ) {

-			$image->rotate( $orientation );

+	$image = wp_get_image_editor($file_path);

+	if (!is_wp_error($image)) {

+		if ($rotate) {

+			$image->rotate($orientation);

 		}

 

-		if ( ! empty( $flip ) ) {

-			$image->flip( $flip[0], $flip[1] );

+		if (!empty($flip)) {

+			$image->flip($flip[0], $flip[1]);

 		}

 

-		if ( $quality !== null ) {

-			$image->set_quality( (int) $quality );

+		if ($quality !== null) {

+			$image->set_quality((int) $quality);

 		}

 

-		$result = $image->save( $file_path );

-		if ( ! is_wp_error( $result ) ) {

+		$result = $image->save($file_path);

+		if (!is_wp_error($result)) {

 			$file['file']     = $result['path'];

 			$file['tmp_name'] = $result['path'];

 		}

@@ -1961,7 +1961,7 @@ 
  *

  * @return string Returns the recent reviews html.

  */

-function geodir_get_recent_reviews( $g_size = 60, $no_comments = 10, $comment_lenth = 60, $show_pass_post = false ) {

+function geodir_get_recent_reviews($g_size = 60, $no_comments = 10, $comment_lenth = 60, $show_pass_post = false) {

 	global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session;

 	$tablecomments = $wpdb->comments;

 	$tableposts    = $wpdb->posts;

@@ -1971,28 +1971,28 @@ 
 	$region_filter  = '';

 	$country_filter = '';

 

-	if ( $gd_session->get( 'gd_multi_location' ) ) {

-		if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {

-			$country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) );

+	if ($gd_session->get('gd_multi_location')) {

+		if ($gd_ses_country = $gd_session->get('gd_country')) {

+			$country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));

 		}

 

-		if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {

-			$region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) );

+		if ($gd_ses_region = $gd_session->get('gd_region')) {

+			$region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));

 		}

 

-		if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {

-			$city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) );

+		if ($gd_ses_city = $gd_session->get('gd_city')) {

+			$city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));

 		}

 	}

 

 	$review_table = GEODIR_REVIEW_TABLE;

 	$request      = "SELECT r.id as ID, r.post_type, r.comment_id as comment_ID, r.post_date as comment_date,r.overall_rating, r.user_id, r.post_id FROM $review_table as r WHERE r.post_status = 1 AND r.status =1 AND r.overall_rating>=1 $country_filter $region_filter $city_filter ORDER BY r.post_date DESC, r.id DESC LIMIT $no_comments";

 

-	$comments = $wpdb->get_results( $request );

+	$comments = $wpdb->get_results($request);

 

-	foreach ( $comments as $comment ) {

+	foreach ($comments as $comment) {

 		// Set the extra comment info needed.

-		$comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" );

+		$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");

 		//echo "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID";

 		$comment->comment_content      = $comment_extra->comment_content;

 		$comment->comment_author       = $comment_extra->comment_author;

@@ -2000,75 +2000,75 @@ 
 

 		$comment_id      = '';

 		$comment_id      = $comment->comment_ID;

-		$comment_content = strip_tags( $comment->comment_content );

+		$comment_content = strip_tags($comment->comment_content);

 

-		$comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content );

+		$comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);

 

-		$permalink            = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID;

+		$permalink            = get_permalink($comment->ID)."#comment-".$comment->comment_ID;

 		$comment_author_email = $comment->comment_author_email;

 		$comment_post_ID      = $comment->post_id;

 

 		$na = true;

-		if ( function_exists( 'icl_object_id' ) && icl_object_id( $comment_post_ID, $comment->post_type, true ) ) {

-			$comment_post_ID2 = icl_object_id( $comment_post_ID, $comment->post_type, false );

-			if ( $comment_post_ID == $comment_post_ID2 ) {

+		if (function_exists('icl_object_id') && icl_object_id($comment_post_ID, $comment->post_type, true)) {

+			$comment_post_ID2 = icl_object_id($comment_post_ID, $comment->post_type, false);

+			if ($comment_post_ID == $comment_post_ID2) {

 			} else {

 				$na = false;

 			}

 		}

 

-		$post_title        = get_the_title( $comment_post_ID );

-		$permalink         = get_permalink( $comment_post_ID );

-		$comment_permalink = $permalink . "#comment-" . $comment->comment_ID;

-		$read_more         = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>';

+		$post_title        = get_the_title($comment_post_ID);

+		$permalink         = get_permalink($comment_post_ID);

+		$comment_permalink = $permalink."#comment-".$comment->comment_ID;

+		$read_more         = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';

 

-		$comment_content_length = strlen( $comment_content );

-		if ( $comment_content_length > $comment_lenth ) {

-			$comment_excerpt = mb_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more;

+		$comment_content_length = strlen($comment_content);

+		if ($comment_content_length > $comment_lenth) {

+			$comment_excerpt = mb_substr($comment_content, 0, $comment_lenth).'... '.$read_more;

 		} else {

 			$comment_excerpt = $comment_content;

 		}

 

-		if ( $comment->user_id ) {

-			$user_profile_url = get_author_posts_url( $comment->user_id );

+		if ($comment->user_id) {

+			$user_profile_url = get_author_posts_url($comment->user_id);

 		} else {

 			$user_profile_url = '';

 		}

 

-		if ( $comment_id && $na ) {

+		if ($comment_id && $na) {

 			$comments_echo .= '<li class="clearfix">';

-			$comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">";

-			if ( function_exists( 'get_avatar' ) ) {

-				if ( ! isset( $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+			$comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">";

+			if (function_exists('get_avatar')) {

+				if (!isset($comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

+					$comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

 				}

-			} elseif ( function_exists( 'gravatar' ) ) {

-				if ( $user_profile_url ) {

-					$comments_echo .= '<a href="' . $user_profile_url . '">';

+			} elseif (function_exists('gravatar')) {

+				if ($user_profile_url) {

+					$comments_echo .= '<a href="'.$user_profile_url.'">';

 				}

 				$comments_echo .= "<img src=\"";

-				if ( '' == $comment->comment_type ) {

-					$comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+				if ('' == $comment->comment_type) {

+					$comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

 				}

@@ -2078,17 +2078,17 @@ 
 			$comments_echo .= "</span>\n";

 

 			$comments_echo .= '<span class="geodir_reviewer_content">';

-			if ( $comment->user_id ) {

-				$comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">';

+			if ($comment->user_id) {

+				$comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> ';

-			if ( $comment->user_id ) {

+			$comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> ';

+			if ($comment->user_id) {

 				$comments_echo .= '</a>';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> ';

-			$comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>';

-			$comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID );

-			$comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . '';

+			$comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';

+			$comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>';

+			$comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID);

+			$comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.'';

 			//echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);

 			$comments_echo .= '</p>';

 

@@ -2108,25 +2108,25 @@ 
  * @return array Returns post categories as an array.

  */

 function geodir_home_map_cats_key_value_array() {

-	$post_types = geodir_get_posttypes( 'object' );

+	$post_types = geodir_get_posttypes('object');

 

 	$return = array();

-	if ( ! empty( $post_types ) ) {

-		foreach ( $post_types as $key => $post_type ) {

-			$cpt_name       = __( $post_type->labels->singular_name, 'geodirectory' );

-			$post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name );

-			$taxonomies     = geodir_get_taxonomies( $key );

-			$cat_taxonomy   = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null;

-			$cat_terms      = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null;

-

-			if ( ! empty( $cat_terms ) ) {

-				$return[ 'optgroup_start-' . $key ] = $post_type_name;

-

-				foreach ( $cat_terms as $cat_term ) {

-					$return[ $key . '_' . $cat_term->term_id ] = $cat_term->name;

+	if (!empty($post_types)) {

+		foreach ($post_types as $key => $post_type) {

+			$cpt_name       = __($post_type->labels->singular_name, 'geodirectory');

+			$post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);

+			$taxonomies     = geodir_get_taxonomies($key);

+			$cat_taxonomy   = !empty($taxonomies[0]) ? $taxonomies[0] : null;

+			$cat_terms      = $cat_taxonomy ? get_terms($cat_taxonomy) : null;

+

+			if (!empty($cat_terms)) {

+				$return['optgroup_start-'.$key] = $post_type_name;

+

+				foreach ($cat_terms as $cat_term) {

+					$return[$key.'_'.$cat_term->term_id] = $cat_term->name;

 				}

 

-				$return[ 'optgroup_end-' . $key ] = $post_type_name;

+				$return['optgroup_end-'.$key] = $post_type_name;

 			}

 		}

 	}

@@ -2142,14 +2142,14 @@ 
  * @package GeoDirectory

  */

 function geodir_twitter_tweet_button() {

-	if ( isset( $_GET['gde'] ) ) {

-		$link = '?url=' . urlencode( geodir_curPageURL() );

+	if (isset($_GET['gde'])) {

+		$link = '?url='.urlencode(geodir_curPageURL());

 	} else {

 		$link = '';

 	}

 	?>

 	<a href="http://twitter.com/share<?php echo $link; ?>"

-	   class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a>

+	   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 	<script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 	<?php

 }

@@ -2166,10 +2166,10 @@ 
 function geodir_fb_like_button() {

 	global $post;

 	?>

-	<iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {

+	<iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {

 		echo 'allowtransparency="true"';

 	} ?> class="facebook"

-	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

+	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

 	     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>

 	<?php

 }

@@ -2200,7 +2200,7 @@ 
 

 

 function geodir_listing_bounce_map_pin_on_hover() {

-	if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {

+	if (get_option('geodir_listing_hover_bounce_map_pin', true)) {

 		?>

 		<script>

 			jQuery(function ($) {

@@ -2223,44 +2223,44 @@ 
 	}

 }

 

-add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 );

+add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);

 

-add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 );

-function geodir_output_favourite_html_listings( $post_id ) {

-	geodir_favourite_html( '', $post_id );

+add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);

+function geodir_output_favourite_html_listings($post_id) {

+	geodir_favourite_html('', $post_id);

 }

 

-add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 );

-function geodir_output_pinpoint_html_listings( $post_id, $post ) {

+add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);

+function geodir_output_pinpoint_html_listings($post_id, $post) {

 	global $wp_query;

 

 	$show_pin_point = $wp_query->is_main_query();

 

-	if ( ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {

-		$term_icon_url = get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type );

-		$marker_icon   = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' );

+	if (!empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {

+		$term_icon_url = get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type);

+		$marker_icon   = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');

 		?>

 		<span class="geodir-pinpoint"

-		      style="background:url('<?php 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>

+		      style="background:url('<?php 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)"

 		   onclick="openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')"

 		   onmouseover="animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')"

-		   onmouseout="stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>

+		   onmouseout="stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')"><?php _e('Pinpoint', 'geodirectory'); ?></a>

 		<?php

 	}

 }

 

 function geodir_search_form_submit_button() {

 

-	$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

+	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 

-	if ( $new_style ) {

+	if ($new_style) {

 		$default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>';

-	}else{

+	} else {

 		$default_search_button_label = 'Search';

 	}

-	if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {

-		$default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' );

+	if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {

+		$default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

 	}

 

 	/**

@@ -2272,78 +2272,78 @@ 
 	 *

 	 * @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);

 

 	$fa_class = '';

-	if ( strpos( $default_search_button_label, '&#' ) !== false ) {

+	if (strpos($default_search_button_label, '&#') !== false) {

 		$fa_class = 'fa';

 	}

 

 

-	if ( $new_style ) {

+	if ($new_style) {

 	?>

-		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button>

-<?php }else{?>

-		<input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>"

+		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e($default_search_button_label, 'geodirectory'); ?></button>

+<?php } else {?>

+		<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>"

 	       class="geodir_submit_search <?php echo $fa_class; ?>"/>

 	<?php }

 }

 

-add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 );

+add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);

 

 function geodir_search_form_post_type_input() {

 	global $geodir_search_post_type;

-	$post_types     = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) );

+	$post_types     = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));

 	$curr_post_type = $geodir_search_post_type;

 

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 

-		foreach ( $post_types as $post_type => $info ){

+		foreach ($post_types as $post_type => $info) {

 			global $wpdb;

-			$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-			if ( ! $has_posts ) {

+			$has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+			if (!$has_posts) {

 				unset($post_types->{$post_type});

 			}

 		}

 

-		if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+		if (!empty($post_types) && count((array) $post_types) > 1) {

 

-			$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

-			if ( $new_style ) {

+			$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

+			if ($new_style) {

 				echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>";

 			}

 			?>

 			<select name="stype" class="search_by_post">

-				<?php foreach ( $post_types as $post_type => $info ):

+				<?php foreach ($post_types as $post_type => $info):

 					global $wpdb;

 					?>

 

-					<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'] ) {

+					<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 ) {

+					} 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>

 			<?php

-			if ( $new_style ) {

+			if ($new_style) {

 				echo "</div>";

 			}

-		}else{

-			if(! empty( $post_types )){

-				$pt_arr = (array)$post_types;

-				echo '<input type="hidden" name="stype" value="' . key( $pt_arr  ) . '"  />';

-			}else{

+		} else {

+			if (!empty($post_types)) {

+				$pt_arr = (array) $post_types;

+				echo '<input type="hidden" name="stype" value="'.key($pt_arr).'"  />';

+			} else {

 				echo '<input type="hidden" name="stype" value="gd_place"  />';

 			}

 

 		}

 

-	}elseif ( ! empty( $post_types ) ) {

+	}elseif (!empty($post_types)) {

 		echo '<input type="hidden" name="stype" value="gd_place"  />';

 	}

 }

@@ -2351,26 +2351,26 @@ 
 function geodir_search_form_search_input() {

 

 	$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');

 	}

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-search'>";

 	}

 	?>

 	<input class="search_text" name="s"

-	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+	       value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {

+		       echo esc_attr(stripslashes_deep($_REQUEST['s']));

 	       } else {

 		       echo $default_search_for_text;

 	       } ?>" type="text"

-	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

-	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

+	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"

+	       onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

 	<?php

-	if($new_style){

+	if ($new_style) {

 		echo "</div>";

 	}

 }

@@ -2378,12 +2378,12 @@ 
 function geodir_search_form_near_input() {

 

 	$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');

 	}

 

-	if ( isset( $_REQUEST['snear'] ) && $_REQUEST['snear'] != '' ) {

-		$near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) );

+	if (isset($_REQUEST['snear']) && $_REQUEST['snear'] != '') {

+		$near = esc_attr(stripslashes_deep($_REQUEST['snear']));

 	} else {

 		$near = $default_near_text;

 	}

@@ -2397,7 +2397,7 @@ 
 	 * @since 1.6.9

 	 * @param string $curr_post_type The current post type.

 	 */

-	$near_input_extra = apply_filters('geodir_near_input_extra','',$curr_post_type);

+	$near_input_extra = apply_filters('geodir_near_input_extra', '', $curr_post_type);

 

 

 	/**

@@ -2410,7 +2410,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$near = apply_filters( 'geodir_search_near_text', $near, $default_near_text );

+	$near = apply_filters('geodir_search_near_text', $near, $default_near_text);

 	/**

 	 * Filter the default "Near" text value for the search form.

 	 *

@@ -2421,7 +2421,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near );

+	$default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);

 	/**

 	 * Filter the class for the near search input.

 	 *

@@ -2429,10 +2429,10 @@ 
 	 *

 	 * @param string $class The class for the HTML near input, default is blank.

 	 */

-	$near_class = apply_filters( 'geodir_search_near_class', '' );

+	$near_class = apply_filters('geodir_search_near_class', '');

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-near' $near_input_extra>";

 		

 		do_action('geodir_before_near_input');

@@ -2440,30 +2440,30 @@ 
 

 	?>

 	<input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>"

-	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"

-	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"

-	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra;?>/>

+	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"

+	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"

+	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra; ?>/>

 	<?php

-	if($new_style){

+	if ($new_style) {

 		do_action('geodir_after_near_input');

 

 		echo "</div>";

 	}

 }

 

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 );

+add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);

+add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);

+add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);

 

-function geodir_get_search_post_type($pt=''){

+function geodir_get_search_post_type($pt = '') {

 	global $geodir_search_post_type;

 

-	if($pt!=''){return $geodir_search_post_type = $pt;}

-	if(!empty($geodir_search_post_type)){ return $geodir_search_post_type;}

+	if ($pt != '') {return $geodir_search_post_type = $pt; }

+	if (!empty($geodir_search_post_type)) { return $geodir_search_post_type; }

 

 	$geodir_search_post_type = geodir_get_current_posttype();

 

-	if(!$geodir_search_post_type) {

+	if (!$geodir_search_post_type) {

 		$geodir_search_post_type = geodir_get_default_posttype();

 	}

 

@@ -2471,7 +2471,7 @@ 
 	return $geodir_search_post_type;

 }

 

-function geodir_search_form(){

+function geodir_search_form() {

 

 	geodir_get_search_post_type();

 

@@ -2481,8 +2481,8 @@ 
 	die();

 }

 

-add_action( 'wp_ajax_geodir_search_form', 'geodir_search_form' );

-add_action( 'wp_ajax_nopriv_geodir_search_form', 'geodir_search_form' );

+add_action('wp_ajax_geodir_search_form', 'geodir_search_form');

+add_action('wp_ajax_nopriv_geodir_search_form', 'geodir_search_form');

 

 /**

  * Check wpml active or not.

@@ -2553,7 +2553,7 @@ 
         }

     }

 }

-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);

 

 /**

  * Duplicate post listing manually after listing saved.

@@ -2591,7 +2591,7 @@ 
 function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {

     global $wpdb;

 

-    $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);

+    $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM ".GEODIR_REVIEW_TABLE." WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);

 

     if (!empty($reviews)) {

         foreach ($reviews as $review) {

@@ -2619,14 +2619,14 @@ 
     global $wpdb, $plugin_prefix;

 

     $post_type = get_post_type($master_post_id);

-    $post_table = $plugin_prefix . $post_type . '_detail';

+    $post_table = $plugin_prefix.$post_type.'_detail';

 

-    $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-    $data = (array)$wpdb->get_row($query);

+    $query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+    $data = (array) $wpdb->get_row($query);

 

-    if ( !empty( $data ) ) {

+    if (!empty($data)) {

         $data['post_id'] = $tr_post_id;

-        unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']);

+        unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category']);

         $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));

         return true;

     }

@@ -2651,7 +2651,7 @@ 
     global $sitepress, $wpdb;

     $post_type = get_post_type($master_post_id);

 

-    remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+    remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

     $taxonomies = get_object_taxonomies($post_type);

     foreach ($taxonomies as $taxonomy) {

@@ -2660,9 +2660,9 @@ 
         

         if ($terms) {

             foreach ($terms as $term) {

-                $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+                $tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

                 

-                if (!is_null($tr_id)){

+                if (!is_null($tr_id)) {

                     // not using get_term - unfiltered get_term

                     $translated_term = $wpdb->get_row($wpdb->prepare("

                         SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -2671,14 +2671,14 @@ 
                 }

             }

 

-            if (!is_taxonomy_hierarchical($taxonomy)){

-                $terms_array = array_unique( array_map( 'intval', $terms_array ) );

+            if (!is_taxonomy_hierarchical($taxonomy)) {

+                $terms_array = array_unique(array_map('intval', $terms_array));

             }

 

             wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

             

-            if ($taxonomy == $post_type . 'category') {

-                geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+            if ($taxonomy == $post_type.'category') {

+                geodir_set_postcat_structure($tr_post_id, $post_type.'category');

             }

         }

     }

@@ -2699,15 +2699,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

     global $wpdb;

 

-    $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+    $query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

     $wpdb->query($query);

 

-    $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+    $query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

     $post_images = $wpdb->get_results($query);

 

-    if ( !empty( $post_images ) ) {

-        foreach ( $post_images as $post_image) {

-            $image_data = (array)$post_image;

+    if (!empty($post_images)) {

+        foreach ($post_images as $post_image) {

+            $image_data = (array) $post_image;

             unset($image_data['ID']);

             $image_data['post_id'] = $tr_post_id;

             

@@ -2740,13 +2740,13 @@ 
 function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {

     global $wpdb, $plugin_prefix, $sitepress;

 

-    $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);

+    $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);

 

     if (empty($review)) {

         return false;

     }

     if ($review['post_id'] != $master_post_id) {

-        $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));

+        $wpdb->query($wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));

         geodir_update_postrating($master_post_id, $post_type);

     }

 

@@ -2757,9 +2757,9 @@ 
     }

 

     $post_type = get_post_type($master_post_id);

-    $post_table = $plugin_prefix . $post_type . '_detail';

+    $post_table = $plugin_prefix.$post_type.'_detail';

 

-    $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);

+    $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM ".$post_table." WHERE post_id = %d", $tr_post_id), ARRAY_A);

     if (empty($translated_post)) {

         return false;

     }

@@ -2777,7 +2777,7 @@ 
         unset($review['id']);

     }

 

-    $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));

+    $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));

 

     if ($tr_review_id) { // update review

         $wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));

@@ -2790,8 +2790,8 @@ 
         geodir_update_postrating($tr_post_id, $post_type);

         

         if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {

-            $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));

-            $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);

+            $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id = %d", array($tr_comment_id)));

+            $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);

 

             if (!empty($likes)) {

                 foreach ($likes as $like) {

@@ -2893,7 +2893,7 @@ 
  * @return bool True if review star disabled, otherwise false.

  */ 

 function geodir_rating_disabled_post_types() {

-	$post_types = get_option( 'geodir_disable_rating_cpt' );

+	$post_types = get_option('geodir_disable_rating_cpt');

 	

 	/**

 	 * Filter the post types array which have rating disabled.

@@ -2902,7 +2902,7 @@ 
 	 *

 	 * @param array $post_types Array of post types which have rating starts disabled.

 	 */

-	return apply_filters( 'geodir_rating_disabled_post_types', $post_types );

+	return apply_filters('geodir_rating_disabled_post_types', $post_types);

 }

 

 /**

@@ -2914,30 +2914,30 @@ 
  * @param bool $taxonomy Whether $post_type is taxonomy or not.

  * @return bool True if review star disabled, otherwise false.

  */ 

-function geodir_cpt_has_rating_disabled( $post_type = '', $taxonomy = false ) {

+function geodir_cpt_has_rating_disabled($post_type = '', $taxonomy = false) {

 	$post_types = geodir_rating_disabled_post_types();

 	

-	if ( empty( $post_types ) ) {

+	if (empty($post_types)) {

 		return false;

 	}

 	

-	if ( is_int( $post_type ) ) {

-		$post_type = get_post_type( $post_type );

+	if (is_int($post_type)) {

+		$post_type = get_post_type($post_type);

 	}

 	

-	if ( $taxonomy && !empty( $post_types ) ) {

+	if ($taxonomy && !empty($post_types)) {

 		$posttypes = array();

 		

-		foreach ( $post_types as $posttype ) {

-			$posttypes[] = $posttype . 'category';

-			$posttypes[] = $posttype . '_tags';

+		foreach ($post_types as $posttype) {

+			$posttypes[] = $posttype.'category';

+			$posttypes[] = $posttype.'_tags';

 		}

 		

 		$post_types = $posttypes;

 	}

 

 	$return = false;

-	if ( $post_type != '' && !empty( $post_types ) && in_array( $post_type, $post_types ) ) {

+	if ($post_type != '' && !empty($post_types) && in_array($post_type, $post_types)) {

 		$return = true;

 	}

 

Indentation +203 added lines, -203 removed lines

@@ -2362,10 +2362,10 @@ 
 	?>

 	<input class="search_text" name="s"

 	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

-	       } else {

-		       echo $default_search_for_text;

-	       } ?>" type="text"

+			   echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+		   } else {

+			   echo $default_search_for_text;

+		   } ?>" type="text"

 	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

 	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

@@ -2492,11 +2492,11 @@ 
  * @return True if WPML is active else False.

  */

 function geodir_is_wpml() {

-    if (function_exists('icl_object_id')) {

-        return true;

-    }

+	if (function_exists('icl_object_id')) {

+		return true;

+	}

 

-    return false;

+	return false;

 }

 

 /**

@@ -2511,9 +2511,9 @@ 
  * @return Language code.

  */

 function geodir_get_language_for_element($element_id, $element_type) {

-    global $sitepress;

+	global $sitepress;

 

-    return $sitepress->get_language_for_element($element_id, $element_type);

+	return $sitepress->get_language_for_element($element_id, $element_type);

 }

 

 /**

@@ -2530,31 +2530,31 @@ 
  *                         Added to fix duplicate transaltion for front end.

  */

 function geodir_icl_make_duplicate($master_post_id, $lang, $postarr, $tr_post_id, $after_save = false) {

-    global $sitepress;

+	global $sitepress;

     

-    $post_type = get_post_type($master_post_id);

-    $icl_ajx_action = !empty($_REQUEST['icl_ajx_action']) && $_REQUEST['icl_ajx_action'] == 'make_duplicates' ? true : false;

-    if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'wpml_duplicate_dashboard' && !empty($_REQUEST['duplicate_post_ids'])) {

-        $icl_ajx_action = true;

-    }

+	$post_type = get_post_type($master_post_id);

+	$icl_ajx_action = !empty($_REQUEST['icl_ajx_action']) && $_REQUEST['icl_ajx_action'] == 'make_duplicates' ? true : false;

+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'wpml_duplicate_dashboard' && !empty($_REQUEST['duplicate_post_ids'])) {

+		$icl_ajx_action = true;

+	}

     

-    if (in_array($post_type, geodir_get_posttypes())) {

-        if ($icl_ajx_action || $after_save) {

-            // Duplicate post details

-            geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

+	if (in_array($post_type, geodir_get_posttypes())) {

+		if ($icl_ajx_action || $after_save) {

+			// Duplicate post details

+			geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

             

-            // Duplicate taxonomies

-            geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

+			// Duplicate taxonomies

+			geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

             

-            // Duplicate post images

-            geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

-        }

+			// Duplicate post images

+			geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

+		}

         

-        // Sync post reviews

-        if ($sitepress->get_setting('sync_comments_on_duplicates')) {

-            geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang);

-        }

-    }

+		// Sync post reviews

+		if ($sitepress->get_setting('sync_comments_on_duplicates')) {

+			geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang);

+		}

+	}

 }

 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

 

@@ -2568,18 +2568,18 @@ 
  * @param array $request_info The post details in an array.

  */

 function geodir_wpml_duplicate_listing($post_id, $request_info) {

-    global $sitepress;

+	global $sitepress;

     

-    $icl_ajx_action = !empty($_REQUEST['icl_ajx_action']) && $_REQUEST['icl_ajx_action'] == 'make_duplicates' ? true : false;

-    if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'wpml_duplicate_dashboard' && !empty($_REQUEST['duplicate_post_ids'])) {

-        $icl_ajx_action = true;

-    }

+	$icl_ajx_action = !empty($_REQUEST['icl_ajx_action']) && $_REQUEST['icl_ajx_action'] == 'make_duplicates' ? true : false;

+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'wpml_duplicate_dashboard' && !empty($_REQUEST['duplicate_post_ids'])) {

+		$icl_ajx_action = true;

+	}

     

-    if (!$icl_ajx_action && in_array(get_post_type($post_id), geodir_get_posttypes()) && $post_duplicates = $sitepress->get_duplicates($post_id)) {

-        foreach ($post_duplicates as $lang => $dup_post_id) {

-            geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true);

-        }

-    }

+	if (!$icl_ajx_action && in_array(get_post_type($post_id), geodir_get_posttypes()) && $post_duplicates = $sitepress->get_duplicates($post_id)) {

+		foreach ($post_duplicates as $lang => $dup_post_id) {

+			geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true);

+		}

+	}

 }

 

 /**

@@ -2595,17 +2595,17 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {

-    global $wpdb;

+	global $wpdb;

 

-    $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);

+	$reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);

 

-    if (!empty($reviews)) {

-        foreach ($reviews as $review) {

-            geodir_wpml_duplicate_post_review($review['comment_id'], $master_post_id, $tr_post_id, $lang);

-        }

-    }

+	if (!empty($reviews)) {

+		foreach ($reviews as $review) {

+			geodir_wpml_duplicate_post_review($review['comment_id'], $master_post_id, $tr_post_id, $lang);

+		}

+	}

 

-    return false;

+	return false;

 }

 

 /**

@@ -2622,22 +2622,22 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($master_post_id);

-    $post_table = $plugin_prefix . $post_type . '_detail';

+	$post_type = get_post_type($master_post_id);

+	$post_table = $plugin_prefix . $post_type . '_detail';

 

-    $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-    $data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

+	$data = (array)$wpdb->get_row($query);

 

-    if ( !empty( $data ) ) {

-        $data['post_id'] = $tr_post_id;

-        unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']);

-        $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));

-        return true;

-    }

+	if ( !empty( $data ) ) {

+		$data['post_id'] = $tr_post_id;

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']);

+		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));

+		return true;

+	}

 

-    return false;

+	return false;

 }

 

 /**

@@ -2654,40 +2654,40 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {

-    global $sitepress, $wpdb;

-    $post_type = get_post_type($master_post_id);

+	global $sitepress, $wpdb;

+	$post_type = get_post_type($master_post_id);

 

-    remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

 

-    $taxonomies = get_object_taxonomies($post_type);

-    foreach ($taxonomies as $taxonomy) {

-        $terms = get_the_terms($master_post_id, $taxonomy);

-        $terms_array = array();

+	$taxonomies = get_object_taxonomies($post_type);

+	foreach ($taxonomies as $taxonomy) {

+		$terms = get_the_terms($master_post_id, $taxonomy);

+		$terms_array = array();

         

-        if ($terms) {

-            foreach ($terms as $term) {

-                $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+		if ($terms) {

+			foreach ($terms as $term) {

+				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

                 

-                if (!is_null($tr_id)){

-                    // not using get_term - unfiltered get_term

-                    $translated_term = $wpdb->get_row($wpdb->prepare("

+				if (!is_null($tr_id)){

+					// not using get_term - unfiltered get_term

+					$translated_term = $wpdb->get_row($wpdb->prepare("

                         SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

 

-                    $terms_array[] = $translated_term->term_id;

-                }

-            }

+					$terms_array[] = $translated_term->term_id;

+				}

+			}

 

-            if (!is_taxonomy_hierarchical($taxonomy)){

-                $terms_array = array_unique( array_map( 'intval', $terms_array ) );

-            }

+			if (!is_taxonomy_hierarchical($taxonomy)){

+				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			}

 

-            wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

+			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

             

-            if ($taxonomy == $post_type . 'category') {

-                geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

-            }

-        }

-    }

+			if ($taxonomy == $post_type . 'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			}

+		}

+	}

 }

 

 /**

@@ -2703,29 +2703,29 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

-    global $wpdb;

+	global $wpdb;

 

-    $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

-    $wpdb->query($query);

+	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$wpdb->query($query);

 

-    $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

-    $post_images = $wpdb->get_results($query);

+	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$post_images = $wpdb->get_results($query);

 

-    if ( !empty( $post_images ) ) {

-        foreach ( $post_images as $post_image) {

-            $image_data = (array)$post_image;

-            unset($image_data['ID']);

-            $image_data['post_id'] = $tr_post_id;

+	if ( !empty( $post_images ) ) {

+		foreach ( $post_images as $post_image) {

+			$image_data = (array)$post_image;

+			unset($image_data['ID']);

+			$image_data['post_id'] = $tr_post_id;

             

-            $wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

+			$wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

             

-            geodir_set_wp_featured_image($tr_post_id);

-        }

+			geodir_set_wp_featured_image($tr_post_id);

+		}

         

-        return true;

-    }

+		return true;

+	}

 

-    return false;

+	return false;

 }

 

 

@@ -2744,73 +2744,73 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {

-    global $wpdb, $plugin_prefix, $sitepress;

-

-    $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);

-

-    if (empty($review)) {

-        return false;

-    }

-    if ($review['post_id'] != $master_post_id) {

-        $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));

-        geodir_update_postrating($master_post_id, $post_type);

-    }

-

-    $tr_comment_id = geodir_wpml_duplicate_comment_exists($tr_post_id, $master_comment_id);

-

-    if (empty($tr_comment_id)) {

-        return false;

-    }

-

-    $post_type = get_post_type($master_post_id);

-    $post_table = $plugin_prefix . $post_type . '_detail';

-

-    $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);

-    if (empty($translated_post)) {

-        return false;

-    }

-

-    $review['comment_id'] = $tr_comment_id;

-    $review['post_id'] = $tr_post_id;

-    $review['post_title'] = $translated_post['post_title'];

-    $review['post_city'] = $translated_post['post_city'];

-    $review['post_region'] = $translated_post['post_region'];

-    $review['post_country'] = $translated_post['post_country'];

-    $review['post_latitude'] = $translated_post['post_latitude'];

-    $review['post_longitude'] = $translated_post['post_longitude'];

-

-    if (isset($review['id'])) {

-        unset($review['id']);

-    }

-

-    $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));

-

-    if ($tr_review_id) { // update review

-        $wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));

-    } else { // insert review

-        $wpdb->insert(GEODIR_REVIEW_TABLE, $review);

-        $tr_review_id = $wpdb->insert_id;

-    }

-

-    if ($tr_post_id) {

-        geodir_update_postrating($tr_post_id, $post_type);

+	global $wpdb, $plugin_prefix, $sitepress;

+

+	$review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);

+

+	if (empty($review)) {

+		return false;

+	}

+	if ($review['post_id'] != $master_post_id) {

+		$wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));

+		geodir_update_postrating($master_post_id, $post_type);

+	}

+

+	$tr_comment_id = geodir_wpml_duplicate_comment_exists($tr_post_id, $master_comment_id);

+

+	if (empty($tr_comment_id)) {

+		return false;

+	}

+

+	$post_type = get_post_type($master_post_id);

+	$post_table = $plugin_prefix . $post_type . '_detail';

+

+	$translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);

+	if (empty($translated_post)) {

+		return false;

+	}

+

+	$review['comment_id'] = $tr_comment_id;

+	$review['post_id'] = $tr_post_id;

+	$review['post_title'] = $translated_post['post_title'];

+	$review['post_city'] = $translated_post['post_city'];

+	$review['post_region'] = $translated_post['post_region'];

+	$review['post_country'] = $translated_post['post_country'];

+	$review['post_latitude'] = $translated_post['post_latitude'];

+	$review['post_longitude'] = $translated_post['post_longitude'];

+

+	if (isset($review['id'])) {

+		unset($review['id']);

+	}

+

+	$tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));

+

+	if ($tr_review_id) { // update review

+		$wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));

+	} else { // insert review

+		$wpdb->insert(GEODIR_REVIEW_TABLE, $review);

+		$tr_review_id = $wpdb->insert_id;

+	}

+

+	if ($tr_post_id) {

+		geodir_update_postrating($tr_post_id, $post_type);

         

-        if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {

-            $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));

-            $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);

-

-            if (!empty($likes)) {

-                foreach ($likes as $like) {

-                    unset($like['like_id']);

-                    $like['comment_id'] = $tr_comment_id;

+		if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {

+			$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));

+			$likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);

+

+			if (!empty($likes)) {

+				foreach ($likes as $like) {

+					unset($like['like_id']);

+					$like['comment_id'] = $tr_comment_id;

                     

-                    $wpdb->insert(GEODIR_COMMENTS_REVIEWS_TABLE, $like);

-                }

-            }

-        }

-    }

+					$wpdb->insert(GEODIR_COMMENTS_REVIEWS_TABLE, $like);

+				}

+			}

+		}

+	}

 

-    return $tr_review_id;

+	return $tr_review_id;

 }

 

 /**

@@ -2825,36 +2825,36 @@ 
  * @param int $comment_id The Comment ID.

  */

 function gepdir_wpml_sync_comment($comment_id) {

-    global $wpdb, $sitepress, $gd_wpml_posttypes;

-

-    if (empty($gd_post_types)) {

-        $gd_wpml_posttypes = geodir_get_posttypes();

-    }

-

-    $comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->comments} WHERE comment_ID=%d", $comment_id), ARRAY_A);

-    if (empty($comment)) {

-        return;

-    }

-

-    $post_id = $comment['comment_post_ID'];

-    $post_type = $post_id ? get_post_type($post_id) : NULL;

-

-    if (!($post_type && in_array($post_type, $gd_wpml_posttypes))) {

-        return;

-    }

-

-    $post_duplicates = $sitepress->get_duplicates($post_id);

-    if (empty($post_duplicates)) {

-        return;

-    }

-

-    foreach ($post_duplicates as $lang => $dup_post_id) {

-        if (empty($comment['comment_parent'])) {

-            geodir_wpml_duplicate_post_review($comment_id, $post_id, $dup_post_id, $lang);

-        }

-    }

+	global $wpdb, $sitepress, $gd_wpml_posttypes;

+

+	if (empty($gd_post_types)) {

+		$gd_wpml_posttypes = geodir_get_posttypes();

+	}

+

+	$comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->comments} WHERE comment_ID=%d", $comment_id), ARRAY_A);

+	if (empty($comment)) {

+		return;

+	}

+

+	$post_id = $comment['comment_post_ID'];

+	$post_type = $post_id ? get_post_type($post_id) : NULL;

+

+	if (!($post_type && in_array($post_type, $gd_wpml_posttypes))) {

+		return;

+	}

+

+	$post_duplicates = $sitepress->get_duplicates($post_id);

+	if (empty($post_duplicates)) {

+		return;

+	}

+

+	foreach ($post_duplicates as $lang => $dup_post_id) {

+		if (empty($comment['comment_parent'])) {

+			geodir_wpml_duplicate_post_review($comment_id, $post_id, $dup_post_id, $lang);

+		}

+	}

     

-    return true;

+	return true;

 }

 

 /**

@@ -2869,11 +2869,11 @@ 
  * @return int The duplicate comment ID.

  */

 function geodir_wpml_duplicate_comment_exists($dup_post_id, $original_cid) {

-    global $wpdb;

+	global $wpdb;

 

-    $duplicate = $wpdb->get_var(

-        $wpdb->prepare(

-            "   SELECT comm.comment_ID

+	$duplicate = $wpdb->get_var(

+		$wpdb->prepare(

+			"   SELECT comm.comment_ID

                 FROM {$wpdb->comments} comm

                 JOIN {$wpdb->commentmeta} cm

                     ON comm.comment_ID = cm.comment_id

@@ -2881,12 +2881,12 @@ 
                     AND cm.meta_key = '_icl_duplicate_of'

                     AND cm.meta_value = %d

                 LIMIT 1",

-            $dup_post_id,

-            $original_cid

-        )

-    );

+			$dup_post_id,

+			$original_cid

+		)

+	);

 

-    return $duplicate;

+	return $duplicate;

 }

 

 /**

geodirectory-functions/map-functions/map_template_tags.php

Braces +8 added lines, -6 removed lines

@@ -225,10 +225,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']) { ?>

@@ -302,8 +303,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';
+				}
 

                 global $gd_session;

                 $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

Indentation +134 added lines, -134 removed lines

@@ -67,77 +67,77 @@ 
  */

 function geodir_draw_map($map_args = array())

 {

-    global $map_canvas_arr;

-    $map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';

-    $map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';

-

-    $default_location = geodir_get_default_location();

-

-    $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-    $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-    $map_default_zoom = 12;

-    // map options default values

-    $width = 950;

-    $height = 450;

-    $child_collapse = '0';

-    $sticky = '';

-    $enable_cat_filters = false;

-    $enable_text_search = false;

-    $enable_post_type_filters = false;

-    $enable_location_filters = false;

-    $enable_jason_on_load = false;

-    $enable_map_direction = false;

-    $enable_marker_cluster = false;

-    $enable_map_resize_button = false;

-    $maptype = 'ROADMAP';

-

-    $geodir_map_options = array(

-        'width' => $width,

-        'height' => $height,

-        'child_collapse' => $child_collapse,

-        'sticky' => $sticky,

-        'enable_map_resize_button' => $enable_map_resize_button,

-        'enable_cat_filters' => $enable_cat_filters,

-        'enable_text_search' => $enable_text_search,

-        'enable_post_type_filters' => $enable_post_type_filters,

-        'enable_location_filters' => $enable_location_filters,

-        'enable_jason_on_load' => $enable_jason_on_load,

-        'enable_map_direction' => $enable_map_direction,

-        'enable_marker_cluster' => $enable_marker_cluster,

-        'ajax_url' => geodir_get_ajax_url(),

-        'map_canvas_name' => $map_canvas_name,

-        'inputText' => __('Title or Keyword', 'geodirectory'),

-        'latitude' => $map_default_lat,

-        'longitude' => $map_default_lng,

-        'zoom' => $map_default_zoom,

-        'scrollwheel' => true,

-        'streetViewControl' => true,

-        'maptype' => $maptype,

-        'showPreview' => '0',

-        'maxZoom' => 21,

-        'autozoom' => true,

-        'bubble_size' => 'small',

-        'token' => '68f48005e256696074e1da9bf9f67f06',

-        'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

-    );

-

-    if (!empty($map_args)) {

-        foreach ($map_args as $map_option_key => $map_option_value) {

-            $geodir_map_options[$map_option_key] = $map_option_value;

-        }

-    }

-

-    if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

-    } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

-    }

-

-    if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

-    } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

-    }

-

-    /**

+	global $map_canvas_arr;

+	$map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';

+	$map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';

+

+	$default_location = geodir_get_default_location();

+

+	$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+	$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+	$map_default_zoom = 12;

+	// map options default values

+	$width = 950;

+	$height = 450;

+	$child_collapse = '0';

+	$sticky = '';

+	$enable_cat_filters = false;

+	$enable_text_search = false;

+	$enable_post_type_filters = false;

+	$enable_location_filters = false;

+	$enable_jason_on_load = false;

+	$enable_map_direction = false;

+	$enable_marker_cluster = false;

+	$enable_map_resize_button = false;

+	$maptype = 'ROADMAP';

+

+	$geodir_map_options = array(

+		'width' => $width,

+		'height' => $height,

+		'child_collapse' => $child_collapse,

+		'sticky' => $sticky,

+		'enable_map_resize_button' => $enable_map_resize_button,

+		'enable_cat_filters' => $enable_cat_filters,

+		'enable_text_search' => $enable_text_search,

+		'enable_post_type_filters' => $enable_post_type_filters,

+		'enable_location_filters' => $enable_location_filters,

+		'enable_jason_on_load' => $enable_jason_on_load,

+		'enable_map_direction' => $enable_map_direction,

+		'enable_marker_cluster' => $enable_marker_cluster,

+		'ajax_url' => geodir_get_ajax_url(),

+		'map_canvas_name' => $map_canvas_name,

+		'inputText' => __('Title or Keyword', 'geodirectory'),

+		'latitude' => $map_default_lat,

+		'longitude' => $map_default_lng,

+		'zoom' => $map_default_zoom,

+		'scrollwheel' => true,

+		'streetViewControl' => true,

+		'maptype' => $maptype,

+		'showPreview' => '0',

+		'maxZoom' => 21,

+		'autozoom' => true,

+		'bubble_size' => 'small',

+		'token' => '68f48005e256696074e1da9bf9f67f06',

+		'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

+	);

+

+	if (!empty($map_args)) {

+		foreach ($map_args as $map_option_key => $map_option_value) {

+			$geodir_map_options[$map_option_key] = $map_option_value;

+		}

+	}

+

+	if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

+	} else {

+		$geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+	}

+

+	if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

+	} else {

+		$geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+	}

+

+	/**

 	 * Filter the options to use in google map.

 	 *

 	 * @since 1.0.0

@@ -146,9 +146,9 @@ 
 	 */

 	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

 

-    $map_canvas_arr[$map_canvas_name] = array();

+	$map_canvas_arr[$map_canvas_name] = array();

 

-    /**

+	/**

 	 * Filter the post types to display data on map.

 	 *

 	 * @since 1.0.0

@@ -166,20 +166,20 @@ 
 	 */

 	$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

+	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);

+		wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

-        if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

-            $map_width = '100%';

-        } else {

-            $map_width = $geodir_map_options['width'];

-        }

+		if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

+			$map_width = '100%';

+		} else {

+			$map_width = $geodir_map_options['width'];

+		}

 

-        /**

+		/**

 		 * Filter the width of map.

 		 *

 		 * @since 1.0.0

@@ -187,7 +187,7 @@ 
 		 * @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">

             <div class="trigger_sticky triggeroff_sticky"></div>

@@ -221,15 +221,15 @@ 
                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

                     <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"/>

                 <?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']) { ?>

                     <div class="gd-input-group gd-get-directions">

@@ -292,8 +292,8 @@ 
                         <select id="travel-units" onchange="calcRoute('<?php echo $map_canvas_name; ?>')">

                             <option value="miles"><?php _e('Miles', 'geodirectory'); ?></option>

                             <option <?php if (get_option('geodir_search_dist_1') == 'km') {

-                                echo 'selected="selected"';

-                            } ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>

+								echo 'selected="selected"';

+							} ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>

                         </select>

                     </div>

 

@@ -305,12 +305,12 @@ 
 				if (empty($geodir_default_map_search_pt))

 					$geodir_default_map_search_pt = 'gd_place';

 

-                global $gd_session;

-                $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

+				global $gd_session;

+				$homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

 

-                if ($homemap_catlist_ptype) {

-                    $geodir_default_map_search_pt = $homemap_catlist_ptype;

-                }

+				if ($homemap_catlist_ptype) {

+					$geodir_default_map_search_pt = $homemap_catlist_ptype;

+				}

 

 				/**

 				 * Filter the post type to retrieve data for map

@@ -323,13 +323,13 @@ 
 				?>

                 <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);

+					$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';

 					}

-                    ?>

+					?>

                     <div

                         class="map-category-listing<?php echo $map_cat_class;?>">

                         <div class="gd-trigger gd-triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div>

@@ -347,7 +347,7 @@ 
                                 <?php if ($geodir_map_options['child_collapse']) { $child_collapse = "1"; ?>

                                     <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"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

@@ -369,17 +369,17 @@ 
                 <!-- map-category-listings-->

 

                 <?php

-                if ($geodir_map_options['enable_location_filters']) {

+				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');

                     

-                    //fix for location/me page

-                    $country = $country != 'me' ? $country : '';

+					//fix for location/me page

+					$country = $country != 'me' ? $country : '';

 					$region = $region != 'me' ? $region : '';

 					$city = $country != 'me' ? $city : '';

-                    $gd_neighbourhood = isset($_REQUEST['gd_neighbourhood']) ? sanitize_text_field($_REQUEST['gd_neighbourhood']) : '';

-                    ?>

+					$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;?>"/>

@@ -390,7 +390,7 @@ 
                     <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"/>

                 <?php }?>

 

@@ -401,9 +401,9 @@ 
 

 

                 <?php if ($geodir_map_options['enable_post_type_filters']) {

-                    $post_types = geodir_get_posttypes('object');

-                    if (count((array)($post_types)) > 1) {

-                        ?>

+					$post_types = geodir_get_posttypes('object');

+					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;">

 

@@ -411,15 +411,15 @@ 
                             <div class="geodir-map-posttype-list"><?php } ?>

                                 <ul class="clearfix place-list">

                                     <?php

-                                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+									$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

 

-                                    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"' : '';

+									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)">' . __($args->labels->name, 'geodirectory') . '</a></li>';

-                                        }

-                                    }

-                                    ?>

+										}

+									}

+									?>

                                 </ul>

                                 <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             </div><?php } ?>

@@ -433,8 +433,8 @@ 
 

                         </div> <!-- map-places-listings-->

                     <?php }

-                } // end of post type filter if

-                ?>

+				} // end of post type filter if

+				?>

 

             </div>

         </div> <!--end of stick trigger container-->

@@ -449,8 +449,8 @@ 
         </script>

         <?php

 

-        if (strpos($geodir_map_options['height'], 'vh')) {

-            ?>

+		if (strpos($geodir_map_options['height'], 'vh')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -472,8 +472,8 @@ 
 

         <?php

 

-        } elseif (strpos($geodir_map_options['height'], 'px')) {

-            ?>

+		} elseif (strpos($geodir_map_options['height'], 'px')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -488,20 +488,20 @@ 
                 }());

             </script>

         <?php

-        }

+		}

 

-        /**

-         * Action that runs after all the map code has been output;

-         *

-         * @since 1.5.3

-         *

-         * @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);

+		/**

+		 * Action that runs after all the map code has been output;

+		 *

+		 * @since 1.5.3

+		 *

+		 * @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);

 

 

-    endif; // Exclude posttypes if end

+	endif; // Exclude posttypes if end

 }

 

 /**

Spacing +63 added lines, -63 removed lines

@@ -129,12 +129,12 @@ 
 

     if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

     } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+        $geodir_map_options['height'] = $geodir_map_options['height'].'px';

     }

 

     if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

     } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+        $geodir_map_options['width'] = $geodir_map_options['width'].'px';

     }

 

     /**

@@ -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,41 +188,41 @@ 
 		 */

 		$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 id="<?php echo $map_canvas_name;?>_map_notloaded"

+                                <div id="<?php echo $map_canvas_name; ?>_map_notloaded"

                                      class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></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'])

@@ -242,7 +242,7 @@ 
                       <div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>

                     </div>

                     <script>

-                        <?php if(geodir_is_page('detail')){?>

+                        <?php if (geodir_is_page('detail')) {?>

                         jQuery(function () {

                             gd_initialize_ac();

                         });

@@ -253,7 +253,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.

@@ -267,7 +267,7 @@ 
                                 

                                 if (window.gdMaps == 'osm') {

                                     window.setTimeout(function() {

-                                        calcRoute('<?php echo $map_canvas_name;?>');

+                                        calcRoute('<?php echo $map_canvas_name; ?>');

                                     }, 1000);

                                 }

                             }

@@ -321,7 +321,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);

@@ -331,12 +331,12 @@ 
 					}

                     ?>

                     <div

-                        class="map-category-listing<?php echo $map_cat_class;?>">

+                        class="map-category-listing<?php echo $map_cat_class; ?>">

                         <div class="gd-trigger gd-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"

@@ -348,11 +348,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="geodir_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>

@@ -380,21 +380,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=""/>

 

@@ -402,10 +402,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 } ?>

@@ -416,7 +416,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)">' . __($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)">'.__($args->labels->name, 'geodirectory').'</a></li>';

                                         }

                                     }

                                     ?>

@@ -441,9 +441,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>

@@ -454,18 +454,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>

@@ -477,13 +477,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>

@@ -498,7 +498,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