GeoDirectory / geodirectory

geodirectory-functions/custom_field_html.php

Indentation +334 added lines, -334 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,21 +68,21 @@ 
 //print_r($field_info);

 

 if (isset($cf['icon']) && strpos($cf['icon'], ' 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 class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>';

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

 }else{

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

+	$field_icon = '<i class="fas 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;

 }

 

 if (isset($field_info->data_type) && $field_info->data_type == 'VARCHAR') {

-    $field_info->data_type = 'XVARCHAR';

+	$field_info->data_type = 'XVARCHAR';

 }

 

 ?>

@@ -92,45 +92,45 @@ 
          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('Click to remove field', 'geodirectory'); ?>"

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

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

         <?php endif;

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

-            ?>

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

+			?>

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

             <i class="fas fa-long-arrow-alt-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?>

@@ -142,37 +142,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Admin title :', 'geodirectory'); ?>

@@ -186,22 +186,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend title :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -214,22 +214,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend description :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -241,23 +241,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

                         <div class="gdcf-tooltip">

@@ -267,29 +267,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Is active :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -300,35 +300,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -339,47 +339,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="fas 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">

@@ -396,22 +396,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

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

@@ -466,38 +466,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 ?>

@@ -510,38 +510,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

 			 *

@@ -550,25 +550,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Is required :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -580,14 +580,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>

@@ -595,21 +595,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

@@ -623,38 +623,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>

 

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

@@ -700,47 +700,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -752,42 +752,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-') !== 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 class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>';

-}else{

+} else {

     $field_icon = '<i class="fas 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;

 }

 

@@ -92,7 +92,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): ?>

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

             <i class="fas fa-long-arrow-alt-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

         }

         ?>

@@ -133,43 +133,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'];

                 }

                 ?>

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

@@ -190,15 +190,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'];

                 }

                 ?>

@@ -218,15 +218,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'];

                 }

                 ?>

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

@@ -246,26 +246,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

+                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fas 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) {

@@ -278,15 +278,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'];

                 }

                 ?>

@@ -298,17 +298,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>

@@ -317,15 +317,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'];

                 }

                 ?>

@@ -337,17 +337,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>

@@ -356,20 +356,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

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

                         <div class="gdcf-tooltip">

                             <?php

                             if ($field_type == 'checkbox') {

@@ -386,12 +386,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>

@@ -400,15 +400,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']);

                 }

                 ?>

@@ -441,18 +441,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]']);

                         }

 

@@ -466,17 +466,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

                             }

                             ?>

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

 

             }

 

@@ -501,10 +501,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); } ?>"/>

 

 

 

@@ -557,15 +557,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'];

                 }

                 ?>

@@ -578,17 +578,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>

 

@@ -598,19 +598,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="fas fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -627,31 +627,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'];

                 }

                 ?>

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

                         <i class="fas 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:"fas 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:"fas 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>

@@ -676,15 +676,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'];

                 }

                 ?>

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

                         <i class="fas 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">

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

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

                         <i class="fas 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>

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

@@ -799,10 +799,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 +38 added lines, -36 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-') !== 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 class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>';

-}else{

+} else{

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

 }

 

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

     $field_type_name = $cf['name'];

-}else{

+} else{

     $field_type_name = $field_type;

 }

 

@@ -147,11 +149,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'];

                 }

                 ?>

@@ -165,11 +167,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'];

                 }

                 ?>

@@ -194,11 +196,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'];

                 }

                 ?>

@@ -222,11 +224,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'];

                 }

                 ?>

@@ -250,11 +252,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'];

                 }

                 ?>

@@ -282,11 +284,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'];

                 }

                 ?>

@@ -321,11 +323,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'];

                 }

                 ?>

@@ -360,11 +362,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'];

                 }

                 ?>

@@ -404,11 +406,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']);

                 }

                 ?>

@@ -448,7 +450,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]']);

                         }

 

@@ -561,11 +563,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'];

                 }

                 ?>

@@ -602,11 +604,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'];

                 }

                 ?>

@@ -647,11 +649,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'];

                 }

                 ?>

@@ -680,11 +682,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'];

                 }

                 ?>

@@ -713,12 +715,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-functions/custom_functions.php

Spacing +718 added lines, -718 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 ( geodir_utf8_strlen( $excerpt ) > $charlength ) {

-		if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( geodir_utf8_strlen( $excerpt_more ) );

-			$subex = geodir_utf8_substr( $excerpt, 0, $excut );

-			if ( $charlength > 0 && geodir_utf8_strlen( $subex ) > $charlength ) {

-				$subex = geodir_utf8_substr( $subex, 0, $charlength );

+	$charlength++;

+	$excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');

+	if (geodir_utf8_strlen($excerpt) > $charlength) {

+		if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (geodir_utf8_strlen($excerpt_more));

+			$subex = geodir_utf8_substr($excerpt, 0, $excut);

+			if ($charlength > 0 && geodir_utf8_strlen($subex) > $charlength) {

+				$subex = geodir_utf8_substr($subex, 0, $charlength);

 			}

 			$out .= $subex;

 		} else {

-			$subex   = geodir_utf8_substr( $excerpt, 0, $charlength - 5 );

-			$exwords = explode( ' ', $subex );

-			$excut   = - ( geodir_utf8_strlen( $exwords[ count( $exwords ) - 1 ] ) );

-			if ( $excut < 0 ) {

-				$out .= geodir_utf8_substr( $subex, 0, $excut );

+			$subex   = geodir_utf8_substr($excerpt, 0, $charlength - 5);

+			$exwords = explode(' ', $subex);

+			$excut   = - (geodir_utf8_strlen($exwords[count($exwords) - 1]));

+			if ($excut < 0) {

+				$out .= geodir_utf8_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 ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( geodir_utf8_strlen( $excerpt_more ) );

-			$out .= geodir_utf8_substr( $excerpt, 0, $excut );

-			$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (geodir_utf8_strlen($excerpt_more));

+			$out .= geodir_utf8_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      = sanitize_text_field($request['inq_name']);

 	$youremail     = sanitize_email($request['inq_email']);

@@ -232,25 +232,25 @@ 
 	$frnd_comments = sanitize_text_field($request['inq_msg']);

 	$pid           = absint($request['pid']);

 

-	$author_id  = '';

+	$author_id = '';

 

-	if ( $pid && 'publish' == get_post_status ( $pid  ) ) {

+	if ($pid && 'publish' == get_post_status($pid)) {

 

-		check_ajax_referer( 'send_inquiry_'.$pid );

+		check_ajax_referer('send_inquiry_'.$pid);

 

 		$p_post = get_post($pid);

 

-		$author_id  = $p_post->post_author;

+		$author_id = $p_post->post_author;

 

-	}else{

+	} else {

 		gd_die();

 	}

 

-	$to_email  = geodir_get_post_meta( $pid, 'geodir_email', true );

-	$to_name   = geodir_get_client_name( $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');

 	}

 

 	/**

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

 	 *

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

@@ -301,12 +301,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

 	}

 

 	/**

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

@@ -340,8 +340,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();

 

 }

@@ -372,11 +372,11 @@ 
  *

  * @deprecated 1.6.26

  */

-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      = sanitize_text_field($request['yourname']);

 	$youremail     = sanitize_email($request['youremail']);

@@ -385,11 +385,11 @@ 
 	$pid           = absint($request['pid']);

 	$to_email      = sanitize_email($request['to_email']);

 	$to_name       = sanitize_text_field($request['to_name']);

-	if ( $pid && 'publish' == get_post_status ( $pid  ) ) {

+	if ($pid && 'publish' == get_post_status($pid)) {

 

-		check_ajax_referer( 'send_to_frnd_'.$pid );

+		check_ajax_referer('send_to_frnd_'.$pid);

 

-	}else{

+	} else {

 		gd_die();

 	}

 

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

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

@@ -449,8 +449,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();

 }

 

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

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

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

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

 		}

 

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

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

 	}

 

 }

@@ -613,63 +613,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 != '') {

 

 		?>

 

@@ -678,9 +678,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; ?>

 

@@ -708,9 +708,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 = '';

 	}

 

@@ -732,34 +732,34 @@ 
  * @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) && geodir_is_page( 'detail' ) ? $post->post_latitude : '';

-		$related_parent_lon   = !empty($post->post_longitude) && geodir_is_page( 'detail' ) ? $post->post_longitude : '';

+		$related_parent_lat   = !empty($post->post_latitude) && geodir_is_page('detail') ? $post->post_latitude : '';

+		$related_parent_lon   = !empty($post->post_longitude) && geodir_is_page('detail') ? $post->post_longitude : '';

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

 		}

 

-		$is_display        = ! empty( $arr_detail_page_tabs['related_listing'] ) && isset( $arr_detail_page_tabs['related_listing']['is_display'] ) ? $arr_detail_page_tabs['related_listing']['is_display'] : false;

+		$is_display        = !empty($arr_detail_page_tabs['related_listing']) && isset($arr_detail_page_tabs['related_listing']['is_display']) ? $arr_detail_page_tabs['related_listing']['is_display'] : false;

 		$origi_post        = $post;

 		$post_type         = '';

 		$post_id           = '';

@@ -767,90 +767,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();

@@ -860,24 +860,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

 			);

@@ -888,7 +888,7 @@ 
 				'terms'    => $category

 			);

 

-			$query_args['tax_query'] = array( $tax_query );

+			$query_args['tax_query'] = array($tax_query);

 

 			global $gridview_columns_widget, $post;

 

@@ -900,21 +900,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_widget = $layout;

 				$layout           = $listing_view_exp[0];

-			} else if ( $layout == 'list' ) {

+			} else if ($layout == 'list') {

 				$gridview_columns_widget = '';

 			}

 			$related_posts = true;

 

 			$related_nearest = false;

-			if ( $list_sort == 'nearest' ) {

+			if ($list_sort == 'nearest') {

 				$related_nearest = true;

 			}

 

@@ -931,14 +931,14 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			$template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'widget-listing-listview' ) );

+			$template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('widget-listing-listview'));

 

 			/**

 			 * Includes related listing listview template.

 			 *

 			 * @since 1.0.0

 			 */

-			include( $template );

+			include($template);

 

 			wp_reset_query();

 			$post            = $origi_post;

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

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

 	}

 

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

 }

 

 /**

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

@@ -1018,7 +1018,7 @@ 
 	 *

 	 * @param string $key Google maps api key.

 	 */

-	return apply_filters( 'geodir_google_api_key', $key );

+	return apply_filters('geodir_google_api_key', $key);

 }

 

 

@@ -1038,20 +1038,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' ) ) && !geodir_disable_yoast_seo_metas() ) {

+	if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {

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

 

@@ -1059,68 +1059,68 @@ 
 

 	$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' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) );

-		} elseif ( is_tag() ) {

-			$meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_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')." ".geodir_utf8_ucfirst(single_cat_title("", false));

+		} elseif (is_tag()) {

+			$meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_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;

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

 	/**

 	 * Filter the Everywhere text in location description.

 	 *

@@ -1128,108 +1128,108 @@ 
 	 *

 	 * @param string $replace_location Everywhere text.

 	 */

-	$replace_location        = apply_filters( 'geodir_location_description_everywhere_text', __( 'Everywhere', 'geodirectory' ) );

+	$replace_location        = apply_filters('geodir_location_description_everywhere_text', __('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' );

-		}

-		$country          = get_query_var( 'gd_country' );

-		$region           = get_query_var( 'gd_region' );

-		$city             = get_query_var( 'gd_city' );

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

 		$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 ) : geodir_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) : geodir_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' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc;

+					$geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false)).'. '.$category_desc;

 				}

-			} else if ( $geodir_is_tag ) {

-				$geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc;

+			} else if ($geodir_is_tag) {

+				$geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_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.

 		 *

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

@@ -1247,20 +1247,20 @@ 
 		 *

 		 * @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' ) );

@@ -1276,20 +1276,20 @@ 
 		}

 	}

 

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

 		 *

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

 	}

 

 }

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

@@ -1340,57 +1340,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'   => ''

 	);

 

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

 

 

 }

@@ -1413,13 +1413,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]);

 			}

 		}

 	}

@@ -1443,66 +1443,66 @@ 
 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');

 

 	$package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

 	$image_limit = '';

 	if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

-		$image_limit = (int)$package_info->image_limit;

+		$image_limit = (int) $package_info->image_limit;

 	}

 

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

+		if (!empty($post_images)) {

 			$count = 1;

-			foreach ( $post_images as $image ) {

+			foreach ($post_images as $image) {

 				if ($image_limit !== '' && $count > $image_limit) {

 					break;

 				}

-				$caption = ( ! empty( $image->caption ) ) ? $image->caption : '';

-				$thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">';

-				$thumb_image .= geodir_show_image( $image, 'thumbnail', true, false );

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

 				$count++;

 			}

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

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

+		if (!empty($post_images)) {

 			$count = 1;

-			foreach ( $post_images as $image ) {

-				if ( $image != '' ) {

+			foreach ($post_images as $image) {

+				if ($image != '') {

 					if ($image_limit !== '' && $count > $image_limit) {

 						break;

 					}

-					$thumb_image .= '<a href="' . $image . '">';

-					$thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false );

+					$thumb_image .= '<a href="'.$image.'">';

+					$thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);

 					$thumb_image .= '</a>';

 					$count++;

 				}

@@ -1555,18 +1555,18 @@ 
 		}

 

 		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;

 		}

 

@@ -1589,37 +1589,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 as 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 as 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="fas fa-bars"></i>

 			<span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>

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

 							 *

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

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

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

 								}

 

 								/**

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

@@ -1716,32 +1716,32 @@ 
 								break;

 							case 'post_video':

 								// some browsers hide $_POST data if used for embeds so we replace with a placeholder

-								if ( $preview ) {

-									if ( $video ) {

-										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fas fa-video\" 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=\"fas fa-video\" 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();

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

 								}

 							}

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

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

 					/**

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

 

@@ -1790,14 +1790,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

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

@@ -1843,31 +1843,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();

 		}

 	}

@@ -1876,13 +1876,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:

@@ -1891,13 +1891,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:

@@ -1908,7 +1908,7 @@ 
 			case 7:

 				$orientation = - 270;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 8:

@@ -1934,31 +1934,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'];

 		}

@@ -1986,7 +1986,7 @@ 
  *

  * @return string Returns the recent reviews html.

  */

-function geodir_get_recent_reviews( $g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false ) {

+function geodir_get_recent_reviews($g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false) {

 	global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session, $table_prefix;

 	$tablecomments = $wpdb->comments;

 	$tableposts    = $wpdb->posts;

@@ -1996,17 +1996,17 @@ 
 	$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));

 		}

 	}

 

@@ -2017,84 +2017,84 @@ 
 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code) {

-			$join .= " JOIN " . $table_prefix . "icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN " . $table_prefix . "icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";

-			$where .= " AND icltr2.language_code = '" . $lang_code . "' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)";

+			$join .= " JOIN ".$table_prefix."icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN ".$table_prefix."icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";

+			$where .= " AND icltr2.language_code = '".$lang_code."' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)";

 		}

 	}

 

-	$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 " . GEODIR_REVIEW_TABLE . " AS r JOIN " . $wpdb->comments . " AS c ON c.comment_ID = r.comment_id JOIN " . $wpdb->posts . " AS p ON p.ID = c.comment_post_ID " . $join . " WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' " . $where . " ORDER BY r.post_date DESC, r.id DESC LIMIT ". $no_comments;

+	$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 ".GEODIR_REVIEW_TABLE." AS r JOIN ".$wpdb->comments." AS c ON c.comment_ID = r.comment_id JOIN ".$wpdb->posts." AS p ON p.ID = c.comment_post_ID ".$join." WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' ".$where." 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");

 		$comment->comment_content      = $comment_extra->comment_content;

 		$comment->comment_author       = $comment_extra->comment_author;

 		$comment->comment_author_email = $comment_extra->comment_author_email;

 

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

 

-		$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 = geodir_utf8_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more;

+		$comment_content_length = strlen($comment_content);

+		if ($comment_content_length > $comment_lenth) {

+			$comment_excerpt = geodir_utf8_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 ) {

+		if ($comment_id) {

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

 					}

 				}

@@ -2105,17 +2105,17 @@ 
 

 			$comments_echo .= '<span class="geodir_reviewer_content">';

 			$author_link = apply_filters('geodir_reviewer_content_author_link', true);

-			if ( $comment->user_id && $author_link ) {

-				$comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">';

+			if ($comment->user_id && $author_link) {

+				$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 && $author_link ) {

+			$comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> ';

+			if ($comment->user_id && $author_link) {

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

 

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

 			}

 		}

 	}

@@ -2169,14 +2169,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

 }

@@ -2193,10 +2193,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

 }

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

@@ -2250,44 +2250,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 = array() ) {

+add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);

+function geodir_output_pinpoint_html_listings($post_id, $post = array()) {

 	global $wp_query;

 

 	$show_pin_point = $wp_query->is_main_query();

 

-	if ( ! empty( $post ) && ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {

-		$term_icon_url = geodir_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($post) && !empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {

+		$term_icon_url = geodir_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="if(typeof openMarker=='function'){openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"

 		   onmouseover="if(typeof animate_marker=='function'){animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"

-		   onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>

+		   onmouseout="if(typeof stop_marker_animation=='function'){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="fas 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');

 	}

 

 	/**

@@ -2299,78 +2299,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( geodir_utf8_ucfirst( $info->labels->name ), 'geodirectory' ); ?></option>

+					} ?>><?php _e(geodir_utf8_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"  />';

 	}

 }

@@ -2378,27 +2378,27 @@ 
 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'] ) != '' ) {

-		       $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

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

+		       $search_term = esc_attr(stripslashes_deep($_REQUEST['s']));

 		       echo $search_term;

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

 	}

 }

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

 	}

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

 

 

 	/**

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

 	 *

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

 	 *

@@ -2457,10 +2457,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');

@@ -2468,30 +2468,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();

 	}

 

@@ -2499,7 +2499,7 @@ 
 	return $geodir_search_post_type;

 }

 

-function geodir_search_form(){

+function geodir_search_form() {

 

 	geodir_get_search_post_type();

 

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

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

@@ -2608,7 +2608,7 @@ 
 		foreach ($post_duplicates as $lang => $dup_post_id) {

 			geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true);

 		}

-		do_action( 'geodir_wpml_listing_duplicated', $post_id, $request_info );

+		do_action('geodir_wpml_listing_duplicated', $post_id, $request_info);

 	}

 }

 

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

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

-		$data = apply_filters( 'geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang );

+	if (!empty($data)) {

+		$data = apply_filters('geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang);

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

 	}

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

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

@@ -2709,14 +2709,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');

 			}

 		}

 	}

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

 

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

 	}

 

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

 	}

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

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

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

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

 }

 

 /**

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

 	}

 

@@ -2990,7 +2990,7 @@ 
  * @return bool True if Yoast SEO disabled on GD pages.

  */

 function geodir_disable_yoast_seo_metas() {

-	return (bool)get_option( 'geodir_disable_yoast_meta' );

+	return (bool) get_option('geodir_disable_yoast_meta');

 }

 

 /**

@@ -3001,30 +3001,30 @@ 
  * @param int $post_id The post ID.

  * @return bool True if allowed.

  */

-function geodir_wpml_allowed_to_duplicate( $post_id ) {

+function geodir_wpml_allowed_to_duplicate($post_id) {

 	$allowed = false;

 

-	if ( !geodir_is_wpml() || empty( $post_id ) ) {

+	if (!geodir_is_wpml() || empty($post_id)) {

 		return $allowed;

 	}

 

-	$user_id = (int)get_current_user_id();

+	$user_id = (int) get_current_user_id();

 

-	if ( empty( $user_id ) ) {

+	if (empty($user_id)) {

 		return $allowed;

 	}

 

-	$post_type = get_post_type( $post_id );

-	if ( !geodir_wpml_is_post_type_translated( $post_type ) || get_post_meta( $post_id, '_icl_lang_duplicate_of', true ) ) {

+	$post_type = get_post_type($post_id);

+	if (!geodir_wpml_is_post_type_translated($post_type) || get_post_meta($post_id, '_icl_lang_duplicate_of', true)) {

 		return $allowed;

 	}

 

-	if ( geodir_listing_belong_to_current_user( $post_id ) ) {

+	if (geodir_listing_belong_to_current_user($post_id)) {

 		$allowed = true;

 	}

 

-	$disable_cpts = get_option( 'geodir_wpml_disable_duplicate' );

-	if ( $allowed && !empty( $disable_cpts ) && in_array( $post_type, $disable_cpts ) ) {

+	$disable_cpts = get_option('geodir_wpml_disable_duplicate');

+	if ($allowed && !empty($disable_cpts) && in_array($post_type, $disable_cpts)) {

 		$allowed = false;

 	}

 

@@ -3034,7 +3034,7 @@ 
 	 * @param bool $allowed True if allowed.

 	 * @param int $post_id The post ID.

 	 */

-	return apply_filters( 'geodir_wpml_allowed_to_duplicate', $allowed, $post_id );

+	return apply_filters('geodir_wpml_allowed_to_duplicate', $allowed, $post_id);

 }

 

 /**

@@ -3049,61 +3049,61 @@ 
  * @param string $content_html The output html of the geodir_edit_post_link() function.

  * @return string Filtered html of the geodir_edit_post_link() function.

  */

-function geodir_wpml_frontend_duplicate_listing( $content_html ) {

+function geodir_wpml_frontend_duplicate_listing($content_html) {

 	global $post, $preview, $sitepress;

 

-	if ( !empty( $post->ID ) && !$preview && geodir_is_page( 'detail' ) && geodir_wpml_allowed_to_duplicate( $post->ID ) ) {

+	if (!empty($post->ID) && !$preview && geodir_is_page('detail') && geodir_wpml_allowed_to_duplicate($post->ID)) {

 		$post_id = $post->ID;

-		$element_type = 'post_' . get_post_type( $post_id );

-		$original_post_id = $sitepress->get_original_element_id( $post_id, $element_type );

+		$element_type = 'post_'.get_post_type($post_id);

+		$original_post_id = $sitepress->get_original_element_id($post_id, $element_type);

 

-		if ( $original_post_id == $post_id ) {

+		if ($original_post_id == $post_id) {

 			$wpml_languages = $sitepress->get_active_languages();

-			$post_language = $sitepress->get_language_for_element( $post_id, $element_type );

+			$post_language = $sitepress->get_language_for_element($post_id, $element_type);

 

-			if ( !empty( $wpml_languages ) && isset( $wpml_languages[ $post_language ] ) ) {

-				unset( $wpml_languages[ $post_language ] );

+			if (!empty($wpml_languages) && isset($wpml_languages[$post_language])) {

+				unset($wpml_languages[$post_language]);

 			}

 

-			if ( !empty( $wpml_languages ) ) {

-				$trid  = $sitepress->get_element_trid( $post_id, $element_type );

-				$element_translations = $sitepress->get_element_translations( $trid, $element_type );

-				$duplicates = $sitepress->get_duplicates( $post_id );

+			if (!empty($wpml_languages)) {

+				$trid = $sitepress->get_element_trid($post_id, $element_type);

+				$element_translations = $sitepress->get_element_translations($trid, $element_type);

+				$duplicates = $sitepress->get_duplicates($post_id);

 

-				$wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">' . __( 'Translate Listing', 'geodirectory' ) . '</h3>';

+				$wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">'.__('Translate Listing', 'geodirectory').'</h3>';

 				$wpml_content .= '<table class="gd-duplicate-table" style="width:100%;margin:0"><tbody>';

-				$wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">' . __( 'Language', 'geodirectory' ) . '</th><th style="width:25px;"></th><th style="width:5em;text-align:center">' . __( 'Translate', 'geodirectory' ) . '</th></tr>';

+				$wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">'.__('Language', 'geodirectory').'</th><th style="width:25px;"></th><th style="width:5em;text-align:center">'.__('Translate', 'geodirectory').'</th></tr>';

 

 				$needs_translation = false;

 

-				foreach ( $wpml_languages as $lang_code => $lang ) {

+				foreach ($wpml_languages as $lang_code => $lang) {

 					$duplicates_text = '';

 					$translated = false;

 

-					if ( !empty( $element_translations ) && isset( $element_translations[$lang_code] ) ) {

+					if (!empty($element_translations) && isset($element_translations[$lang_code])) {

 						$translated = true;

 

-						if ( !empty( $duplicates ) && isset( $duplicates[$lang_code] ) ) {

-							$duplicates_text = ' ' . __( '(duplicate)', 'geodirectory' );

+						if (!empty($duplicates) && isset($duplicates[$lang_code])) {

+							$duplicates_text = ' '.__('(duplicate)', 'geodirectory');

 						}

 					} else {

 						$needs_translation = true;

 					}

 

-					$wpml_content .= '<tr><td style="padding:4px">' . $lang['english_name'] . $duplicates_text . '</td><td>&nbsp;</td><td style="text-align:center;">';

+					$wpml_content .= '<tr><td style="padding:4px">'.$lang['english_name'].$duplicates_text.'</td><td>&nbsp;</td><td style="text-align:center;">';

 

-					if ( $translated ) {

+					if ($translated) {

 						$wpml_content .= '<i class="fas fa-check" style="color:orange"></i>';

 					} else {

-						$wpml_content .= '<input name="gd_icl_dup[]" value="' . $lang_code . '" title="' . esc_attr__( 'Create duplicate', 'geodirectory' ) . '" type="checkbox">';

+						$wpml_content .= '<input name="gd_icl_dup[]" value="'.$lang_code.'" title="'.esc_attr__('Create duplicate', 'geodirectory').'" type="checkbox">';

 					}

 

 					$wpml_content .= '</td></tr>';

 				}

 

-				if ( $needs_translation ) {

-					$nonce = wp_create_nonce( 'geodir_duplicate_nonce' );

-					$wpml_content .= '<tr><td>&nbsp;</td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fas fa-spin fa-sync"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="' . esc_attr( $nonce ) . '" data-post-id="' . $post_id . '" id="gd_make_duplicates" class="button-secondary">' . __( 'Duplicate', 'geodirectory' ) . '</button></td></tr>';

+				if ($needs_translation) {

+					$nonce = wp_create_nonce('geodir_duplicate_nonce');

+					$wpml_content .= '<tr><td>&nbsp;</td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fas fa-spin fa-sync"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="'.esc_attr($nonce).'" data-post-id="'.$post_id.'" id="gd_make_duplicates" class="button-secondary">'.__('Duplicate', 'geodirectory').'</button></td></tr>';

 				}

 

 				$wpml_content .= '</tbody></table>';

@@ -3125,12 +3125,12 @@ 
  * @param array $settings GD design settings array.

  * @return array Filtered GD design settings array..

  */

-function geodir_wpml_duplicate_settings( $settings = array() ) {

+function geodir_wpml_duplicate_settings($settings = array()) {

 	$new_settings = array();

 

-	foreach ( $settings as $key => $setting ) {

+	foreach ($settings as $key => $setting) {

 

-		if ( isset( $setting['type'] ) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings' ) {

+		if (isset($setting['type']) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings') {

 			$new_settings[] = array(

 				'name' => __('Disable WPML duplicate translation', 'geodirectory'),

 				'desc' => __('Select post types to disable front end WPML duplicate translation. For selected post types the WPML duplicate option will be disabled from listing detail page sidebar.', 'geodirectory'),

@@ -3158,12 +3158,12 @@ 
  * @param string $taxonomy name/slug of a taxonomy.

  * @return bool true if the taxonomy is currently set to being translatable in WPML.

  */

-function geodir_wpml_is_taxonomy_translated( $taxonomy ) {

-	if ( empty( $taxonomy ) || !geodir_is_wpml() || !function_exists( 'is_taxonomy_translated' ) ) {

+function geodir_wpml_is_taxonomy_translated($taxonomy) {

+	if (empty($taxonomy) || !geodir_is_wpml() || !function_exists('is_taxonomy_translated')) {

 		return false;

 	}

 

-	if ( is_taxonomy_translated( $taxonomy ) ) {

+	if (is_taxonomy_translated($taxonomy)) {

 		return true;

 	}

 

@@ -3178,12 +3178,12 @@ 
  * @param string $post_type name/slug of a post_type.

  * @return bool true if the post_type is currently set to being translatable in WPML.

  */

-function geodir_wpml_is_post_type_translated( $post_type ) {

-	if ( empty( $post_type ) || !geodir_is_wpml() || !function_exists( 'is_post_type_translated' ) ) {

+function geodir_wpml_is_post_type_translated($post_type) {

+	if (empty($post_type) || !geodir_is_wpml() || !function_exists('is_post_type_translated')) {

 		return false;

 	}

 

-	if ( is_post_type_translated( $post_type ) ) {

+	if (is_post_type_translated($post_type)) {

 		return true;

 	}

 

@@ -3205,12 +3205,12 @@ 
  *

  * @return int|NULL

  */

-function geodir_wpml_object_id( $element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null ) {

-	if ( geodir_is_wpml() ) {

-		if ( function_exists( 'wpml_object_id_filter' ) ) {

-			return apply_filters( 'wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code );

+function geodir_wpml_object_id($element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null) {

+	if (geodir_is_wpml()) {

+		if (function_exists('wpml_object_id_filter')) {

+			return apply_filters('wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code);

 		} else {

-			return icl_object_id( $element_id, $element_type, $return_original_if_missing, $ulanguage_code );

+			return icl_object_id($element_id, $element_type, $return_original_if_missing, $ulanguage_code);

 		}

 	}

 

Braces +7 added lines, -7 removed lines

@@ -242,7 +242,7 @@ 
 

 		$author_id  = $p_post->post_author;

 

-	}else{

+	} else{

 		gd_die();

 	}

 

@@ -389,7 +389,7 @@ 
 

 		check_ajax_referer( 'send_to_frnd_'.$pid );

 

-	}else{

+	} else{

 		gd_die();

 	}

 

@@ -2283,7 +2283,7 @@ 
 

 	if ( $new_style ) {

 		$default_search_button_label = '<i class="fas 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' ) {

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

@@ -2360,17 +2360,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"  />';

 	}

 }

geodirectory-functions/template_functions.php

Spacing +57 added lines, -57 removed lines

@@ -68,7 +68,7 @@ 
                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

                     wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

                 } else {

-                    wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+                    wp_redirect(trailingslashit(get_site_url()).$pagename.'/?listing_type='.$post_type);

                 }

                 gd_die();

             }

@@ -126,21 +126,21 @@ 
         case 'listing-listview':

             $template = locate_template(array("geodirectory/listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/listing-listview.php';

             }

             return $template;

             break;

         case 'widget-listing-listview':

             $template = locate_template(array("geodirectory/widget-listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/widget-listing-listview.php';

             }

             return $template;

             break;

 		case 'email-message':

             $template = locate_template(array("geodirectory/email-message.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/email-message.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/email-message.php';

             }

             return $template;

             break;

@@ -198,7 +198,7 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-signup.php';

 

         /**

          * Filter the signup template path.

@@ -212,11 +212,11 @@ 
     if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

         if (!geodir_is_default_location_set()) {

             global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>');

 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

             /**

              * Filter the information template path.

              *

@@ -228,10 +228,10 @@ 
         // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

             /// WPML

-            if (geodir_wpml_is_post_type_translated(get_post_type((int)$_GET['pid'])) && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

+            if (geodir_wpml_is_post_type_translated(get_post_type((int) $_GET['pid'])) && $duplicate_of = wpml_get_master_post_from_duplicate((int) $_GET['pid'])) {

                 global $sitepress;

                 

-                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

+                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_'.get_post_type($duplicate_of));

                 $sitepress->switch_lang($lang_of_duplicate, true);

         

                 $redirect_to = get_permalink(geodir_add_listing_page_id());

@@ -250,7 +250,7 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

                 /**

                  * Filter the information template path.

                  *

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

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/add-listing.php';

         /**

          * Filter the add listing template path.

          *

@@ -289,7 +289,7 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the preview template path.

          *

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

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-success.php';

         /**

          * Filter the success template path.

          *

@@ -320,7 +320,7 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the detail template path.

          *

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

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-listing.php';

         /**

          * Filter the listing template path.

          *

@@ -350,7 +350,7 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-search.php';

         /**

          * Filter the search template path.

          *

@@ -365,7 +365,7 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-author.php';

         /**

          * Filter the author template path.

          *

@@ -376,7 +376,7 @@ 
 

     }

 

-    if ( geodir_is_page('home') || geodir_is_page('location')) {

+    if (geodir_is_page('home') || geodir_is_page('location')) {

 

         global $post, $wp_query;

 

@@ -386,7 +386,7 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-home.php';

             /**

              * Filter the home page template path.

              *

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

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-location.php';

             /**

              * Filter the location template path.

              *

@@ -441,7 +441,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -449,14 +449,14 @@ 
         $template_name = "{$slug}.php";

     }

 

-    if (!locate_template(array("geodirectory/" . $template_name))) :

+    if (!locate_template(array("geodirectory/".$template_name))) :

         /**

          * Filter the template part with slug and name.

          *

          * @since 1.0.0

          * @param string $template_name The template name.

          */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path().'/geodirectory-templates/'.$template_name);

         /**

          * Includes the template part with slug and name.

          *

@@ -464,7 +464,7 @@ 
          */

         include($template);

     else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+        locate_template(array("geodirectory/".$template_name), true, false);

     endif;

 

 }

@@ -492,9 +492,9 @@ 
     $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

     if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

+        $append_class = 'gd-post-'.$gdp_post_type;

         $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

+        $class = $class != '' ? $class.' '.$append_class : $append_class;

     }

 

     return $class;

@@ -526,7 +526,7 @@ 
 	 */

 	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+	echo '<li class="no-listing">'.$message.'</li>';

 }

 

 /**

@@ -555,7 +555,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -620,7 +620,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option '.selected((int) ($i + 1), (int) $default, false).' value="'.(int) ($i + 1).'">'.$text.'</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -649,14 +649,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fas fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fas fa-star-half-alt gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="far fa-star gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fas fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fas fa-star-half-alt gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="far fa-star gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

@@ -675,48 +675,48 @@ 
 		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

 		if ($full_color != '#757575') {

 			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

-			.gd-star-rating svg.svg-inline--fa {color:' . stripslashes($full_color) . '!important;}</style>';

+			.gd-star-rating svg.svg-inline--fa {color:' . stripslashes($full_color).'!important;}</style>';

 		}

 	}

 }

 

-function geodir_parse_shortcodes( $content, $shortcode, $first = true ) {

-    if ( empty( $content ) || empty( $shortcode ) ) {

+function geodir_parse_shortcodes($content, $shortcode, $first = true) {

+    if (empty($content) || empty($shortcode)) {

         return array();

     }

     

-    if ( false === strpos( $content, '[' ) ) {

+    if (false === strpos($content, '[')) {

         return array();

     }

 

-    if ( ! has_shortcode( $content, $shortcode ) ) {

+    if (!has_shortcode($content, $shortcode)) {

         return array();

     }

 

     $shortcodes = array();

-    if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) ) {

-        foreach ( $matches as $match ) {

-            if ( $shortcode === $match[2] ) {

-                $shortcode_attrs = shortcode_parse_atts( $match[3] );

-                if ( ! is_array( $shortcode_attrs ) ) {

+    if (preg_match_all('/'.get_shortcode_regex().'/s', $content, $matches, PREG_SET_ORDER)) {

+        foreach ($matches as $match) {

+            if ($shortcode === $match[2]) {

+                $shortcode_attrs = shortcode_parse_atts($match[3]);

+                if (!is_array($shortcode_attrs)) {

                     $shortcode_attrs = array();

                 }

                 $shortcode_attrs['shortcode_tag'] = $shortcode;

-                if ( !empty( $match[5] ) ) {

+                if (!empty($match[5])) {

                     $shortcode_attrs['shortcode_content'] = $match[5];

                 }

                 $shortcodes[] = $shortcode_attrs;

-                if ( $first === true ) {

+                if ($first === true) {

                     break;

                 }

             }

         }

-        if ( $first === true && !empty( $shortcodes ) ) {

+        if ($first === true && !empty($shortcodes)) {

             $shortcodes = $shortcodes[0];

         }

     }

 

-    return apply_filters( 'geodir_parse_shortcodes', $shortcodes, $content, $shortcode, $first );

+    return apply_filters('geodir_parse_shortcodes', $shortcodes, $content, $shortcode, $first);

 }

 

 /**

@@ -730,14 +730,14 @@ 
  * @param array $email_vars     The email parameters.

  * @return string Filtered email message.

  */

-function geodir_email_wrap_message( $message, $email_type = '', $email_vars = array() ) {

+function geodir_email_wrap_message($message, $email_type = '', $email_vars = array()) {

 	global $geodir_email_content, $geodir_email_type, $geodir_email_vars;

 

 	$geodir_email_content = $message;

 	$geodir_email_type = $email_type;

 	$geodir_email_vars = $email_vars;

 

-	$template = apply_filters( "geodir_template_part-email-content", geodir_locate_template( 'email-message' ) );

+	$template = apply_filters("geodir_template_part-email-content", geodir_locate_template('email-message'));

 

 	ob_start();

 	/**

@@ -745,7 +745,7 @@ 
 	 *

 	 * @since 1.6.26

 	 */

-	include( $template );

+	include($template);

 

 	$content = ob_get_clean();

 

@@ -770,7 +770,7 @@ 
  * @param string $post_id       The post ID.

  * @param string $user_id       The user ID.

  */

-function geodir_email_wrap_user_message( $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ) {

+function geodir_email_wrap_user_message($message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id) {

 	$email_vars = array();

 	$email_vars['message_type'] = $message_type;

 	$email_vars['fromEmail'] = $fromEmail;

@@ -783,9 +783,9 @@ 
 	$email_vars['post_id'] = $post_id;

 	$email_vars['user_id'] = $user_id;

 

-	return geodir_email_wrap_message( $message, $message_type, $email_vars );

+	return geodir_email_wrap_message($message, $message_type, $email_vars);

 }

-add_filter( 'geodir_sendEmail_message', 'geodir_email_wrap_user_message', 10, 11 );

+add_filter('geodir_sendEmail_message', 'geodir_email_wrap_user_message', 10, 11);

 

 /**

  * Filter the admin email message.

@@ -799,13 +799,13 @@ 
  * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

  * @param string $custom_1     Custom data to be sent.

  */

-function geodir_email_wrap_admin_message( $message, $page_id, $user_id, $message_type, $custom_1 ) {

+function geodir_email_wrap_admin_message($message, $page_id, $user_id, $message_type, $custom_1) {

 	$email_vars = array();

 	$email_vars['message_type'] = $message_type;

 	$email_vars['page_id'] = $page_id;

 	$email_vars['user_id'] = $user_id;

 	$email_vars['custom_1'] = $custom_1;

 

-	return geodir_email_wrap_message( $message, $message_type, $email_vars );

+	return geodir_email_wrap_message($message, $message_type, $email_vars);

 }

-add_filter( 'geodir_adminEmail_message', 'geodir_email_wrap_admin_message', 10, 5 );
\ No newline at end of file
+add_filter('geodir_adminEmail_message', 'geodir_email_wrap_admin_message', 10, 5);
\ No newline at end of file

geodirectory-functions/custom_fields_output_functions.php

Indentation +1554 added lines, -1554 removed lines

@@ -21,84 +21,84 @@ 
  */
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
-        /**
-         * Filter the checkbox html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the checkbox html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ( (int) $post->{$html_var} == 1 ):
-
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
-            else:
-                $html_val = __( 'No', 'geodirectory' );
-            endif;
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+		/**
+		 * Filter the checkbox html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the checkbox html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ( (int) $post->{$html_var} == 1 ):
+
+			if ( $post->{$html_var} == '1' ):
+				$html_val = __( 'Yes', 'geodirectory' );
+			else:
+				$html_val = __( 'No', 'geodirectory' );
+			endif;
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
 
@@ -115,71 +115,71 @@ 
  */
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
-        /**
-         * Filter the fieldset html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the fieldset html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $field_set_start;
-        $fieldset_class = 'fieldset-'.sanitize_html_class(sanitize_title_with_dashes($cf['site_title']));
-
-        if ($field_set_start == 1) {
-            $html = '';
-        } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
-            //$field_set_start = 1;
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+		/**
+		 * Filter the fieldset html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the fieldset html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $field_set_start;
+		$fieldset_class = 'fieldset-'.sanitize_html_class(sanitize_title_with_dashes($cf['site_title']));
+
+		if ($field_set_start == 1) {
+			$html = '';
+		} else {
+			$html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+			//$field_set_start = 1;
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
 
@@ -196,106 +196,106 @@ 
  */
 function geodir_cf_url($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
-        /**
-         * Filter the url html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the url html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-
-                if ($cf['name'] == 'geodir_facebook') {
-                    $field_icon_af = '<i class="fab fa-facebook-square"></i>';
-                } elseif ($cf['name'] == 'geodir_twitter') {
-                    $field_icon_af = '<i class="fab fa-twitter-square"></i>';
-                } else {
-                    $field_icon_af = '<i class="fas fa-link"></i>';
-                }
-
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
-
-
-            $website = !empty($a_url['url']) ? $a_url['url'] : '';
-            $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
-            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
-
-
-
-            // all search engines that use the nofollow value exclude links that use it from their ranking calculation
-            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
-            /**
-             * Filter custom field website name.
-             *
-             * @since 1.0.0
-             *
-             * @param string $title Website Title.
-             * @param string $website Website URL.
-             * @param int $post->ID Post ID.
-             */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+		/**
+		 * Filter the url html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the url html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+
+				if ($cf['name'] == 'geodir_facebook') {
+					$field_icon_af = '<i class="fab fa-facebook-square"></i>';
+				} elseif ($cf['name'] == 'geodir_twitter') {
+					$field_icon_af = '<i class="fab fa-twitter-square"></i>';
+				} else {
+					$field_icon_af = '<i class="fas fa-link"></i>';
+				}
+
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
+
+
+			$website = !empty($a_url['url']) ? $a_url['url'] : '';
+			$title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
+			if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+			$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
+
+
+
+			// all search engines that use the nofollow value exclude links that use it from their ranking calculation
+			$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
+			/**
+			 * Filter custom field website name.
+			 *
+			 * @since 1.0.0
+			 *
+			 * @param string $title Website Title.
+			 * @param string $website Website URL.
+			 * @param int $post->ID Post ID.
+			 */
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
 
@@ -312,80 +312,80 @@ 
  */
 function geodir_cf_phone($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
-        /**
-         * Filter the phone html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the phone html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fas fa-phone"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+		/**
+		 * Filter the phone html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the phone html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fas fa-phone"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
+					$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
 
@@ -402,85 +402,85 @@ 
  */
 function geodir_cf_time($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
-        /**
-         * Filter the time html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the time html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $value = '';
-            if ($post->{$cf['htmlvar_name']} != '')
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
-                $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="far fa-clock"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+		/**
+		 * Filter the time html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the time html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$value = '';
+			if ($post->{$cf['htmlvar_name']} != '')
+				//$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
+				$value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="far fa-clock"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
 
@@ -496,111 +496,111 @@ 
  * @return string The html to output for the custom field.
  */
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
-    global $preview;
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
-        /**
-         * Filter the datepicker html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the datepicker html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $date_format = geodir_default_date_format();
-            if ($cf['extra_fields'] != '') {
-                $date_format = stripslashes_deep(unserialize($cf['extra_fields']));
-                $date_format = $date_format['date_format'];
-            }
-            // check if we need to change the format or not
-            $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
-
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
-
-                $date_format = str_replace($search, $replace, $date_format);
-
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
-                $post_htmlvar_value = $post->{$cf['htmlvar_name']};
-            }
-
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
-                $date_format_from = $preview ? $date_format : 'Y-m-d';
-                $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
-                //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
-                //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
-                return '';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fas fa-calendar-alt"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	global $preview;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+		/**
+		 * Filter the datepicker html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the datepicker html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$date_format = geodir_default_date_format();
+			if ($cf['extra_fields'] != '') {
+				$date_format = stripslashes_deep(unserialize($cf['extra_fields']));
+				$date_format = $date_format['date_format'];
+			}
+			// check if we need to change the format or not
+			$date_format_len = strlen(str_replace(' ', '', $date_format));
+			if($date_format_len>5){// if greater then 4 then it's the old style format.
+
+				$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+				$replace = array('d','j','l','m','n','F','Y');//PHP date format
+
+				$date_format = str_replace($search, $replace, $date_format);
+
+				$post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+			}else{
+				$post_htmlvar_value = $post->{$cf['htmlvar_name']};
+			}
+
+			if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+				$date_format_from = $preview ? $date_format : 'Y-m-d';
+				$value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
+				//$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
+				//$value = date_i18n($date_format, strtotime($post_htmlvar_value));
+			}else{
+				return '';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fas fa-calendar-alt"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
 
@@ -617,97 +617,97 @@ 
  */
 function geodir_cf_text($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
-        /**
-         * Filter the text html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the text html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+		/**
+		 * Filter the text html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the text html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
 
     
 
-    // If not html then we run the standard output.
-    if(empty($html)){
+	// If not html then we run the standard output.
+	if(empty($html)){
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
 
-            $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
+			$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="far fa-clock"></i>' : "";
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="far fa-clock"></i>' : "";
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
 
-            $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
-                $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
-                }
-            }
+			$value = $post->{$cf['htmlvar_name']};
+			if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+				$extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
+				if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
+					if(!ceil($value) > 0){return '';}// dont output blank prices
+					$value = geodir_currency_format_number($value,$cf);
+				}
+			}
 
 
-            $html .= $value;
-            $html .= '</div>';
+			$html .= $value;
+			$html .= '</div>';
 
-        endif;
+		endif;
 
-    }
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
 
@@ -724,98 +724,98 @@ 
  */
 function geodir_cf_radio($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
-        /**
-         * Filter the radio html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the radio html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
-
-            if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
-                $html_val = __('No', 'geodirectory');
-            } else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
-                $html_val = __('Yes', 'geodirectory');
-            } else {
-                if (!empty($cf['option_values'])) {
-                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                    if (!empty($cf_option_values)) {
-                        foreach ($cf_option_values as $cf_option_value) {
-                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                                $html_val = $cf_option_value['label'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+		/**
+		 * Filter the radio html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the radio html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		$html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
+
+			if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
+				$html_val = __('No', 'geodirectory');
+			} else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
+				$html_val = __('Yes', 'geodirectory');
+			} else {
+				if (!empty($cf['option_values'])) {
+					$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+					if (!empty($cf_option_values)) {
+						foreach ($cf_option_values as $cf_option_value) {
+							if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+								$html_val = $cf_option_value['label'];
+							}
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
 
@@ -833,92 +833,92 @@ 
  */
 function geodir_cf_select($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
-        /**
-         * Filter the select html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the select html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-            $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
-
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                            $field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+		/**
+		 * Filter the select html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the select html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+			$field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
+
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+							$field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $field_value . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
 
@@ -935,117 +935,117 @@ 
  */
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
-        /**
-         * Filter the multiselect html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the multiselect html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            if (is_array($post->{$cf['htmlvar_name']})) {
-                $post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
-
-            if(is_array($field_values)){
-                $field_values = array_map('trim', $field_values);
-            }
-
-            $option_values = array();
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
-                            $option_values[] = $cf_option_value['label'];
-                        }
-                    }
-                }
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
-
-            if (count($option_values) > 1) {
-                $html .= '<ul>';
-
-                foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
-                }
-
-                $html .= '</ul>';
-            } else {
-                $html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
-            }
-
-            $html .= '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+		/**
+		 * Filter the multiselect html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the multiselect html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			if (is_array($post->{$cf['htmlvar_name']})) {
+				$post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
+
+			if(is_array($field_values)){
+				$field_values = array_map('trim', $field_values);
+			}
+
+			$option_values = array();
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
+							$option_values[] = $cf_option_value['label'];
+						}
+					}
+				}
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
+
+			if (count($option_values) > 1) {
+				$html .= '<ul>';
+
+				foreach ($option_values as $val) {
+					$html .= '<li>' . $val . '</li>';
+				}
+
+				$html .= '</ul>';
+			} else {
+				$html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
+			}
+
+			$html .= '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
 
@@ -1062,148 +1062,148 @@ 
  */
 function geodir_cf_email($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
-        /**
-         * Filter the email html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the email html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
-            return ''; // Remove Send Enquiry from listings page
-        }
-
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
-
-        if ($cf['htmlvar_name'] == 'geodir_email' && $post->{$cf['htmlvar_name']}) {
-            $b_send_inquiry = '';
-
-            $html = '';
-            if (!$preview) {
-                $b_send_inquiry = 'b_send_inquiry';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fas fa-envelope"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-            $seperator = '';
-            if ($post->{$cf['htmlvar_name']}) {
-                $b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
-                $html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
-            }
-
-            $html .= '</span></div>';
-
-
-            if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
-            } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
-            }
-
-            /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
-
-        } else {
-
-            if ($post->{$cf['htmlvar_name']}) {
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '<i class="fas fa-envelope"></i>';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span><span class="geodir-email-address-output">';
-                $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
-                    /**
-                     * Filter email custom field name output.
-                     *
-                     * @since 1.5.3
-                     *
-                     * @param string $email The email string being output.
-                     * @param array $cf Custom field variables array.
-                     */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    if($location=='mapbubble'){
-                        $html .=  "<a href=\"mailto:$email\">$email_name</a>";
-                    }else{
-                        $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                    }
-
-                }else{
-                    $html .=  $email;
-                }
-                $html .= '</span></div>';
-            }
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+		/**
+		 * Filter the email html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the email html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
+			return ''; // Remove Send Enquiry from listings page
+		}
+
+		$package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+
+		if ($cf['htmlvar_name'] == 'geodir_email' && $post->{$cf['htmlvar_name']}) {
+			$b_send_inquiry = '';
+
+			$html = '';
+			if (!$preview) {
+				$b_send_inquiry = 'b_send_inquiry';
+				$html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fas fa-envelope"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+			$seperator = '';
+			if ($post->{$cf['htmlvar_name']}) {
+				$b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
+				$html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+			}
+
+			$html .= '</span></div>';
+
+
+			if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+			} elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
+				$html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+			}
+
+			/*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
+
+		} else {
+
+			if ($post->{$cf['htmlvar_name']}) {
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '<i class="fas fa-envelope"></i>';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span><span class="geodir-email-address-output">';
+				$email = $post->{$cf['htmlvar_name']} ;
+				if($e_split = explode('@',$email)){
+					/**
+					 * Filter email custom field name output.
+					 *
+					 * @since 1.5.3
+					 *
+					 * @param string $email The email string being output.
+					 * @param array $cf Custom field variables array.
+					 */
+					$email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
+					if($location=='mapbubble'){
+						$html .=  "<a href=\"mailto:$email\">$email_name</a>";
+					}else{
+						$html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+					}
+
+				}else{
+					$html .=  $email;
+				}
+				$html .= '</span></div>';
+			}
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
 
@@ -1220,136 +1220,136 @@ 
  */
 function geodir_cf_file($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
-        /**
-         * Filter the file html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the file html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            $files = explode(",", $post->{$cf['htmlvar_name']});
-            if (!empty($files)):
-
-                $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
-
-                $file_paths = '';
-                foreach ($files as $file) {
-                    if (!empty($file)) {
-
-                        // $filetype = wp_check_filetype($file);
-
-                        $image_name_arr = explode('/', $file);
-                        $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
-                        $filename = end($image_name_arr);
-                        $img_name_arr = explode('.', $filename);
-
-                        $arr_file_type = wp_check_filetype($filename);
-                        if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
-                            continue;
-                        }
-
-                        $uploaded_file_type = $arr_file_type['type'];
-                        $uploaded_file_ext = $arr_file_type['ext'];
-
-                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
-                            continue; // Invalid file type.
-                        }
-
-                        //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
-                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
-                        $audio_file_types = array('audio/mpeg', 'audio/ogg', 'audio/mp4', 'audio/vnd.wav', 'audio/basic', 'audio/mid');
-
-                        // If the uploaded file is image
-                        if (in_array($uploaded_file_type, $image_file_types)) {
-                            $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
-                            $file_paths .= '<a href="'.$file.'">';
-                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
-                            $file_paths .= '</a>';
-                            //$file_paths .= '<img src="'.$file.'"  />';	
-                            $file_paths .= '</div>';
-                        }elseif (in_array($uploaded_file_type, $audio_file_types)) {// if audio
-                            $ext_path = '_' . $html_var . '_';
-                            $filename = explode($ext_path, $filename);
-                            $file_paths .= '<span class="gd-audio-name">'.$filename[count($filename) - 1].'</span>';
-                            $file_paths .= do_shortcode('[audio src="'.$file.'" ]');
-                        } else {
-                            $ext_path = '_' . $html_var . '_';
-                            $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
-                        }
-                    }
-                }
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
-
-            endif;
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+		/**
+		 * Filter the file html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the file html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			$files = explode(",", $post->{$cf['htmlvar_name']});
+			if (!empty($files)):
+
+				$extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
+				$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+
+				$file_paths = '';
+				foreach ($files as $file) {
+					if (!empty($file)) {
+
+						// $filetype = wp_check_filetype($file);
+
+						$image_name_arr = explode('/', $file);
+						$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
+						$filename = end($image_name_arr);
+						$img_name_arr = explode('.', $filename);
+
+						$arr_file_type = wp_check_filetype($filename);
+						if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
+							continue;
+						}
+
+						$uploaded_file_type = $arr_file_type['type'];
+						$uploaded_file_ext = $arr_file_type['ext'];
+
+						if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
+							continue; // Invalid file type.
+						}
+
+						//$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
+						$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
+						$audio_file_types = array('audio/mpeg', 'audio/ogg', 'audio/mp4', 'audio/vnd.wav', 'audio/basic', 'audio/mid');
+
+						// If the uploaded file is image
+						if (in_array($uploaded_file_type, $image_file_types)) {
+							$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
+							$file_paths .= '<a href="'.$file.'">';
+							$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
+							$file_paths .= '</a>';
+							//$file_paths .= '<img src="'.$file.'"  />';	
+							$file_paths .= '</div>';
+						}elseif (in_array($uploaded_file_type, $audio_file_types)) {// if audio
+							$ext_path = '_' . $html_var . '_';
+							$filename = explode($ext_path, $filename);
+							$file_paths .= '<span class="gd-audio-name">'.$filename[count($filename) - 1].'</span>';
+							$file_paths .= do_shortcode('[audio src="'.$file.'" ]');
+						} else {
+							$ext_path = '_' . $html_var . '_';
+							$filename = explode($ext_path, $filename);
+							$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+						}
+					}
+				}
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span>';
+				$html .= $file_paths . '</div></div>';
+
+			endif;
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
 
@@ -1367,80 +1367,80 @@ 
  */
 function geodir_cf_textarea($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
-        /**
-         * Filter the textarea html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the textarea html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+		/**
+		 * Filter the textarea html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the textarea html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
 
@@ -1458,79 +1458,79 @@ 
  */
 function geodir_cf_html($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
-        /**
-         * Filter the html html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the html html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+		/**
+		 * Filter the html html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the html html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
 
@@ -1548,117 +1548,117 @@ 
  */
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
-        /**
-         * Filter the taxonomy html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the taxonomy html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
-            $field_value = $post->{$html_var};
-            $links = array();
-            $terms = array();
-            $termsOrdered = array();
-            if (!is_array($field_value)) {
-                $field_value = explode(",", trim($field_value, ","));
-            }
-
-            $field_value = array_unique($field_value);
-
-            if (!empty($field_value)) {
-                foreach ($field_value as $term) {
-                    $term = trim($term);
-
-                    if ($term != '') {
-                        $term = get_term_by('id', $term, $html_var);
-                        if (is_object($term)) {
-                            $links[$term->slug] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
-                            $terms[$term->slug] = $term;
-                        }
-                    }
-                }
-                if (!empty($links)) {
-                    // order alphabetically
-                    ksort($links,SORT_STRING);
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+		/**
+		 * Filter the taxonomy html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the taxonomy html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
+			$post_taxonomy = $post->post_type . 'category';
+			$field_value = $post->{$html_var};
+			$links = array();
+			$terms = array();
+			$termsOrdered = array();
+			if (!is_array($field_value)) {
+				$field_value = explode(",", trim($field_value, ","));
+			}
+
+			$field_value = array_unique($field_value);
+
+			if (!empty($field_value)) {
+				foreach ($field_value as $term) {
+					$term = trim($term);
+
+					if ($term != '') {
+						$term = get_term_by('id', $term, $html_var);
+						if (is_object($term)) {
+							$links[$term->slug] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+							$terms[$term->slug] = $term;
+						}
+					}
+				}
+				if (!empty($links)) {
+					// order alphabetically
+					ksort($links,SORT_STRING);
 //                    print_r($links);
-                    foreach (array_keys($links) as $key) {
-                        $termsOrdered[$key] = $terms[$key];
-                    }
-                    $terms = $termsOrdered;
-                }
-            }
+					foreach (array_keys($links) as $key) {
+						$termsOrdered[$key] = $terms[$key];
+					}
+					$terms = $termsOrdered;
+				}
+			}
 
 //            print_r($terms);
 
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+			$html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
 
-            if ($html_value != '') {
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } else if ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
+			if ($html_value != '') {
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} else if ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
-            }
-        }
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span> ' . $html_value . '</div>';
+			}
+		}
 
-    }
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
 
@@ -1676,176 +1676,176 @@ 
  */
 function geodir_cf_address($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
-        /**
-         * Filter the address html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the address html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
-
-        if ($cf['extra_fields']) {
-
-            $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-
-            $addition_fields = '';
-
-            if (!empty($extra_fields)) {
-
-                $show_city_in_address = false;
-                if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
-                    $show_city_in_address = true;
-                }
-                /**
-                 * Filter "show city in address" value.
-                 *
-                 * @since 1.0.0
-                 */
-                $show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
-
-
-                $show_region_in_address = false;
-                if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
-                    $show_region_in_address = true;
-                }
-                /**
-                 * Filter "show region in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
-
-                $show_country_in_address = false;
-                if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
-                    $show_country_in_address = true;
-                }
-                /**
-                 * Filter "show country in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
-
-                $show_zip_in_address = false;
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
-                    $show_zip_in_address = true;
-                }
-                /**
-                 * Filter "show zip in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
-
-
-            }
-
-        }
-
-
-        if ($post->{$html_var}) {
-
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
-                $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
-                $field_icon_af = '<i class="fas fa-home"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon    = '';
-            }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+		/**
+		 * Filter the address html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the address html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		$html_var = $cf['htmlvar_name'] . '_address';
+
+		if ($cf['extra_fields']) {
+
+			$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+
+			$addition_fields = '';
+
+			if (!empty($extra_fields)) {
+
+				$show_city_in_address = false;
+				if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
+					$show_city_in_address = true;
+				}
+				/**
+				 * Filter "show city in address" value.
+				 *
+				 * @since 1.0.0
+				 */
+				$show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
+
+
+				$show_region_in_address = false;
+				if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
+					$show_region_in_address = true;
+				}
+				/**
+				 * Filter "show region in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
+
+				$show_country_in_address = false;
+				if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
+					$show_country_in_address = true;
+				}
+				/**
+				 * Filter "show country in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
+
+				$show_zip_in_address = false;
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+					$show_zip_in_address = true;
+				}
+				/**
+				 * Filter "show zip in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
+
+
+			}
+
+		}
+
+
+		if ($post->{$html_var}) {
+
+			$field_icon = geodir_field_icon_proccess( $cf );
+			if ( strpos( $field_icon, 'http' ) !== false ) {
+				$field_icon_af = '';
+			} elseif ( $field_icon == '' ) {
+				$field_icon_af = '<i class="fas fa-home"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon    = '';
+			}
             
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+			$html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+			$html .= '</span>';
             
-            $address_fields = array();
-
-            if ( isset($post->post_address) ) {
-                $address_fields['post_address'] = '<span itemprop="streetAddress">' . $post->post_address . '</span>';
-            }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $address_fields['post_city'] = '<span itemprop="addressLocality">' . $post->post_city . '</span>';
-            }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $address_fields['post_region'] = '<span itemprop="addressRegion">' . $post->post_region . '</span>';
-            }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $address_fields['post_zip'] = '<span itemprop="postalCode">' . $post->post_zip . '</span>';
-            }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $address_fields['post_country'] = '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span>';
-            }
+			$address_fields = array();
+
+			if ( isset($post->post_address) ) {
+				$address_fields['post_address'] = '<span itemprop="streetAddress">' . $post->post_address . '</span>';
+			}
+			if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
+				$address_fields['post_city'] = '<span itemprop="addressLocality">' . $post->post_city . '</span>';
+			}
+			if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
+				$address_fields['post_region'] = '<span itemprop="addressRegion">' . $post->post_region . '</span>';
+			}
+			if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
+				$address_fields['post_zip'] = '<span itemprop="postalCode">' . $post->post_zip . '</span>';
+			}
+			if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
+				$address_fields['post_country'] = '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span>';
+			}
             
-            /**
-             * Filter the address fields array being displayed.
-             *
-             * @param array $address_fields The array of address fields.
-             * @param object $post The current post object.
-             * @param array $cf The custom field array details.
-             * @param string $location The location to output the html.
-             * 
-             * @since 1.6.21
-             */
-            $address_fields = apply_filters('geodir_custom_field_output_address_fields', $address_fields, $post, $cf, $location);
+			/**
+			 * Filter the address fields array being displayed.
+			 *
+			 * @param array $address_fields The array of address fields.
+			 * @param object $post The current post object.
+			 * @param array $cf The custom field array details.
+			 * @param string $location The location to output the html.
+			 * 
+			 * @since 1.6.21
+			 */
+			$address_fields = apply_filters('geodir_custom_field_output_address_fields', $address_fields, $post, $cf, $location);
             
-            if (!empty($address_fields) && is_array($address_fields)) {
-                $address_fields = array_values($address_fields);
-                $html .= implode('<br>', $address_fields);
-            }
+			if (!empty($address_fields) && is_array($address_fields)) {
+				$address_fields = array_values($address_fields);
+				$html .= implode('<br>', $address_fields);
+			}
             
-            $html .= '</div>';
-        }
-    }
+			$html .= '</div>';
+		}
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file

Spacing +305 added lines, -305 removed lines

@@ -19,21 +19,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_checkbox($html,$location,$cf,$p=''){
+function geodir_cf_checkbox($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_checkbox_loc_{$location}")) {
         /**
          * Filter the checkbox html by location.
          *
@@ -41,11 +41,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -54,11 +54,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")) {
         /**
          * Filter the checkbox html by field type key.
          *
@@ -67,18 +67,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ( (int) $post->{$html_var} == 1 ):
+        if ((int) $post->{$html_var} == 1):
 
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
+            if ($post->{$html_var} == '1'):
+                $html_val = __('Yes', 'geodirectory');
             else:
-                $html_val = __( 'No', 'geodirectory' );
+                $html_val = __('No', 'geodirectory');
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -91,16 +91,16 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
+add_filter('geodir_custom_field_output_checkbox', 'geodir_cf_checkbox', 10, 3);
 
 
 /**
@@ -113,21 +113,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_fieldset($html,$location,$cf,$p=''){
+function geodir_cf_fieldset($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_fieldset_loc_{$location}")) {
         /**
          * Filter the fieldset html by location.
          *
@@ -135,11 +135,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -148,11 +148,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")) {
         /**
          * Filter the fieldset html by field type key.
          *
@@ -161,11 +161,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $field_set_start;
         $fieldset_class = 'fieldset-'.sanitize_html_class(sanitize_title_with_dashes($cf['site_title']));
@@ -173,7 +173,7 @@ 
         if ($field_set_start == 1) {
             $html = '';
         } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+            $html = '<h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
             //$field_set_start = 1;
         }
 
@@ -181,7 +181,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
+add_filter('geodir_custom_field_output_fieldset', 'geodir_cf_fieldset', 10, 3);
 
 
 /**
@@ -194,21 +194,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_url($html,$location,$cf,$p=''){
+function geodir_cf_url($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_url_loc_{$location}")) {
         /**
          * Filter the url html by location.
          *
@@ -216,11 +216,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_url_var_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -229,11 +229,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")) {
         /**
          * Filter the url html by field type key.
          *
@@ -242,11 +242,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -273,7 +273,7 @@ 
 
             $website = !empty($a_url['url']) ? $a_url['url'] : '';
             $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+            if (!empty($cf['default_value'])) {$title = $cf['default_value']; }
             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
 
 
@@ -289,7 +289,7 @@ 
              * @param string $website Website URL.
              * @param int $post->ID Post ID.
              */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';
 
         endif;
 
@@ -297,7 +297,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
+add_filter('geodir_custom_field_output_url', 'geodir_cf_url', 10, 3);
 
 
 /**
@@ -310,21 +310,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_phone($html,$location,$cf,$p=''){
+function geodir_cf_phone($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_phone_loc_{$location}")) {
         /**
          * Filter the phone html by location.
          *
@@ -332,11 +332,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_phone_var_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -345,11 +345,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")) {
         /**
          * Filter the phone html by field type key.
          *
@@ -358,11 +358,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -377,9 +377,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.
+                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}).'">'.$post->{$cf['htmlvar_name']}.'</a></div>';
 
         endif;
 
@@ -387,7 +387,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
+add_filter('geodir_custom_field_output_phone', 'geodir_cf_phone', 10, 3);
 
 
 /**
@@ -400,21 +400,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_time($html,$location,$cf,$p=''){
+function geodir_cf_time($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_time_loc_{$location}")) {
         /**
          * Filter the time html by location.
          *
@@ -422,11 +422,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_time_var_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -435,11 +435,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")) {
         /**
          * Filter the time html by field type key.
          *
@@ -448,11 +448,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -472,9 +472,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -482,7 +482,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
+add_filter('geodir_custom_field_output_time', 'geodir_cf_time', 10, 3);
 
 
 /**
@@ -495,21 +495,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_datepicker($html,$location,$cf,$p=''){
+function geodir_cf_datepicker($html, $location, $cf, $p = '') {
     global $preview;
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_datepicker_loc_{$location}")) {
         /**
          * Filter the datepicker html by location.
          *
@@ -517,11 +517,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -530,11 +530,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")) {
         /**
          * Filter the datepicker html by field type key.
          *
@@ -543,11 +543,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -558,24 +558,24 @@ 
             }
             // check if we need to change the format or not
             $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
+            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.
 
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
                 $date_format = str_replace($search, $replace, $date_format);
 
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+            } else {
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']} != "0000-00-00") {
                 $date_format_from = $preview ? $date_format : 'Y-m-d';
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else {
                 return '';
             }
 
@@ -592,9 +592,9 @@ 
 
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -602,7 +602,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
+add_filter('geodir_custom_field_output_datepicker', 'geodir_cf_datepicker', 10, 3);
 
 
 /**
@@ -615,21 +615,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_text($html,$location,$cf,$p=''){
+function geodir_cf_text($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_text_loc_{$location}")) {
         /**
          * Filter the text html by location.
          *
@@ -637,11 +637,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_text_var_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -650,11 +650,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")) {
         /**
          * Filter the text html by field type key.
          *
@@ -663,15 +663,15 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
             $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -686,16 +686,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="'.$class.'" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+            if (isset($cf['data_type']) && ($cf['data_type'] == 'INT' || $cf['data_type'] == 'FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']) {
                 $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
+                if (isset($extra_fields['is_price']) && $extra_fields['is_price']) {
+                    if (!ceil($value) > 0) {return ''; }// dont output blank prices
+                    $value = geodir_currency_format_number($value, $cf);
                 }
             }
 
@@ -709,7 +709,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
+add_filter('geodir_custom_field_output_text', 'geodir_cf_text', 10, 3);
 
 
 /**
@@ -722,21 +722,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_radio($html,$location,$cf,$p=''){
+function geodir_cf_radio($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_radio_loc_{$location}")) {
         /**
          * Filter the radio html by location.
          *
@@ -744,11 +744,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_radio_var_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -757,11 +757,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")) {
         /**
          * Filter the radio html by field type key.
          *
@@ -770,11 +770,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
         if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
@@ -808,16 +808,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
+add_filter('geodir_custom_field_output_radio', 'geodir_cf_radio', 10, 3);
 
 
 /**
@@ -831,21 +831,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_select($html,$location,$cf,$p=''){
+function geodir_cf_select($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_select_loc_{$location}")) {
         /**
          * Filter the select html by location.
          *
@@ -853,11 +853,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_select_var_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -866,11 +866,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")) {
         /**
          * Filter the select html by field type key.
          *
@@ -879,11 +879,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
             $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
@@ -911,16 +911,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$field_value.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
+add_filter('geodir_custom_field_output_select', 'geodir_cf_select', 10, 3);
 
 
 /**
@@ -933,21 +933,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_multiselect($html,$location,$cf,$p=''){
+function geodir_cf_multiselect($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_multiselect_loc_{$location}")) {
         /**
          * Filter the multiselect html by location.
          *
@@ -955,11 +955,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -968,11 +968,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")) {
         /**
          * Filter the multiselect html by field type key.
          *
@@ -981,11 +981,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
 
         if (!empty($post->{$cf['htmlvar_name']})):
@@ -1006,7 +1006,7 @@ 
 
             $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
 
-            if(is_array($field_values)){
+            if (is_array($field_values)) {
                 $field_values = array_map('trim', $field_values);
             }
 
@@ -1024,15 +1024,15 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             if (count($option_values) > 1) {
                 $html .= '<ul>';
 
                 foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
+                    $html .= '<li>'.$val.'</li>';
                 }
 
                 $html .= '</ul>';
@@ -1047,7 +1047,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
+add_filter('geodir_custom_field_output_multiselect', 'geodir_cf_multiselect', 10, 3);
 
 
 /**
@@ -1060,21 +1060,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_email($html,$location,$cf,$p=''){
+function geodir_cf_email($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_email_loc_{$location}")) {
         /**
          * Filter the email html by location.
          *
@@ -1082,11 +1082,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_email_var_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -1095,11 +1095,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")) {
         /**
          * Filter the email html by field type key.
          *
@@ -1108,18 +1108,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
         if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
             return ''; // Remove Send Enquiry from listings page
         }
 
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+        $package_info = (array) geodir_post_package_info(array(), $post, $post->post_type);
 
         if ($cf['htmlvar_name'] == 'geodir_email' && $post->{$cf['htmlvar_name']}) {
             $b_send_inquiry = '';
@@ -1127,7 +1127,7 @@ 
             $html = '';
             if (!$preview) {
                 $b_send_inquiry = 'b_send_inquiry';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';
             }
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -1140,20 +1140,20 @@ 
                 $field_icon = '';
             }
 
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+            $html .= '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
             $seperator = '';
             if ($post->{$cf['htmlvar_name']}) {
                 $b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
-                $html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="'.$b_send_inquiry_url.'" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
             }
 
             $html .= '</span></div>';
 
 
             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';
             }
 
             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
@@ -1173,11 +1173,11 @@ 
                 }
 
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span><span class="geodir-email-address-output">';
                 $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
+                if ($e_split = explode('@', $email)) {
                     /**
                      * Filter email custom field name output.
                      *
@@ -1186,15 +1186,15 @@ 
                      * @param string $email The email string being output.
                      * @param array $cf Custom field variables array.
                      */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    if($location=='mapbubble'){
-                        $html .=  "<a href=\"mailto:$email\">$email_name</a>";
-                    }else{
-                        $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
+                    if ($location == 'mapbubble') {
+                        $html .= "<a href=\"mailto:$email\">$email_name</a>";
+                    } else {
+                        $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
                     }
 
-                }else{
-                    $html .=  $email;
+                } else {
+                    $html .= $email;
                 }
                 $html .= '</span></div>';
             }
@@ -1205,7 +1205,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
+add_filter('geodir_custom_field_output_email', 'geodir_cf_email', 10, 3);
 
 
 /**
@@ -1218,21 +1218,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_file($html,$location,$cf,$p=''){
+function geodir_cf_file($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_file_loc_{$location}")) {
         /**
          * Filter the file html by location.
          *
@@ -1240,11 +1240,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_file_var_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1253,11 +1253,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")) {
         /**
          * Filter the file html by field type key.
          *
@@ -1266,11 +1266,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})):
 
@@ -1278,7 +1278,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 
                 $file_paths = '';
                 foreach ($files as $file) {
@@ -1316,14 +1316,14 @@ 
                             //$file_paths .= '<img src="'.$file.'"  />';	
                             $file_paths .= '</div>';
                         }elseif (in_array($uploaded_file_type, $audio_file_types)) {// if audio
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
                             $file_paths .= '<span class="gd-audio-name">'.$filename[count($filename) - 1].'</span>';
                             $file_paths .= do_shortcode('[audio src="'.$file.'" ]');
                         } else {
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
                         }
                     }
                 }
@@ -1338,11 +1338,11 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+                $html = '<div class="geodir_more_info  '.$cf['css_class'].' geodir-custom-file-box '.$cf['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
+                $html .= $file_paths.'</div></div>';
 
             endif;
         endif;
@@ -1351,7 +1351,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
+add_filter('geodir_custom_field_output_file', 'geodir_cf_file', 10, 3);
 
 
 
@@ -1365,21 +1365,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_textarea($html,$location,$cf,$p=''){
+function geodir_cf_textarea($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_textarea_loc_{$location}")) {
         /**
          * Filter the textarea html by location.
          *
@@ -1387,11 +1387,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_textarea_var_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -1400,11 +1400,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")) {
         /**
          * Filter the textarea html by field type key.
          *
@@ -1413,11 +1413,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1432,9 +1432,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1442,7 +1442,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
+add_filter('geodir_custom_field_output_textarea', 'geodir_cf_textarea', 10, 3);
 
 
 
@@ -1456,21 +1456,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_html($html,$location,$cf,$p=''){
+function geodir_cf_html($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_html_loc_{$location}")) {
         /**
          * Filter the html html by location.
          *
@@ -1478,11 +1478,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_html_var_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -1491,11 +1491,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")) {
         /**
          * Filter the html html by field type key.
          *
@@ -1504,11 +1504,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1522,9 +1522,9 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1532,7 +1532,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
+add_filter('geodir_custom_field_output_html', 'geodir_cf_html', 10, 3);
 
 
 
@@ -1546,21 +1546,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_taxonomy($html,$location,$cf,$p=''){
+function geodir_cf_taxonomy($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")) {
         /**
          * Filter the taxonomy html by location.
          *
@@ -1568,11 +1568,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1581,11 +1581,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")) {
         /**
          * Filter the taxonomy html by field type key.
          *
@@ -1594,14 +1594,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
+        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {
+            $post_taxonomy = $post->post_type.'category';
             $field_value = $post->{$html_var};
             $links = array();
             $terms = array();
@@ -1619,14 +1619,14 @@ 
                     if ($term != '') {
                         $term = get_term_by('id', $term, $html_var);
                         if (is_object($term)) {
-                            $links[$term->slug] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+                            $links[$term->slug] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";
                             $terms[$term->slug] = $term;
                         }
                     }
                 }
                 if (!empty($links)) {
                     // order alphabetically
-                    ksort($links,SORT_STRING);
+                    ksort($links, SORT_STRING);
 //                    print_r($links);
                     foreach (array_keys($links) as $key) {
                         $termsOrdered[$key] = $terms[$key];
@@ -1637,7 +1637,7 @@ 
 
 //            print_r($terms);
 
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';
 
             if ($html_value != '') {
                 $field_icon = geodir_field_icon_proccess($cf);
@@ -1650,9 +1650,9 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+                $html .= '</span> '.$html_value.'</div>';
             }
         }
 
@@ -1660,7 +1660,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
+add_filter('geodir_custom_field_output_taxonomy', 'geodir_cf_taxonomy', 10, 3);
 
 
 /**
@@ -1674,21 +1674,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_address($html,$location,$cf,$p=''){
+function geodir_cf_address($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_address_loc_{$location}")) {
         /**
          * Filter the address html by location.
          *
@@ -1696,11 +1696,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_address_var_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -1709,11 +1709,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")) {
         /**
          * Filter the address html by field type key.
          *
@@ -1722,14 +1722,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
+        $html_var = $cf['htmlvar_name'].'_address';
 
         if ($cf['extra_fields']) {
 
@@ -1792,37 +1792,37 @@ 
 
         if ($post->{$html_var}) {
 
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
+            $field_icon = geodir_field_icon_proccess($cf);
+            if (strpos($field_icon, 'http') !== false) {
                 $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
+            } elseif ($field_icon == '') {
                 $field_icon_af = '<i class="fas fa-home"></i>';
             } else {
                 $field_icon_af = $field_icon;
                 $field_icon    = '';
             }
             
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
             $html .= '</span>';
             
             $address_fields = array();
 
-            if ( isset($post->post_address) ) {
-                $address_fields['post_address'] = '<span itemprop="streetAddress">' . $post->post_address . '</span>';
+            if (isset($post->post_address)) {
+                $address_fields['post_address'] = '<span itemprop="streetAddress">'.$post->post_address.'</span>';
             }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $address_fields['post_city'] = '<span itemprop="addressLocality">' . $post->post_city . '</span>';
+            if ($show_city_in_address && isset($post->post_city) && $post->post_city) {
+                $address_fields['post_city'] = '<span itemprop="addressLocality">'.$post->post_city.'</span>';
             }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $address_fields['post_region'] = '<span itemprop="addressRegion">' . $post->post_region . '</span>';
+            if ($show_region_in_address && isset($post->post_region) && $post->post_region) {
+                $address_fields['post_region'] = '<span itemprop="addressRegion">'.$post->post_region.'</span>';
             }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $address_fields['post_zip'] = '<span itemprop="postalCode">' . $post->post_zip . '</span>';
+            if ($show_zip_in_address && isset($post->post_zip) && $post->post_zip) {
+                $address_fields['post_zip'] = '<span itemprop="postalCode">'.$post->post_zip.'</span>';
             }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $address_fields['post_country'] = '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span>';
+            if ($show_country_in_address && isset($post->post_country) && $post->post_country) {
+                $address_fields['post_country'] = '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span>';
             }
             
             /**
@@ -1848,4 +1848,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
\ No newline at end of file

geodirectory_template_actions.php

Indentation +1836 added lines, -1836 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,120 +641,120 @@ 
  */

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

-        }

-    }

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

+	$post = (object)$_REQUEST;

 

 

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

-        $post->video = stripslashes($post->video);

-    }

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

+		$post->video = stripslashes($post->video);

+	}

 

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

-        $post->Video2 = stripslashes($post->Video2);

-    }

+	if (isset($post->Video2)) {

+		$post->Video2 = stripslashes($post->Video2);

+	}

 

-    $post_type = $post->listing_type;

-    $post_type_info = get_post_type_object($post_type);

+	$post_type = $post->listing_type;

+	$post_type_info = get_post_type_object($post_type);

 

-    $listing_label = $post_type_info->labels->singular_name;

+	$listing_label = $post_type_info->labels->singular_name;

 

-    $term_icon = '';

+	$term_icon = '';

 

-    if (!empty($post->post_category)) {

-        foreach ($post->post_category as $post_taxonomy => $post_term) {

+	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 ($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 = geodir_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 = geodir_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 = '';

-    }

+	// 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 = '';

+	}

 	if (empty($post->default_category) && ! empty($post->post_default_category)) {

 		$post->default_category = $post->post_default_category;

 	}

@@ -766,7 +766,7 @@ 
 	if (!empty($post_type) && empty($post->{$cat_taxonomy}) && !empty($post->post_category) && !empty($post->post_category[$cat_taxonomy])) {

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

 	}

-    setup_postdata($post);

+	setup_postdata($post);

 }

 

 /**

@@ -778,15 +778,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

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

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

@@ -857,7 +857,7 @@ 
  */

 function geodir_details_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_detail_sidebar');

+	dynamic_sidebar('geodir_detail_sidebar');

 }

 

 /**

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

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

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

 }

 

 

@@ -994,106 +994,106 @@ 
  */

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

-        }

-    }

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

+		}

+	}

     

-    $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

-    $image_limit = '';

-    if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

-        $image_limit = (int)$package_info->image_limit;

-    }

-

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

-        }

+	$package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

+	$image_limit = '';

+	if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

+		$image_limit = (int)$package_info->image_limit;

+	}

 

-        $main_slides = '';

-        $nav_slides = '';

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

-                     break;

-                }

-                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_limit !== '' && ($slides+1) > $image_limit) {

-                     break;

-                }

-                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="' . $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 ($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 ($image_limit !== '' && ($slides+1) > $image_limit) {

+					 break;

+				}

+				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_limit !== '' && ($slides+1) > $image_limit) {

+					 break;

+				}

+				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="' . $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="fas fa-sync fa-spin"></i></div>

             <div id="geodir_slider" class="geodir_flexslider ">

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

         </div>

     <?php

-    }

+	}

 }

 

 add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);

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

+	}

 

-    if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

-    }

+	/**

+	 * 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_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

 }

 

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

-

-            if($rating_value = geodir_get_commentoverall($review->comment_ID)){

-                $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" => $rating_value,

-                        "worstRating" => "1"

-                    )

-                );

-            }

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

+

+			if($rating_value = geodir_get_commentoverall($review->comment_ID)){

+				$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" => $rating_value,

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

-        }

+	// 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 = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$cat_schema && $schema_type=='LocalBusiness' && $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);

+	}

+	//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 = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

+		if($cat_schema){$schema_type = $cat_schema;}

+		if(!$cat_schema && $schema_type=='LocalBusiness' && $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);

 

 

 

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

@@ -1488,15 +1488,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	

 }

 

 /**

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

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

+	global $wp, $term;

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

-    $single_name = $post_type_info->labels->singular_name;

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type, true);

+	$list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+	$single_name = $post_type_info->labels->singular_name;

 

-    $gd_country = get_query_var('gd_country');

-    $gd_region = get_query_var('gd_region');

-    $gd_city = get_query_var('gd_city');

+	$taxonomy = geodir_get_taxonomies($gd_post_type, true);

 

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

-            }

+	$gd_country = get_query_var('gd_country');

+	$gd_region = get_query_var('gd_region');

+	$gd_city = get_query_var('gd_city');

 

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

-            }

-        }

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

+			}

 

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

-        if (!empty($current_term)) {

-            $current_term_name = __(geodir_utf8_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 = __(geodir_utf8_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 . "'";

-                    }

-                }

-            }

-        }

+			if ($gd_region != '') {

+				$location_name = geodir_sanitize_location_name('gd_region', $gd_region);

+			}

 

-    } 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'] : '';

+			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 = __(geodir_utf8_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 = __(geodir_utf8_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');

+			}

 

-        $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

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

+			}

 

-        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 .= __(' 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');

+			}

 

-        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_country . "'";

+		}

+	}

 

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

-            }

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_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');

 

-            $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') . ' ' . __(geodir_utf8_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;

-        }

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

-        }

+	}

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

+	/**

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

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

@@ -1713,46 +1713,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(geodir_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(geodir_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

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

@@ -1798,35 +1798,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

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

 }

 

 /**

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

@@ -1879,20 +1879,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');

+	}

 }

 

 /**

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

@@ -1923,20 +1923,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');

+	}

 }

 

 

@@ -1953,23 +1953,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

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

 }

 

 /**

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

@@ -2023,47 +2023,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');

 }

 

 

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

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

 

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

-    echo $title;

-    echo '</h1></header>';

+	/**

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

 }

 

 add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);

@@ -2163,61 +2163,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 = isset($post->post_category) ? $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']);

-    }

+	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 = isset($post->post_category) ? $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']);

+	}

 

-    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);?>"/>

@@ -2228,114 +2228,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>

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

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

-            }

-

-            $listing_type = $post->listing_type;

+			if ($curImages != '') {

+				$curImages_array = explode(',', $curImages);

+				$totImg = count($curImages_array);

+			}

 

-        } 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']);

+			$listing_type = $post->listing_type;

 

-        } else {

-            $listing_type = sanitize_text_field($_REQUEST['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']);

 

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

@@ -2527,12 +2527,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 -->

@@ -2561,7 +2561,7 @@ 
 

     </form>

     <?php

-    wp_reset_query();

+	wp_reset_query();

 }

 

 /**

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

@@ -2587,16 +2587,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');

 }

 

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

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

@@ -2636,11 +2636,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 () {

@@ -2676,67 +2676,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 } ?>

 

@@ -2768,66 +2768,66 @@ 
  */

 function geodir_action_author_page_title()

 {

-    global $term;

-

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	global $term;

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

-    $single_name = $post_type_info->labels->singular_name;

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type);

+	$list_title = $add_string_in_title . $post_type_info->labels->name;

+	$single_name = $post_type_info->labels->singular_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) . "'";

-    }

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

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

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

-        }

+	}

+	/** 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;

+		}

 

-    }

+	}

 

 

-    /**

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

 }

 

 

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

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

@@ -2886,19 +2886,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');

+	}

 }

 

 /**

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

@@ -2931,18 +2931,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');

+	}

 }

 

 /**

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

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

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

@@ -3028,23 +3028,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

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

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

@@ -3100,19 +3100,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');

+	}

 }

 

 /**

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

@@ -3145,18 +3145,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');

+	}

 }

 

 

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

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

@@ -3213,22 +3213,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');

 }

 

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

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

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

@@ -3293,19 +3293,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');

+	}

 }

 

 /**

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

@@ -3339,18 +3339,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');

+	}

 }

 

 /**

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

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

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

@@ -3444,13 +3444,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') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

-    }

-    return $list_title;

+		$list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_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');

@@ -3466,63 +3466,63 @@ 
  * @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;

-    $post = get_post($gd_page_id);

-

-    setup_postdata($post);

-

-    if (get_the_content()) {

-        ?>

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

+	$post = get_post($gd_page_id);

+

+	setup_postdata($post);

+

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

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

@@ -3571,31 +3571,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

geodirectory_template_tags.php

Indentation +343 added lines, -343 removed lines

@@ -36,177 +36,177 @@ 
  */

 function geodir_templates_scripts()

 {

-    $is_detail_page = false;

-    $geodir_map_name = geodir_map_name();

+	$is_detail_page = false;

+	$geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

-        $is_detail_page = true;

-    }

+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+		$is_detail_page = true;

+	}

 

-    wp_enqueue_script('jquery');

+	wp_enqueue_script('jquery');

 

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('geodirectory-script');

+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('geodirectory-script');

 

-    $geodir_vars_data = array(

-        'siteurl' => get_option('siteurl'),

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

-        'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

-        'is_rtl' => is_rtl() ? 1 : 0, // fix rtl issue

+	$geodir_vars_data = array(

+		'siteurl' => get_option('siteurl'),

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+		'geodir_ajax_url' => geodir_get_ajax_url(),

+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+		'is_rtl' => is_rtl() ? 1 : 0, // fix rtl issue

 		'lightBox_txtImage' => addslashes(__('Image', 'geodirectory')),

 		'lightBox_txtOf' => addslashes(__('of', 'geodirectory')),

-    );

-

-    /**

-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

-     *

-     * This is used by addons to add JS translatable variables.

-     *

-     * @since 1.4.4

-     * @param array $geodir_vars_data {

-     *    geodir var data used by addons to add JS translatable variables.

-     *

-     *    @type string $siteurl Site url.

-     *    @type string $geodir_plugin_url Geodirectory core plugin url.

-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

-     *    @type int $is_rtl Checks if current locale is RTL.

-     *

-     * }

-     */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

-

-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

-

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

-

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

-    wp_enqueue_script('geodirectory-lightbox-jquery');

-

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

-    if ($is_detail_page) {

-        wp_enqueue_script('geodirectory-jquery-simplemodal');

-    }

+	);

+

+	/**

+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

+	 *

+	 * This is used by addons to add JS translatable variables.

+	 *

+	 * @since 1.4.4

+	 * @param array $geodir_vars_data {

+	 *    geodir var data used by addons to add JS translatable variables.

+	 *

+	 *    @type string $siteurl Site url.

+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.

+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

+	 *    @type int $is_rtl Checks if current locale is RTL.

+	 *

+	 * }

+	 */

+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+

+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

+

+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+

+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+	wp_enqueue_script('geodirectory-lightbox-jquery');

+

+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+	if ($is_detail_page) {

+		wp_enqueue_script('geodirectory-jquery-simplemodal');

+	}

 

-    if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

-        /**

-         * Filter the variables that are added to the end of the google maps script call.

-         *

-         * This i used to change things like google maps language etc.

-         *

-         * @since 1.0.0

-         * @param string $var The string to filter, default is empty string.

-         */

-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+	if (in_array($geodir_map_name, array('auto', 'google'))) {

+		$map_lang = "&language=" . geodir_get_map_default_language();

+		$map_key = "&key=" . geodir_get_map_api_key();

+		/**

+		 * Filter the variables that are added to the end of the google maps script call.

+		 *

+		 * This i used to change things like google maps language etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to filter, default is empty string.

+		 */

+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');

+		wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

         

-        // Overlapping Marker Spiderfier

-        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-g-overlappingmarker-script');

-    }

+		// Overlapping Marker Spiderfier

+		wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-g-overlappingmarker-script');

+	}

     

-    if ($geodir_map_name == 'osm') {

-        // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-leaflet-style');

+	if ($geodir_map_name == 'osm') {

+		// Leaflet OpenStreetMap

+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-leaflet-script');

+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-leaflet-geo-script');

+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-leaflet-geo-script');

         

-        if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_style('geodirectory-leaflet-routing-style');

+		if ($is_detail_page) {

+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-routing-script');

-        }

+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-routing-script');

+		}

         

-        // Overlapping Marker Spiderfier Leaflet

-        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-o-overlappingmarker-script');

-    }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+		// Overlapping Marker Spiderfier Leaflet

+		wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-o-overlappingmarker-script');

+	}

+	wp_enqueue_script( 'jquery-ui-autocomplete' );

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('geodirectory-goMap-script');

-

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('chosen');

-

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('geodirectory-choose-ajax');

-

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

-

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

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

-        wp_enqueue_script('jquery-ui-sortable');

-

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

-        wp_enqueue_script('geodirectory-plupload-script');

-        // SCRIPT FOR UPLOAD END

-

-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-        } else {

-            $ajax_url = admin_url('admin-ajax.php');

-        }

+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('geodirectory-goMap-script');

+

+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('chosen');

+

+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('geodirectory-choose-ajax');

+

+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+

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

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

+		wp_enqueue_script('jquery-ui-sortable');

+

+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+		wp_enqueue_script('geodirectory-plupload-script');

+		// SCRIPT FOR UPLOAD END

+

+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+		} else {

+			$ajax_url = admin_url('admin-ajax.php');

+		}

 

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,browserplus,gears,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => $ajax_url,

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'upload_img_size' => geodir_max_upload_size());

-

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

-

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

-    } // End if for add place page

-

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    if ($is_detail_page) {

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,browserplus,gears,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => $ajax_url,

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'upload_img_size' => geodir_max_upload_size());

+

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+

+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+	} // End if for add place page

+

+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

-    // font awesome rating script

+	// font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

@@ -215,11 +215,11 @@ 
 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('geodir-on-document-load');

+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('google-geometa');

+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('google-geometa');

 }

 

 /**

@@ -233,8 +233,8 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

-    echo stripslashes(get_option('geodir_header_scripts'));

+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+	echo stripslashes(get_option('geodir_header_scripts'));

 }

 

 /**

@@ -247,7 +247,7 @@ 
  */

 function geodir_google_analytics_tracking_code()

 {

-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

 

         <script>

             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -262,9 +262,9 @@ 
         </script>

 

         <?php

-    }elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

-        echo stripslashes(get_option('geodir_ga_tracking_code'));

-    }

+	}elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+		echo stripslashes(get_option('geodir_ga_tracking_code'));

+	}

 }

 

 /**

@@ -278,16 +278,16 @@ 
 function geodir_footer_scripts()

 {

 

-    echo stripslashes(get_option('geodir_footer_scripts'));

+	echo stripslashes(get_option('geodir_footer_scripts'));

 

-    /*

+	/*

      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041

      *

      * Flexbox wont wrap on ios for search form items

      */

-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

-    }

+	if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

+	}

 }

 

 

@@ -301,12 +301,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

+	if (strpos($url, '#asyncload')===false)

+		return $url;

+	else if (is_admin())

+		return str_replace('#asyncload', '', $url);

+	else

+		return str_replace('#asyncload', '', $url)."' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -319,21 +319,21 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodir-core-scss');

+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodirectory-frontend-rtl-style');

-    }

+	if(is_rtl()){

+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodirectory-frontend-rtl-style');

+	}

 

 //    wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

 //    wp_enqueue_style('font-awesome');

 

-    wp_register_script('font-awesome', 'https://use.fontawesome.com/releases/v5.4.1/js/all.js', array('font-awesome-shim'), GEODIRECTORY_VERSION);

-    wp_register_script('font-awesome-shim', 'https://use.fontawesome.com/releases/v5.4.1/js/v4-shims.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script( 'font-awesome' );

+	wp_register_script('font-awesome', 'https://use.fontawesome.com/releases/v5.4.1/js/all.js', array('font-awesome-shim'), GEODIRECTORY_VERSION);

+	wp_register_script('font-awesome-shim', 'https://use.fontawesome.com/releases/v5.4.1/js/v4-shims.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script( 'font-awesome' );

 

 

 }

@@ -347,7 +347,7 @@ 
  */

 function geodir_get_sidebar()

 {

-    get_sidebar('geodirectory');

+	get_sidebar('geodirectory');

 }

 

 /**

@@ -366,122 +366,122 @@ 
  * @param bool $always_show Do you want to show the pagination always? Default: false.

  */

 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {

-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

 

-    if (empty($prelabel)) {

-        $prelabel = '<strong>&lt;</strong>';

-    }

+	if (empty($prelabel)) {

+		$prelabel = '<strong>&lt;</strong>';

+	}

 

-    if (empty($nxtlabel)) {

-        $nxtlabel = '<strong>&gt;</strong>';

-    }

+	if (empty($nxtlabel)) {

+		$nxtlabel = '<strong>&gt;</strong>';

+	}

 

-    $half_pages_to_show = round($pages_to_show / 2);

+	$half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

-        return;

+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

+		return;

 

-    if (!is_single()) {

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

-        $numposts = $wp_query->found_posts;

+	if (!is_single()) {

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

+		$numposts = $wp_query->found_posts;

 

-        $max_page = ceil($numposts / $posts_per_page);

+		$max_page = ceil($numposts / $posts_per_page);

 

-        if (empty($paged)) {

-            $paged = 1;

-        }

+		if (empty($paged)) {

+			$paged = 1;

+		}

         

-        $post_type = geodir_get_current_posttype();

-        $listing_type_name = get_post_type_plural_label($post_type);

-        if (geodir_is_page('listing') || geodir_is_page('search')) {            

-            $term = array();

+		$post_type = geodir_get_current_posttype();

+		$listing_type_name = get_post_type_plural_label($post_type);

+		if (geodir_is_page('listing') || geodir_is_page('search')) {            

+			$term = array();

             

-            if (is_tax()) {

-                $term_id = get_queried_object_id();

-                $taxonomy = get_query_var('taxonomy');

+			if (is_tax()) {

+				$term_id = get_queried_object_id();

+				$taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

-                }

-            }

+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

+					$term = get_term($term_id, $post_type . 'category');

+				}

+			}

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

                 

-                if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

-                }

-            }

+				if (!is_array($taxonomy_search)) {

+					$term = get_term((int)$taxonomy_search, $post_type . 'category');

+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+				}

+			}

             

-            if (!empty($term) && !is_wp_error($term)) {

-                $listing_type_name = $term->name;

-            }

-        }

+			if (!empty($term) && !is_wp_error($term)) {

+				$listing_type_name = $term->name;

+			}

+		}

 

-        if ($max_page > 1 || $always_show) {            

-            // Extra pagination info

-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

-            $end_no = min($paged * $posts_per_page, $numposts);

+		if ($max_page > 1 || $always_show) {            

+			// Extra pagination info

+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;

+			$end_no = min($paged * $posts_per_page, $numposts);

 

-            if ($geodir_pagination_more_info != '') {

-                if ($listing_type_name) {

-                    $listing_type_name = __($listing_type_name, 'geodirectory');

-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

-                } else {

-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

-                }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

-                /**

-                 * Adds an extra pagination info above/under pagination.

-                 *

-                 * @since 1.5.9

-                 *

-                 * @param string $pagination_info Extra pagination info content.

-                 * @param string $listing_type_name Listing results type.

-                 * @param string $start_no First result number.

-                 * @param string $end_no Last result number.

-                 * @param string $numposts Total number of listings.

-                 * @param string $post_type The post type.

-                 */

-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

+			if ($geodir_pagination_more_info != '') {

+				if ($listing_type_name) {

+					$listing_type_name = __($listing_type_name, 'geodirectory');

+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

+				} else {

+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

+				}

+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+				/**

+				 * Adds an extra pagination info above/under pagination.

+				 *

+				 * @since 1.5.9

+				 *

+				 * @param string $pagination_info Extra pagination info content.

+				 * @param string $listing_type_name Listing results type.

+				 * @param string $start_no First result number.

+				 * @param string $end_no Last result number.

+				 * @param string $numposts Total number of listings.

+				 * @param string $post_type The post type.

+				 */

+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

-                if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

-                } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

-                }

-            }

+				if ($geodir_pagination_more_info == 'before') {

+					$before = $before . $pagination_info;

+				} else if ($geodir_pagination_more_info == 'after') {

+					$after = $pagination_info . $after;

+				}

+			}

             

-            echo "$before <div class='Navi gd-navi'>";

-            if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

-            }

-            previous_posts_link($prelabel);

-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

-                if ($i >= 1 && $i <= $max_page) {

-                    if ($i == $paged) {

-                        echo "<strong class='on'>$i</strong>";

-                    } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

-                    }

-                }

-            }

-            next_posts_link($nxtlabel, $max_page);

-            if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

-            }

-            echo "</div> $after";

-        }

+			echo "$before <div class='Navi gd-navi'>";

+			if ($paged >= ($pages_to_show - 1)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+			}

+			previous_posts_link($prelabel);

+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

+				if ($i >= 1 && $i <= $max_page) {

+					if ($i == $paged) {

+						echo "<strong class='on'>$i</strong>";

+					} else {

+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+					}

+				}

+			}

+			next_posts_link($nxtlabel, $max_page);

+			if (($paged + $half_pages_to_show) < ($max_page)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+			}

+			echo "</div> $after";

+		}

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-    }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

+	}

 }

 

 /**

@@ -492,20 +492,20 @@ 
  */

 function geodir_listingsearch_scripts()

 {

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

-        $dist = get_option('gd_search_dist');

-    } else {

-        $dist = 500;

-    }

-    $dist_dif = 1000;

-

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

-

-    ?>

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

+		$dist = get_option('gd_search_dist');

+	} else {

+		$dist = 500;

+	}

+	$dist_dif = 1000;

+

+	if ($dist <= 5000) $dist_dif = 500;

+	if ($dist <= 1000) $dist_dif = 100;

+	if ($dist <= 500) $dist_dif = 50;

+	if ($dist <= 100) $dist_dif = 10;

+	if ($dist <= 50) $dist_dif = 5;

+

+	?>

     <script type="text/javascript">

 

         jQuery(function ($) {

@@ -563,20 +563,20 @@ 
  * @package GeoDirectory

  */

 function geodir_add_sharelocation_scripts() {

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

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

 

-    $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

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

+	$default_near_text = NEAR_TEXT;

+	if (get_option('geodir_near_field_default_text'))

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

     

-    $search_location = geodir_get_default_location();

+	$search_location = geodir_get_default_location();

     

-    $default_search_for_text = addslashes(stripslashes($default_search_for_text));

-    $default_near_text = addslashes(stripslashes($default_near_text));

-    $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';

-    ?>

+	$default_search_for_text = addslashes(stripslashes($default_search_for_text));

+	$default_near_text = addslashes(stripslashes($default_near_text));

+	$city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';

+	?>

     <script type="text/javascript">

         var default_location = '<?php echo $city ;?>';

         var latlng;

@@ -668,14 +668,14 @@ 
                     initialise2();

                 } else {

                     <?php

-                    $near_add = get_option('geodir_search_near_addition');

-                    /**

-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.

-                     *

-                     * @since 1.0.0

-                     */

-                    $near_add2 = apply_filters('geodir_search_near_addition', '');

-                    ?>

+					$near_add = get_option('geodir_search_near_addition');

+					/**

+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.

+					 *

+					 * @since 1.0.0

+					 */

+					$near_add2 = apply_filters('geodir_search_near_addition', '');

+					?>

                     if (window.gdMaps === 'google') {

                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

                             function (results, status) {

@@ -789,32 +789,32 @@ 
  */

 function geodir_show_badges_on_image($which, $post, $link)

 {

-    $return = '';

-    switch ($which) {

-        case 'featured':

-            /**

-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

-            break;

-        case 'new' :

-            /**

-             * Filter the new image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

-            break;

-

-    }

+	$return = '';

+	switch ($which) {

+		case 'featured':

+			/**

+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+			break;

+		case 'new' :

+			/**

+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+			break;

+

+	}

     

-    return $return;

+	return $return;

 }

 

 /**

@@ -823,8 +823,8 @@ 
  * @since 1.6.22

  */

 function geodir_fix_script_conflict() {

-    if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {

-        wp_dequeue_script( 'flexslider' );

-    }

+	if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {

+		wp_dequeue_script( 'flexslider' );

+	}

 }

 add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 );
\ No newline at end of file

Spacing +79 added lines, -79 removed lines

@@ -39,21 +39,21 @@ 
     $is_detail_page = false;

     $geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

     wp_enqueue_script('jquery');

 

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-script');

 

     $geodir_vars_data = array(

         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0, // fix rtl issue

 		'lightBox_txtImage' => addslashes(__('Image', 'geodirectory')),

 		'lightBox_txtOf' => addslashes(__('of', 'geodirectory')),

@@ -76,24 +76,24 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

         wp_enqueue_script('geodirectory-jquery-simplemodal');

     }

 

     if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

+        $map_lang = "&language=".geodir_get_map_default_language();

+        $map_key = "&key=".geodir_get_map_api_key();

         /**

          * Filter the variables that are added to the end of the google maps script call.

          *

@@ -103,55 +103,55 @@ 
          * @param string $var The string to filter, default is empty string.

          */

         $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+        wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

         

         // Overlapping Marker Spiderfier

-        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-g-overlappingmarker-script');

     }

     

     if ($geodir_map_name == 'osm') {

         // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-geo-script');

         

         if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-routing-script');

         }

         

         // Overlapping Marker Spiderfier Leaflet

-        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-o-overlappingmarker-script');

     }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+    wp_enqueue_script('jquery-ui-autocomplete');

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-goMap-script');

 

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('chosen');

 

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-choose-ajax');

 

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

 

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

         // SCRIPT FOR UPLOAD

         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-plupload-script');

         // SCRIPT FOR UPLOAD END

 

@@ -198,27 +198,27 @@ 
 

         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');

     } // End if for add place page

 

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

     // font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

 	} else { // default rating script

-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('google-geometa');

 }

 

@@ -233,7 +233,7 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';

     echo stripslashes(get_option('geodir_header_scripts'));

 }

 

@@ -247,7 +247,7 @@ 
  */

 function geodir_google_analytics_tracking_code()

 {

-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

+    if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>

 

         <script>

             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -255,14 +255,14 @@ 
                 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

             })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

 

-            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');

-            <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?>

+            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');

+            <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?>

             ga('send', 'pageview');

 

         </script>

 

         <?php

-    }elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+    }elseif (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {

         echo stripslashes(get_option('geodir_ga_tracking_code'));

     }

 }

@@ -285,7 +285,7 @@ 
      *

      * Flexbox wont wrap on ios for search form items

      */

-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+    if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {

         echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

     }

 }

@@ -301,7 +301,7 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

@@ -319,12 +319,12 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+    if (is_rtl()) {

+    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodirectory-frontend-rtl-style');

     }

 

@@ -333,7 +333,7 @@ 
 

     wp_register_script('font-awesome', 'https://use.fontawesome.com/releases/v5.4.1/js/all.js', array('font-awesome-shim'), GEODIRECTORY_VERSION);

     wp_register_script('font-awesome-shim', 'https://use.fontawesome.com/releases/v5.4.1/js/v4-shims.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script( 'font-awesome' );

+    wp_enqueue_script('font-awesome');

 

 

 }

@@ -402,18 +402,18 @@ 
                 $term_id = get_queried_object_id();

                 $taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {

+                    $term = get_term($term_id, $post_type.'category');

                 }

             }

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {

+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];

                 

                 if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+                    $term = get_term((int) $taxonomy_search, $post_type.'category');

+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');

                 }

             }

             

@@ -425,7 +425,7 @@ 
         if ($max_page > 1 || $always_show) {            

             // Extra pagination info

             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $start_no = ($paged - 1) * $posts_per_page + 1;

             $end_no = min($paged * $posts_per_page, $numposts);

 

             if ($geodir_pagination_more_info != '') {

@@ -435,7 +435,7 @@ 
                 } else {

                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

                 }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';

                 /**

                  * Adds an extra pagination info above/under pagination.

                  *

@@ -451,15 +451,15 @@ 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

                 if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

+                    $before = $before.$pagination_info;

                 } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

+                    $after = $pagination_info.$after;

                 }

             }

             

             echo "$before <div class='Navi gd-navi'>";

             if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';

             }

             previous_posts_link($prelabel);

             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -467,13 +467,13 @@ 
                     if ($i == $paged) {

                         echo "<strong class='on'>$i</strong>";

                     } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';

                     }

                 }

             }

             next_posts_link($nxtlabel, $max_page);

             if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';

             }

             echo "</div> $after";

         }

@@ -511,7 +511,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -578,7 +578,7 @@ 
     $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';

     ?>

     <script type="text/javascript">

-        var default_location = '<?php echo $city ;?>';

+        var default_location = '<?php echo $city; ?>';

         var latlng;

         var address;

         var dist = 0;

@@ -594,7 +594,7 @@ 
 				var $form = jQuery(this).closest('form');

 

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -608,7 +608,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 

                     // OSM can't handel post code with no space so we test for it and add one if needed

                     if(window.gdMaps === 'osm'){

@@ -637,7 +637,7 @@ 
         });

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -656,15 +656,15 @@ 
             // Call the geocode function

             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

             } else {

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

                     <?php

@@ -677,21 +677,21 @@ 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');

                     ?>

                     if (window.gdMaps === 'google') {

-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},

                             function (results, status) {

                                 if (status == google.maps.GeocoderStatus.OK) {

                                     updateSearchPosition(results[0].geometry.location, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);

+                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);

                                 }

                             });

                     } else if (window.gdMaps === 'osm') {

-                        geocodePositionOSM(false, address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>, false, false,

+                        geocodePositionOSM(false, address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>, false, false,

                             function(geo) {

                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {

                                     updateSearchPosition(geo, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");

+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");

                                 }

                             });

                     } else {

@@ -737,19 +737,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

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

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

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

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }

@@ -823,8 +823,8 @@ 
  * @since 1.6.22

  */

 function geodir_fix_script_conflict() {

-    if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {

-        wp_dequeue_script( 'flexslider' );

+    if (wp_script_is('flexslider', 'enqueued') && wp_script_is('geodirectory-jquery-flexslider-js', 'enqueued')) {

+        wp_dequeue_script('flexslider');

     }

 }

-add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 );
\ No newline at end of file
+add_action('wp_enqueue_scripts', 'geodir_fix_script_conflict', 100);
\ No newline at end of file

geodirectory-admin/dummy-data/property_rent.php

Indentation +872 added lines, -872 removed lines

@@ -7,452 +7,452 @@ 
  */
 
 function geodir_property_rent_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // price
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Price', 'geodirectory'),
-                      'site_title'          =>  __('Price', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the price per calendar month (PCM)in $ (no currency symbol)', 'geodirectory'),
-                      'htmlvar_name'        =>  'price',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-dollar-sign',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-    // property status
-    $fields[] = array('listing_type' => $post_type,
-                      'data_type' => 'VARCHAR',
-                      'field_type' => 'select',
-                      'field_type_key' => 'property_status',
-                      'is_active' => 1,
-                      'for_admin_use' => 0,
-                      'is_default' => 0,
-                      'admin_title' => __('Property Status', 'geodirectory'),
-                      'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
-                      'site_title' => __('Property Status', 'geodirectory'),
-                      'htmlvar_name' => 'property_status',
-                      'default_value' => '',
-                      'is_required' => '1',
-                      'required_msg' => '',
-                      'show_in'   =>  '[detail],[listing]',
-                      'show_on_pkg' => $package,
-                      'option_values' => 'Select Status/,For Rent,Let,Under Offer',
-                      'field_icon' => 'fas fa-home',
-                      'css_class' => '',
-                      'cat_sort' => 1,
-                      'cat_filter' => 1,
-    );
-
-    // property furnishing
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Furnishing', 'geodirectory'),
-                      'site_title'          =>  __('Furnishing', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_furnishing',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-th-large',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Type', 'geodirectory'),
-                      'site_title'          =>  __('Property Type', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-home',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bedrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bedrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bedrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-bed',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bathrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bathrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bathrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-bold',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property area
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'INT',
-                      'admin_title'         =>  __('Property Area', 'geodirectory'),
-                      'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
-                      'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-chart-area',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property features
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'multiselect',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Features', 'geodirectory'),
-                      'site_title'          =>  __('Features', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_features',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'option_values'       =>  __('Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-plus-square',
-                      'css_class'           =>  'gd-comma-list',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_rent_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// price
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Price', 'geodirectory'),
+					  'site_title'          =>  __('Price', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the price per calendar month (PCM)in $ (no currency symbol)', 'geodirectory'),
+					  'htmlvar_name'        =>  'price',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-dollar-sign',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+	// property status
+	$fields[] = array('listing_type' => $post_type,
+					  'data_type' => 'VARCHAR',
+					  'field_type' => 'select',
+					  'field_type_key' => 'property_status',
+					  'is_active' => 1,
+					  'for_admin_use' => 0,
+					  'is_default' => 0,
+					  'admin_title' => __('Property Status', 'geodirectory'),
+					  'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
+					  'site_title' => __('Property Status', 'geodirectory'),
+					  'htmlvar_name' => 'property_status',
+					  'default_value' => '',
+					  'is_required' => '1',
+					  'required_msg' => '',
+					  'show_in'   =>  '[detail],[listing]',
+					  'show_on_pkg' => $package,
+					  'option_values' => 'Select Status/,For Rent,Let,Under Offer',
+					  'field_icon' => 'fas fa-home',
+					  'css_class' => '',
+					  'cat_sort' => 1,
+					  'cat_filter' => 1,
+	);
+
+	// property furnishing
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Furnishing', 'geodirectory'),
+					  'site_title'          =>  __('Furnishing', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_furnishing',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-th-large',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Type', 'geodirectory'),
+					  'site_title'          =>  __('Property Type', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-home',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bedrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bedrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bedrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-bed',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bathrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bathrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bathrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-bold',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property area
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'INT',
+					  'admin_title'         =>  __('Property Area', 'geodirectory'),
+					  'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
+					  'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-chart-area',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property features
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'multiselect',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Features', 'geodirectory'),
+					  'site_title'          =>  __('Features', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_features',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'option_values'       =>  __('Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-plus-square',
+					  'css_class'           =>  'gd-comma-list',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_rent_custom_fields', $fields);
+
+	return  $fields;
 }
 
 function geodir_property_rent_custom_fields_sort($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // price sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_price',
-        'site_title'              => __('Price','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Price (lowest first)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Price (highest first)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    // area sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_property_area',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Area (smallest first)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Area (largest first)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    // bedrooms sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Bedrooms (least)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Bedrooms (most)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields_sort', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// price sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_price',
+		'site_title'              => __('Price','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Price (lowest first)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Price (highest first)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	// area sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_property_area',
+		'site_title'              => __('Area (Sq Ft)','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Area (smallest first)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Area (largest first)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	// bedrooms sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'site_title'              => __('Area (Sq Ft)','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Bedrooms (least)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Bedrooms (most)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields_sort', $fields);
+
+	return $fields;
 
 }
 
 function geodir_property_rent_custom_fields_advanced_search($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // Price range
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => 'RANGE',
-        'is_active'               => 1,
-        'site_field_title'        => 'Price',
-        'field_data_type'         => 'FLOAT',
-        'main_search'             => 1,
-        'main_search_priority'    => 15,
-        'data_type_change'        => 'SELECT',
-        'search_condition_select' => 'SINGLE',
-        'search_min_value'        => '1000',
-        'search_max_value'        => '10000',
-        'search_diff_value'       => '1000',
-        'first_search_value'      => '0',
-        'first_search_text'       => '',
-        'last_search_text'        => '',
-        'search_condition'        => 'SELECT',
-        'site_htmlvar_name'       => 'geodir_price',
-        'htmlvar_name'            => 'geodir_price',
-        'field_title'             => 'geodir_price',
-        'expand_custom_value'     => '',
-        'front_search_title'      => 'Price Range pm',
-        'field_desc'              => ''
-    );
-
-    // bedrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bedrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 1,
-        'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bedrooms',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'field_title'             => 'geodir_property_bedrooms',
-        'front_search_title'      => 'Bedrooms',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property type
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Type',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_type',
-        'htmlvar_name'            => 'geodir_property_type',
-        'field_title'             => 'geodir_property_type',
-        'front_search_title'      => 'Property Type',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Features
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'multiselect',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Features',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_features',
-        'htmlvar_name'            => 'geodir_property_features',
-        'field_title'             => 'geodir_property_features',
-        'front_search_title'      => 'Property Features',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'AND'
-    );
-
-    // Property Bathrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bathrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bathrooms',
-        'htmlvar_name'            => 'geodir_property_bathrooms',
-        'field_title'             => 'geodir_property_bathrooms',
-        'front_search_title'      => 'Bathrooms',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Furnishing
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Furnishing',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_furnishing',
-        'htmlvar_name'            => 'geodir_property_furnishing',
-        'field_title'             => 'geodir_property_furnishing',
-        'front_search_title'      => 'Furnishing',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Status
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Status',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_status',
-        'htmlvar_name'            => 'geodir_property_status',
-        'field_title'             => 'geodir_property_status',
-        'front_search_title'      => 'Property Status',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_rent_custom_fields_advanced_search', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// Price range
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => 'RANGE',
+		'is_active'               => 1,
+		'site_field_title'        => 'Price',
+		'field_data_type'         => 'FLOAT',
+		'main_search'             => 1,
+		'main_search_priority'    => 15,
+		'data_type_change'        => 'SELECT',
+		'search_condition_select' => 'SINGLE',
+		'search_min_value'        => '1000',
+		'search_max_value'        => '10000',
+		'search_diff_value'       => '1000',
+		'first_search_value'      => '0',
+		'first_search_text'       => '',
+		'last_search_text'        => '',
+		'search_condition'        => 'SELECT',
+		'site_htmlvar_name'       => 'geodir_price',
+		'htmlvar_name'            => 'geodir_price',
+		'field_title'             => 'geodir_price',
+		'expand_custom_value'     => '',
+		'front_search_title'      => 'Price Range pm',
+		'field_desc'              => ''
+	);
+
+	// bedrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bedrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 1,
+		'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bedrooms',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'field_title'             => 'geodir_property_bedrooms',
+		'front_search_title'      => 'Bedrooms',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property type
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Type',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_type',
+		'htmlvar_name'            => 'geodir_property_type',
+		'field_title'             => 'geodir_property_type',
+		'front_search_title'      => 'Property Type',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Features
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'multiselect',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Features',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_features',
+		'htmlvar_name'            => 'geodir_property_features',
+		'field_title'             => 'geodir_property_features',
+		'front_search_title'      => 'Property Features',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'AND'
+	);
+
+	// Property Bathrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bathrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bathrooms',
+		'htmlvar_name'            => 'geodir_property_bathrooms',
+		'field_title'             => 'geodir_property_bathrooms',
+		'front_search_title'      => 'Bathrooms',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Furnishing
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Furnishing',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_furnishing',
+		'htmlvar_name'            => 'geodir_property_furnishing',
+		'field_title'             => 'geodir_property_furnishing',
+		'front_search_title'      => 'Furnishing',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Status
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Status',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_status',
+		'htmlvar_name'            => 'geodir_property_status',
+		'field_title'             => 'geodir_property_status',
+		'front_search_title'      => 'Property Status',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_rent_custom_fields_advanced_search', $fields);
+
+	return $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -462,52 +462,52 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
-
-    // add the dummy custom fields
-    $fields = geodir_property_rent_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-
-    // add sort order items
-    $sort_fields = geodir_property_rent_custom_fields_sort($post_type);
-    foreach($sort_fields as $sort){
-        geodir_custom_sort_field_save($sort);
-    }
-
-    // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_rent');
-
-    // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
-        $search_fields = geodir_property_rent_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
-        }
-    }
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
+
+	// add the dummy custom fields
+	$fields = geodir_property_rent_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+
+	// add sort order items
+	$sort_fields = geodir_property_rent_custom_fields_sort($post_type);
+	foreach($sort_fields as $sort){
+		geodir_custom_sort_field_save($sort);
+	}
+
+	// update the type currently installed
+	update_option($post_type.'_dummy_data_type','property_rent');
+
+	// add the advanced search fields
+	if (defined('GEODIRADVANCESEARCH_VERSION')){
+		$search_fields = geodir_property_rent_custom_fields_advanced_search($post_type);
+		foreach($search_fields as $sfield){
+			geodir_custom_advance_search_field_save( $sfield );
+		}
+	}
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'https://wpgeodirectory.com/dummy';
+	$dummy_image_url = 'https://wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -516,42 +516,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1750',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1750',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -561,42 +561,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1150',
-            "geodir_property_status" => 'Let',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1150',
+			"geodir_property_status" => 'Let',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -606,43 +606,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1300',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1300',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -652,42 +652,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '13000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '13000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -697,42 +697,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1800',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1800',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -742,42 +742,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2700',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2700',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -787,42 +787,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1450',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1450',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -832,43 +832,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2000',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2000',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -878,39 +878,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '60000',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '60000',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -920,93 +920,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '800',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '800',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

geodirectory-admin/dummy-data/property_sale.php

Indentation +873 added lines, -873 removed lines

@@ -7,453 +7,453 @@ 
  */
 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // price
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Price', 'geodirectory'),
-                      'site_title'          =>  __('Price', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the price in $ (no currency symbol)', 'geodirectory'),
-                      'htmlvar_name'        =>  'price',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-dollar-sign',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-    // property status
-    $fields[] = array('listing_type' => $post_type,
-                      'data_type' => 'VARCHAR',
-                      'field_type' => 'select',
-                      'field_type_key' => 'property_status',
-                      'is_active' => 1,
-                      'for_admin_use' => 0,
-                      'is_default' => 0,
-                      'admin_title' => __('Property Status', 'geodirectory'),
-                      'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
-                      'site_title' => __('Property Status', 'geodirectory'),
-                      'htmlvar_name' => 'property_status',
-                      'default_value' => '',
-                      'is_required' => '1',
-                      'required_msg' => '',
-                      'show_in'   =>  '[detail],[listing]',
-                      'show_on_pkg' => $package,
-                      'option_values' => 'Select Status/,For Sale,Sold,Under Offer',
-                      'field_icon' => 'fas fa-home',
-                      'css_class' => '',
-                      'cat_sort' => 1,
-                      'cat_filter' => 1,
-    );
-
-    // property furnishing
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Furnishing', 'geodirectory'),
-                      'site_title'          =>  __('Furnishing', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_furnishing',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-th-large',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Type', 'geodirectory'),
-                      'site_title'          =>  __('Property Type', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-home',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bedrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bedrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bedrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-bed',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bathrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bathrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bathrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-bold',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property area
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'INT',
-                      'admin_title'         =>  __('Property Area', 'geodirectory'),
-                      'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
-                      'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-chart-area',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property features
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'multiselect',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Features', 'geodirectory'),
-                      'site_title'          =>  __('Features', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_features',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'option_values'       =>  __('Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-plus-square',
-                      'css_class'           =>  'gd-comma-list',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// price
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Price', 'geodirectory'),
+					  'site_title'          =>  __('Price', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the price in $ (no currency symbol)', 'geodirectory'),
+					  'htmlvar_name'        =>  'price',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-dollar-sign',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+	// property status
+	$fields[] = array('listing_type' => $post_type,
+					  'data_type' => 'VARCHAR',
+					  'field_type' => 'select',
+					  'field_type_key' => 'property_status',
+					  'is_active' => 1,
+					  'for_admin_use' => 0,
+					  'is_default' => 0,
+					  'admin_title' => __('Property Status', 'geodirectory'),
+					  'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
+					  'site_title' => __('Property Status', 'geodirectory'),
+					  'htmlvar_name' => 'property_status',
+					  'default_value' => '',
+					  'is_required' => '1',
+					  'required_msg' => '',
+					  'show_in'   =>  '[detail],[listing]',
+					  'show_on_pkg' => $package,
+					  'option_values' => 'Select Status/,For Sale,Sold,Under Offer',
+					  'field_icon' => 'fas fa-home',
+					  'css_class' => '',
+					  'cat_sort' => 1,
+					  'cat_filter' => 1,
+	);
+
+	// property furnishing
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Furnishing', 'geodirectory'),
+					  'site_title'          =>  __('Furnishing', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_furnishing',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-th-large',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Type', 'geodirectory'),
+					  'site_title'          =>  __('Property Type', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-home',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bedrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bedrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bedrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-bed',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bathrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bathrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bathrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-bold',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property area
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'INT',
+					  'admin_title'         =>  __('Property Area', 'geodirectory'),
+					  'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
+					  'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-chart-area',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property features
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'multiselect',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Features', 'geodirectory'),
+					  'site_title'          =>  __('Features', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_features',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'option_values'       =>  __('Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-plus-square',
+					  'css_class'           =>  'gd-comma-list',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
+
+	return  $fields;
 }
 
 function geodir_property_sale_custom_fields_sort($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // price sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_price',
-        'site_title'              => __('Price','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Price (lowest first)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Price (highest first)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    // area sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_property_area',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Area (smallest first)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Area (largest first)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    // bedrooms sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Bedrooms (least)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Bedrooms (most)','geodirectory'),
-        'is_active'               => 1
-    );
-
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields_sort', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// price sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_price',
+		'site_title'              => __('Price','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Price (lowest first)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Price (highest first)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	// area sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_property_area',
+		'site_title'              => __('Area (Sq Ft)','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Area (smallest first)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Area (largest first)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	// bedrooms sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'site_title'              => __('Area (Sq Ft)','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Bedrooms (least)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Bedrooms (most)','geodirectory'),
+		'is_active'               => 1
+	);
+
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields_sort', $fields);
+
+	return $fields;
 
 }
 
 function geodir_property_sale_custom_fields_advanced_search($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // price range
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => 'RANGE',
-        'is_active'               => 1,
-        'site_field_title'        => 'Price',
-        'field_data_type'         => 'FLOAT',
-        'main_search'             => 1,
-        'main_search_priority'    => 15,
-        'data_type_change'        => 'SELECT',
-        'search_condition_select' => 'SINGLE',
-        'search_min_value'        => '50000',
-        'search_max_value'        => '1000000',
-        'search_diff_value'       => '100000',
-        'first_search_value'      => '0',
-        'first_search_text'       => '',
-        'last_search_text'        => '',
-        'search_condition'        => 'SELECT',
-        'site_htmlvar_name'       => 'geodir_price',
-        'htmlvar_name'            => 'geodir_price',
-        'field_title'             => 'geodir_price',
-        'expand_custom_value'     => '',
-        'front_search_title'      => 'Price Range',
-        'field_desc'              => ''
-    );
-
-    // bedrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bedrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 1,
-        'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bedrooms',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'field_title'             => 'geodir_property_bedrooms',
-        'front_search_title'      => 'Bedrooms',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property type
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Type',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_type',
-        'htmlvar_name'            => 'geodir_property_type',
-        'field_title'             => 'geodir_property_type',
-        'front_search_title'      => 'Property Type',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Features
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'multiselect',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Features',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_features',
-        'htmlvar_name'            => 'geodir_property_features',
-        'field_title'             => 'geodir_property_features',
-        'front_search_title'      => 'Property Features',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'AND'
-    );
-
-    // Property Bathrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bathrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bathrooms',
-        'htmlvar_name'            => 'geodir_property_bathrooms',
-        'field_title'             => 'geodir_property_bathrooms',
-        'front_search_title'      => 'Bathrooms',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Furnishing
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Furnishing',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_furnishing',
-        'htmlvar_name'            => 'geodir_property_furnishing',
-        'field_title'             => 'geodir_property_furnishing',
-        'front_search_title'      => 'Furnishing',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Status
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Status',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_status',
-        'htmlvar_name'            => 'geodir_property_status',
-        'field_title'             => 'geodir_property_status',
-        'front_search_title'      => 'Property Status',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields_advanced_search', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// price range
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => 'RANGE',
+		'is_active'               => 1,
+		'site_field_title'        => 'Price',
+		'field_data_type'         => 'FLOAT',
+		'main_search'             => 1,
+		'main_search_priority'    => 15,
+		'data_type_change'        => 'SELECT',
+		'search_condition_select' => 'SINGLE',
+		'search_min_value'        => '50000',
+		'search_max_value'        => '1000000',
+		'search_diff_value'       => '100000',
+		'first_search_value'      => '0',
+		'first_search_text'       => '',
+		'last_search_text'        => '',
+		'search_condition'        => 'SELECT',
+		'site_htmlvar_name'       => 'geodir_price',
+		'htmlvar_name'            => 'geodir_price',
+		'field_title'             => 'geodir_price',
+		'expand_custom_value'     => '',
+		'front_search_title'      => 'Price Range',
+		'field_desc'              => ''
+	);
+
+	// bedrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bedrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 1,
+		'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bedrooms',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'field_title'             => 'geodir_property_bedrooms',
+		'front_search_title'      => 'Bedrooms',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property type
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Type',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_type',
+		'htmlvar_name'            => 'geodir_property_type',
+		'field_title'             => 'geodir_property_type',
+		'front_search_title'      => 'Property Type',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Features
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'multiselect',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Features',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_features',
+		'htmlvar_name'            => 'geodir_property_features',
+		'field_title'             => 'geodir_property_features',
+		'front_search_title'      => 'Property Features',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'AND'
+	);
+
+	// Property Bathrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bathrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bathrooms',
+		'htmlvar_name'            => 'geodir_property_bathrooms',
+		'field_title'             => 'geodir_property_bathrooms',
+		'front_search_title'      => 'Bathrooms',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Furnishing
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Furnishing',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_furnishing',
+		'htmlvar_name'            => 'geodir_property_furnishing',
+		'field_title'             => 'geodir_property_furnishing',
+		'front_search_title'      => 'Furnishing',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Status
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Status',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_status',
+		'htmlvar_name'            => 'geodir_property_status',
+		'field_title'             => 'geodir_property_status',
+		'front_search_title'      => 'Property Status',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields_advanced_search', $fields);
+
+	return $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -463,52 +463,52 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
-
-    // add the dummy custom fields
-    $fields = geodir_property_sale_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-
-    // add sort order items
-    $sort_fields = geodir_property_sale_custom_fields_sort($post_type);
-    foreach($sort_fields as $sort){
-        geodir_custom_sort_field_save($sort);
-    }
-
-    // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_sale');
-
-    // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
-        $search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
-        }
-    }
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
+
+	// add the dummy custom fields
+	$fields = geodir_property_sale_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+
+	// add sort order items
+	$sort_fields = geodir_property_sale_custom_fields_sort($post_type);
+	foreach($sort_fields as $sort){
+		geodir_custom_sort_field_save($sort);
+	}
+
+	// update the type currently installed
+	update_option($post_type.'_dummy_data_type','property_sale');
+
+	// add the advanced search fields
+	if (defined('GEODIRADVANCESEARCH_VERSION')){
+		$search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
+		foreach($search_fields as $sfield){
+			geodir_custom_advance_search_field_save( $sfield );
+		}
+	}
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'https://wpgeodirectory.com/dummy';
+	$dummy_image_url = 'https://wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -517,42 +517,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '350000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '350000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -562,42 +562,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '230000',
-            "geodir_property_status" => 'Sold',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '230000',
+			"geodir_property_status" => 'Sold',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -607,43 +607,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '260000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '260000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -653,42 +653,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2300000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2300000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -698,42 +698,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '330000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '330000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -743,42 +743,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '530000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '530000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -788,42 +788,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '245000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '245000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -833,43 +833,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '395000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '395000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -879,39 +879,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '12500000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '12500000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -921,93 +921,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '80000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '80000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

geodirectory-admin/dummy-data/recruitment_jobs.php

Indentation +646 added lines, -646 removed lines

@@ -7,232 +7,232 @@ 
  */
 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // Salary
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Salary', 'geodirectory'),
-                      'site_title'          =>  __('Salary', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
-                      'htmlvar_name'        =>  'salary',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-dollar-sign',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-
-
-    // Job Type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Type', 'geodirectory'),
-                      'site_title'          =>  __('Job Type','geodirectory'),
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
-                      'htmlvar_name'        =>  'job_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-briefcase',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // Job Sector
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
-                      'site_title'          =>  __('Job Sector','geodirectory'),
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
-                      'htmlvar_name'        =>  'job_sector',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	          =>  '[detail]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-briefcase',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	      =>  true
-    );
-
-    // Required Experience
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Required Experience', 'geodirectory'),
-                      'site_title'          =>  __('Required Experience', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_experience',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'far fa-life-ring',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // Required Skills
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'textarea',
-                      'data_type'           =>  'TEXT',
-                      'admin_title'         =>  __('Required Skills', 'geodirectory'),
-                      'site_title'          =>  __('Required Skills', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-chart-area',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    // Company details fieldset
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'fieldset',
-                      'data_type'           =>  '',
-                      'admin_title'         =>  __('Company Details', 'geodirectory'),
-                      'site_title'          =>  __('Company Details', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_details',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'show_in' 	        =>  '[owntab]'
-
-    );
-
-    // Company Name
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Company Name', 'geodirectory'),
-                      'site_title'          =>  __('Company Name', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_name',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false
-    );
-
-    // Company Logo
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'file',
-                      'data_type'           =>  '',
-                      'admin_title'         =>  __('Company Logo', 'geodirectory'),
-                      'site_title'          =>  __('Company Logo', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_logo',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false,
-                      'extra'               =>  array(
-                          'gd_file_types'   =>  'jpg',
-                          'gd_file_types'   =>  'jpeg',
-                          'gd_file_types'   =>  'gif',
-                          'gd_file_types'   =>  'png',
-                      )
-    );
-
-    // Company Url
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'url',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Company Url', 'geodirectory'),
-                      'site_title'          =>  __('Company Url', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_url',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fas fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// Salary
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Salary', 'geodirectory'),
+					  'site_title'          =>  __('Salary', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
+					  'htmlvar_name'        =>  'salary',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-dollar-sign',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+
+
+	// Job Type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Job Type', 'geodirectory'),
+					  'site_title'          =>  __('Job Type','geodirectory'),
+					  'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+					  'htmlvar_name'        =>  'job_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-briefcase',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// Job Sector
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Job Sector','geodirectory'),
+					  'site_title'          =>  __('Job Sector','geodirectory'),
+					  'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+					  'htmlvar_name'        =>  'job_sector',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	          =>  '[detail]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-briefcase',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	      =>  true
+	);
+
+	// Required Experience
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Required Experience', 'geodirectory'),
+					  'site_title'          =>  __('Required Experience', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_experience',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'far fa-life-ring',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// Required Skills
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'textarea',
+					  'data_type'           =>  'TEXT',
+					  'admin_title'         =>  __('Required Skills', 'geodirectory'),
+					  'site_title'          =>  __('Required Skills', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-chart-area',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	// Company details fieldset
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'fieldset',
+					  'data_type'           =>  '',
+					  'admin_title'         =>  __('Company Details', 'geodirectory'),
+					  'site_title'          =>  __('Company Details', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_details',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'show_in' 	        =>  '[owntab]'
+
+	);
+
+	// Company Name
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Company Name', 'geodirectory'),
+					  'site_title'          =>  __('Company Name', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_name',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false
+	);
+
+	// Company Logo
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'file',
+					  'data_type'           =>  '',
+					  'admin_title'         =>  __('Company Logo', 'geodirectory'),
+					  'site_title'          =>  __('Company Logo', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_logo',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false,
+					  'extra'               =>  array(
+						  'gd_file_types'   =>  'jpg',
+						  'gd_file_types'   =>  'jpeg',
+						  'gd_file_types'   =>  'gif',
+						  'gd_file_types'   =>  'png',
+					  )
+	);
+
+	// Company Url
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'url',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Company Url', 'geodirectory'),
+					  'site_title'          =>  __('Company Url', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_url',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fas fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
+
+	return  $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -242,36 +242,36 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
 
-    // add the dummy custom fields
-    $fields = geodir_property_sale_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-    update_option($post_type.'_dummy_data_type','property_sale');
+	// add the dummy custom fields
+	$fields = geodir_property_sale_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+	update_option($post_type.'_dummy_data_type','property_sale');
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'http://wpgeodirectory.com/dummy';
+	$dummy_image_url = 'http://wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -280,42 +280,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '350000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '350000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -325,42 +325,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '230000',
-            "geodir_property_status" => 'Sold',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '230000',
+			"geodir_property_status" => 'Sold',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -370,43 +370,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '260000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '260000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -416,42 +416,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2300000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2300000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -461,42 +461,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '330000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '330000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -506,42 +506,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '530000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '530000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -551,42 +551,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '245000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '245000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -596,43 +596,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '395000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '395000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -642,39 +642,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '12500000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '12500000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -684,93 +684,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '80000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '80000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }