GeoDirectory / geodirectory

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'          =>  'fa fa-usd',
-                      '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' => 'fa 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'          =>  'fa 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'          =>  'fa 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'          =>  'fa 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'          =>  'fa 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'          =>  'fa fa-area-chart',
-                      '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'          =>  'fa 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'          =>  'fa fa-usd',
+					  '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' => 'fa 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'          =>  'fa 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'          =>  'fa 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'          =>  'fa 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'          =>  'fa 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'          =>  'fa fa-area-chart',
+					  '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'          =>  'fa 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;
 }

Spacing +27 added lines, -27 removed lines

@@ -6,9 +6,9 @@ 
  * @package GeoDirectory
  */
 
-function geodir_property_rent_custom_fields($post_type='gd_place',$package_id=''){
+function geodir_property_rent_custom_fields($post_type = 'gd_place', $package_id = '') {
     $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
+    $package = ($package_id == '') ? '' : array($package_id);
 
     // price
     $fields[] = array('listing_type' => $post_type,
@@ -78,7 +78,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -101,7 +101,7 @@ 
                       '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'),
+                      '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'        =>  '',
@@ -124,7 +124,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -147,7 +147,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -192,7 +192,7 @@ 
                       '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'),
+                      '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'        =>  '',
@@ -215,7 +215,7 @@ 
     return  $fields;
 }
 
-function geodir_property_rent_custom_fields_sort($post_type='gd_place') {
+function geodir_property_rent_custom_fields_sort($post_type = 'gd_place') {
 
 
     $fields = array();
@@ -227,11 +227,11 @@ 
         'field_type'              => 'text',
         'data_type'               => '',
         'htmlvar_name'            => 'geodir_price',
-        'site_title'              => __('Price','geodirectory'),
+        'site_title'              => __('Price', 'geodirectory'),
         'asc'                     => 1,
-        'asc_title'               => __('Price (lowest first)','geodirectory'),
+        'asc_title'               => __('Price (lowest first)', 'geodirectory'),
         'desc'                    => 1,
-        'desc_title'              => __('Price (highest first)','geodirectory'),
+        'desc_title'              => __('Price (highest first)', 'geodirectory'),
         'is_active'               => 1
     );
 
@@ -242,11 +242,11 @@ 
         'field_type'              => 'text',
         'data_type'               => '',
         'htmlvar_name'            => 'geodir_property_area',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
+        'site_title'              => __('Area (Sq Ft)', 'geodirectory'),
         'asc'                     => 1,
-        'asc_title'               => __('Area (smallest first)','geodirectory'),
+        'asc_title'               => __('Area (smallest first)', 'geodirectory'),
         'desc'                    => 1,
-        'desc_title'              => __('Area (largest first)','geodirectory'),
+        'desc_title'              => __('Area (largest first)', 'geodirectory'),
         'is_active'               => 1
     );
 
@@ -257,11 +257,11 @@ 
         'field_type'              => 'select',
         'data_type'               => '',
         'htmlvar_name'            => 'geodir_property_bedrooms',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
+        'site_title'              => __('Area (Sq Ft)', 'geodirectory'),
         'asc'                     => 1,
-        'asc_title'               => __('Bedrooms (least)','geodirectory'),
+        'asc_title'               => __('Bedrooms (least)', 'geodirectory'),
         'desc'                    => 1,
-        'desc_title'              => __('Bedrooms (most)','geodirectory'),
+        'desc_title'              => __('Bedrooms (most)', 'geodirectory'),
         'is_active'               => 1
     );
 
@@ -277,7 +277,7 @@ 
 
 }
 
-function geodir_property_rent_custom_fields_advanced_search($post_type='gd_place') {
+function geodir_property_rent_custom_fields_advanced_search($post_type = 'gd_place') {
 
 
     $fields = array();
@@ -455,15 +455,15 @@ 
     return $fields;
 }
 
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
 $post_info = array();
 $image_array = array();
 $post_meta = array();
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
-if($dummy_post_index==1){
+if ($dummy_post_index == 1) {
     // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+    geodir_dummy_data_taxonomies($post_type, $category_array);
 
     // add the dummy custom fields
     $fields = geodir_property_rent_custom_fields($post_type);
@@ -471,24 +471,24 @@ 
 
     // add sort order items
     $sort_fields = geodir_property_rent_custom_fields_sort($post_type);
-    foreach($sort_fields as $sort){
+    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');
+    update_option($post_type.'_dummy_data_type', 'property_rent');
 
     // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
+    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 );
+        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';
 

Braces +13 added lines, -10 removed lines

@@ -488,10 +488,11 @@ 
     }
 }
 
-if (geodir_dummy_folder_exists())
+if (geodir_dummy_folder_exists()) {
     $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
-else
+} else {
     $dummy_image_url = 'https://wpgeodirectory.com/dummy';
+}
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
@@ -948,16 +949,18 @@ 
 
 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));
+    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');
     

geodirectory-admin/admin_dummy_data_functions.php

Indentation +232 added lines, -232 removed lines

@@ -19,151 +19,151 @@ 
  * @global string $dummy_image_path The dummy image path.
  */
 function geodir_dummy_data_taxonomies($post_type,$category_array) {
-    global $wpdb, $dummy_image_path;
+	global $wpdb, $dummy_image_path;
 
 
 
-    $last_catid = '';
+	$last_catid = '';
 
-    $uploads = wp_upload_dir(); // Array of key => value pairs
+	$uploads = wp_upload_dir(); // Array of key => value pairs
 
-    for ($i = 0; $i < count($category_array); $i++) {
-        $parent_catid = 0;
-        if (is_array($category_array[$i])) {
-            $cat_name_arr = $category_array[$i];
-            for ($j = 0; $j < count($cat_name_arr); $j++) {
-                $catname = $cat_name_arr[$j];
+	for ($i = 0; $i < count($category_array); $i++) {
+		$parent_catid = 0;
+		if (is_array($category_array[$i])) {
+			$cat_name_arr = $category_array[$i];
+			for ($j = 0; $j < count($cat_name_arr); $j++) {
+				$catname = $cat_name_arr[$j];
 
-                if (!term_exists($catname, $post_type.'category')) {
-                    $last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
+				if (!term_exists($catname, $post_type.'category')) {
+					$last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
 
-                    if ($j == 0) {
-                        $parent_catid = $last_catid;
-                    }
+					if ($j == 0) {
+						$parent_catid = $last_catid;
+					}
 
 
-                    if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                    else
-                        $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
+					if (geodir_dummy_folder_exists())
+						$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+					else
+						$dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
 
-                    $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
+					$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
-                    $catname = str_replace(' ', '_', $catname);
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+					$catname = str_replace(' ', '_', $catname);
+					$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
 
-                    if (empty($uploaded['error'])) {
-                        $new_path = $uploaded['file'];
-                        $new_url = $uploaded['url'];
-                    }
+					if (empty($uploaded['error'])) {
+						$new_path = $uploaded['file'];
+						$new_url = $uploaded['url'];
+					}
 
-                    $wp_filetype = wp_check_filetype(basename($new_path), null);
-
-                    $attachment = array(
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
-                        'post_mime_type' => $wp_filetype['type'],
-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
-                        'post_content' => '',
-                        'post_status' => 'inherit'
-                    );
-                    $attach_id = wp_insert_attachment($attachment, $new_path);
-
-                    // you must first include the image.php file
-                    // for the function wp_generate_attachment_metadata() to work
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
-                    wp_update_attachment_metadata($attach_id, $attach_data);
-
-                    if (!geodir_get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
-                        geodir_update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
-                    }
-                }
-            }
+					$wp_filetype = wp_check_filetype(basename($new_path), null);
 
-        } else {
-            $catname = $category_array[$i];
+					$attachment = array(
+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+						'post_mime_type' => $wp_filetype['type'],
+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
+						'post_content' => '',
+						'post_status' => 'inherit'
+					);
+					$attach_id = wp_insert_attachment($attachment, $new_path);
 
-            if (!term_exists($catname, $post_type.'category')) {
-                $last_catid = wp_insert_term($catname, $post_type.'category');
+					// you must first include the image.php file
+					// for the function wp_generate_attachment_metadata() to work
+					require_once(ABSPATH . 'wp-admin/includes/image.php');
+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
+					wp_update_attachment_metadata($attach_id, $attach_data);
 
-                if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                else
-                    $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
+					if (!geodir_get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
+						geodir_update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
+					}
+				}
+			}
 
-                $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
+		} else {
+			$catname = $category_array[$i];
 
-                $catname = str_replace(' ', '_', $catname);
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+			if (!term_exists($catname, $post_type.'category')) {
+				$last_catid = wp_insert_term($catname, $post_type.'category');
 
-                if (empty($uploaded['error'])) {
-                    $new_path = $uploaded['file'];
-                    $new_url = $uploaded['url'];
-                }
+				if (geodir_dummy_folder_exists())
+					$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+				else
+					$dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
 
-                $wp_filetype = wp_check_filetype(basename($new_path), null);
+				$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
-                $attachment = array(
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
-                    'post_mime_type' => $wp_filetype['type'],
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
-                    'post_content' => '',
-                    'post_status' => 'inherit'
-                );
+				$catname = str_replace(' ', '_', $catname);
+				$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
 
-                $attach_id = wp_insert_attachment($attachment, $new_path);
+				if (empty($uploaded['error'])) {
+					$new_path = $uploaded['file'];
+					$new_url = $uploaded['url'];
+				}
 
+				$wp_filetype = wp_check_filetype(basename($new_path), null);
 
-                // you must first include the image.php file
-                // for the function wp_generate_attachment_metadata() to work
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
-                wp_update_attachment_metadata($attach_id, $attach_data);
+				$attachment = array(
+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+					'post_mime_type' => $wp_filetype['type'],
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
+					'post_content' => '',
+					'post_status' => 'inherit'
+				);
+
+				$attach_id = wp_insert_attachment($attachment, $new_path);
 
-                if (!geodir_get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
-                    geodir_update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
-                }
-            }
-        }
 
-    }
+				// you must first include the image.php file
+				// for the function wp_generate_attachment_metadata() to work
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
+				wp_update_attachment_metadata($attach_id, $attach_data);
+
+				if (!geodir_get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
+					geodir_update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
+				}
+			}
+		}
+
+	}
 }
 
 
 function geodir_dummy_data_types(){
-    $data =  array(
-        'standard_places' => array(
-            'name'=>__('Default','geodirectory'),
-            'count'=> 30
-        ),
-        'property_sale' => array(
-            'name'=>__('Property for sale','geodirectory'),
-            'count'=> 10
-        ),
-        'property_rent' => array(
-            'name'=>__('Property for rent','geodirectory'),
-            'count'=> 10
-        )
-    );
-
-    return apply_filters('geodir_dummy_data_types',$data );
+	$data =  array(
+		'standard_places' => array(
+			'name'=>__('Default','geodirectory'),
+			'count'=> 30
+		),
+		'property_sale' => array(
+			'name'=>__('Property for sale','geodirectory'),
+			'count'=> 10
+		),
+		'property_rent' => array(
+			'name'=>__('Property for rent','geodirectory'),
+			'count'=> 10
+		)
+	);
+
+	return apply_filters('geodir_dummy_data_types',$data );
 }
 
 
 function geodir_create_dummy_fields($fields)
 {
     
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.0.0
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
-    foreach ($fields as $field_index => $field) {
-        geodir_custom_field_save($field);
-
-    }
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.0.0
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
+	foreach ($fields as $field_index => $field) {
+		geodir_custom_field_save($field);
+
+	}
 }
 
 /**
@@ -176,20 +176,20 @@ 
  */
 function geodir_delete_dummy_posts($post_type,$data_type)
 {
-    global $wpdb, $plugin_prefix;
+	global $wpdb, $plugin_prefix;
 
 
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
 
 
-    foreach ($post_ids as $post_ids_obj) {
-        wp_delete_post($post_ids_obj->post_id);
-    }
+	foreach ($post_ids as $post_ids_obj) {
+		wp_delete_post($post_ids_obj->post_id);
+	}
 
-    //double check posts are deleted
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
+	//double check posts are deleted
+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
 
-    update_option($post_type.'_dummy_data_type','');
+	update_option($post_type.'_dummy_data_type','');
 }
 
 /**
@@ -203,78 +203,78 @@ 
 function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
 {
 
-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
-    $data_types = geodir_dummy_data_types();
-
-    $total_count = 0;
-    global $dummy_post_index;
-    $dummy_post_index = $item_index;
-    foreach( $data_types as $key=>$val){
-        if($key==$data_type){
-            $total_count = $val['count'];
-            if($key=='standard_places'){
-                /**
-                 * Contains dummy post content.
-                 *
-                 * @since 1.0.0
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
-                /**
-                 * Contains dummy property for sale post content.
-                 *
-                 * @since 1.6.11
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
-                /**
-                 * Contains dummy property for sale post content.
-                 *
-                 * @since 1.6.11
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/property_rent.php' );
-            }
-
-        }
-
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
-    }
-
-
-
-    // delete image cache on last entry
-    if($total_count == $item_index){
-        delete_transient( 'cached_dummy_images' );
-        flush_rewrite_rules();
-    }
+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
+	$data_types = geodir_dummy_data_types();
+
+	$total_count = 0;
+	global $dummy_post_index;
+	$dummy_post_index = $item_index;
+	foreach( $data_types as $key=>$val){
+		if($key==$data_type){
+			$total_count = $val['count'];
+			if($key=='standard_places'){
+				/**
+				 * Contains dummy post content.
+				 *
+				 * @since 1.0.0
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/standard_places.php' );
+			}elseif($key=='property_sale'){
+				/**
+				 * Contains dummy property for sale post content.
+				 *
+				 * @since 1.6.11
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/property_sale.php' );
+			}elseif($key=='property_rent'){
+				/**
+				 * Contains dummy property for sale post content.
+				 *
+				 * @since 1.6.11
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/property_rent.php' );
+			}
+
+		}
+
+		do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
+	}
+
+
+
+	// delete image cache on last entry
+	if($total_count == $item_index){
+		delete_transient( 'cached_dummy_images' );
+		flush_rewrite_rules();
+	}
 
 
 }
 
 
 if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
-    /**
-     * GeoDirectory dummy data installation.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param string $post_type The post type.
-     */
-    function geodir_autoinstall_admin_header($post_type = 'gd_place')
-    {
-
-        global $wpdb, $plugin_prefix;
-
-        if (!geodir_is_default_location_set()) {
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
-        } else {
-
-            ?>
+	/**
+	 * GeoDirectory dummy data installation.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param string $post_type The post type.
+	 */
+	function geodir_autoinstall_admin_header($post_type = 'gd_place')
+	{
+
+		global $wpdb, $plugin_prefix;
+
+		if (!geodir_is_default_location_set()) {
+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
+		} else {
+
+			?>
             <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.','geodirectory');?></small></span>
             <table class="form-table gd-dummy-table">
                 <tbody>
@@ -286,78 +286,78 @@ 
 
                 <?php
 
-                $cpts = geodir_get_posttypes('array');
+				$cpts = geodir_get_posttypes('array');
 
-                $data_types = geodir_dummy_data_types();
+				$data_types = geodir_dummy_data_types();
 
-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
 
-                foreach($cpts as $post_type=>$cpt){
+				foreach($cpts as $post_type=>$cpt){
 
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
+					$data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
 
 
-                    $set_dt = get_option($post_type.'_dummy_data_type');
+					$set_dt = get_option($post_type.'_dummy_data_type');
 
-                    $count = 30;
+					$count = 30;
 
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
+					geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
 
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
+					$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
 
-                    echo "<tr>";
-                    echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
+					echo "<tr>";
+					echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
 
 
-                    $select_disabled = $post_counts > 0 ? 'disabled' : '';
-                    echo "<td>";
-                    echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
+					$select_disabled = $post_counts > 0 ? 'disabled' : '';
+					echo "<td>";
+					echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
 
-                    foreach($data_types_for as $key=>$val){
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
-                        if($selected || count($data_types_for)==1){$count = $val['count'];}
-                        echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
-                    }
-                    echo "</select>";
-
-                    $select_display = $post_counts > 0 ? 'display:none;' : '';
-                    echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
-                    $x = 1;
-                    while($x <= $count){
-                        $selected = ($x==$count) ? "selected='selected'" : '';
-                        echo "<option $selected value='$x'>".$x."</option>";
-                        $x++;
-                    }
-                    echo "</select>";
-                    echo "</td>";
+					foreach($data_types_for as $key=>$val){
+						$selected = ($key==$set_dt) ? "selected='selected'" : '';
+						if($selected || count($data_types_for)==1){$count = $val['count'];}
+						echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
+					}
+					echo "</select>";
 
+					$select_display = $post_counts > 0 ? 'display:none;' : '';
+					echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
+					$x = 1;
+					while($x <= $count){
+						$selected = ($x==$count) ? "selected='selected'" : '';
+						echo "<option $selected value='$x'>".$x."</option>";
+						$x++;
+					}
+					echo "</select>";
+					echo "</td>";
 
 
 
 
-                    if($post_counts > 0){
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }
 
-                    echo "</tr>";
-                    //print_r($cpt);
-                }
+					if($post_counts > 0){
+						echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+					}else{
+						echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+					}
+
+					echo "</tr>";
+					//print_r($cpt);
+				}
 
-                ?>
+				?>
                 </tbody>
             </table>
             <?php
 
 
-            $default_location = geodir_get_default_location();
-            $city = isset($default_location->city) ? $default_location->city : '';
-            $region = isset($default_location->region) ? $default_location->region : '';
-            $country = isset($default_location->country) ? $default_location->country : '';
-            $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            ?>
+			$default_location = geodir_get_default_location();
+			$city = isset($default_location->city) ? $default_location->city : '';
+			$region = isset($default_location->region) ? $default_location->region : '';
+			$country = isset($default_location->country) ? $default_location->country : '';
+			$city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			?>
             <script type="text/javascript">
 
                 function geodir_dummy_set_count(data,cpt){
@@ -533,7 +533,7 @@ 
                 }
             </script>
             <?php
-        }
-    }
+		}
+	}
 }
 

Spacing +60 added lines, -60 removed lines

@@ -18,7 +18,7 @@ 
  * @global object $wpdb WordPress Database object.
  * @global string $dummy_image_path The dummy image path.
  */
-function geodir_dummy_data_taxonomies($post_type,$category_array) {
+function geodir_dummy_data_taxonomies($post_type, $category_array) {
     global $wpdb, $dummy_image_path;
 
 
@@ -43,14 +43,14 @@ 
 
 
                     if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
                     else
                         $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
 
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
                     $catname = str_replace(' ', '_', $catname);
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
 
                     if (empty($uploaded['error'])) {
                         $new_path = $uploaded['file'];
@@ -60,7 +60,7 @@ 
                     $wp_filetype = wp_check_filetype(basename($new_path), null);
 
                     $attachment = array(
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),
                         'post_mime_type' => $wp_filetype['type'],
                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
                         'post_content' => '',
@@ -70,7 +70,7 @@ 
 
                     // you must first include the image.php file
                     // for the function wp_generate_attachment_metadata() to work
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
+                    require_once(ABSPATH.'wp-admin/includes/image.php');
                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
                     wp_update_attachment_metadata($attach_id, $attach_data);
 
@@ -87,14 +87,14 @@ 
                 $last_catid = wp_insert_term($catname, $post_type.'category');
 
                 if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
                 else
                     $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
 
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
                 $catname = str_replace(' ', '_', $catname);
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
 
                 if (empty($uploaded['error'])) {
                     $new_path = $uploaded['file'];
@@ -104,7 +104,7 @@ 
                 $wp_filetype = wp_check_filetype(basename($new_path), null);
 
                 $attachment = array(
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),
                     'post_mime_type' => $wp_filetype['type'],
                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
                     'post_content' => '',
@@ -116,7 +116,7 @@ 
 
                 // you must first include the image.php file
                 // for the function wp_generate_attachment_metadata() to work
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
+                require_once(ABSPATH.'wp-admin/includes/image.php');
                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
                 wp_update_attachment_metadata($attach_id, $attach_data);
 
@@ -130,23 +130,23 @@ 
 }
 
 
-function geodir_dummy_data_types(){
-    $data =  array(
+function geodir_dummy_data_types() {
+    $data = array(
         'standard_places' => array(
-            'name'=>__('Default','geodirectory'),
+            'name'=>__('Default', 'geodirectory'),
             'count'=> 30
         ),
         'property_sale' => array(
-            'name'=>__('Property for sale','geodirectory'),
+            'name'=>__('Property for sale', 'geodirectory'),
             'count'=> 10
         ),
         'property_rent' => array(
-            'name'=>__('Property for rent','geodirectory'),
+            'name'=>__('Property for rent', 'geodirectory'),
             'count'=> 10
         )
     );
 
-    return apply_filters('geodir_dummy_data_types',$data );
+    return apply_filters('geodir_dummy_data_types', $data);
 }
 
 
@@ -174,12 +174,12 @@ 
  * @global object $wpdb WordPress Database object.
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  */
-function geodir_delete_dummy_posts($post_type,$data_type)
+function geodir_delete_dummy_posts($post_type, $data_type)
 {
     global $wpdb, $plugin_prefix;
 
 
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
 
     foreach ($post_ids as $post_ids_obj) {
@@ -187,9 +187,9 @@ 
     }
 
     //double check posts are deleted
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
+    $wpdb->get_results("DELETE FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
-    update_option($post_type.'_dummy_data_type','');
+    update_option($post_type.'_dummy_data_type', '');
 }
 
 /**
@@ -200,7 +200,7 @@ 
  * @global object $wpdb WordPress Database object.
  * @global object $current_user Current user object.
  */
-function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
+function geodir_insert_dummy_posts($post_type, $data_type, $item_index)
 {
 
     ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
@@ -209,45 +209,45 @@ 
     $total_count = 0;
     global $dummy_post_index;
     $dummy_post_index = $item_index;
-    foreach( $data_types as $key=>$val){
-        if($key==$data_type){
+    foreach ($data_types as $key=>$val) {
+        if ($key == $data_type) {
             $total_count = $val['count'];
-            if($key=='standard_places'){
+            if ($key == 'standard_places') {
                 /**
                  * Contains dummy post content.
                  *
                  * @since 1.0.0
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
+                include_once('dummy-data/standard_places.php');
+            }elseif ($key == 'property_sale') {
                 /**
                  * Contains dummy property for sale post content.
                  *
                  * @since 1.6.11
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
+                include_once('dummy-data/property_sale.php');
+            }elseif ($key == 'property_rent') {
                 /**
                  * Contains dummy property for sale post content.
                  *
                  * @since 1.6.11
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/property_rent.php' );
+                include_once('dummy-data/property_rent.php');
             }
 
         }
 
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
+        do_action('geodir_insert_dummy_data_loop', $post_type, $data_type, $item_index);
     }
 
 
 
     // delete image cache on last entry
-    if($total_count == $item_index){
-        delete_transient( 'cached_dummy_images' );
+    if ($total_count == $item_index) {
+        delete_transient('cached_dummy_images');
         flush_rewrite_rules();
     }
 
@@ -255,7 +255,7 @@ 
 }
 
 
-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {
     /**
      * GeoDirectory dummy data installation.
      *
@@ -271,17 +271,17 @@ 
         global $wpdb, $plugin_prefix;
 
         if (!geodir_is_default_location_set()) {
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
         } else {
 
             ?>
-            <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.','geodirectory');?></small></span>
+            <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.', 'geodirectory'); ?></small></span>
             <table class="form-table gd-dummy-table">
                 <tbody>
                 <tr>
-                    <td><strong><?php _e('CPT','geodirectory');?></strong></td>
-                    <td><strong><?php _e('Data Type','geodirectory');?></strong></td>
-                    <td><strong><?php _e('Action','geodirectory');?></strong></td>
+                    <td><strong><?php _e('CPT', 'geodirectory'); ?></strong></td>
+                    <td><strong><?php _e('Data Type', 'geodirectory'); ?></strong></td>
+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>
                 </tr>
 
                 <?php
@@ -292,18 +292,18 @@ 
 
                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
 
-                foreach($cpts as $post_type=>$cpt){
+                foreach ($cpts as $post_type=>$cpt) {
 
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
+                    $data_types_for = apply_filters('geodir_dummy_date_types_for', $data_types, $post_type);
 
 
                     $set_dt = get_option($post_type.'_dummy_data_type');
 
                     $count = 30;
 
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
+                    geodir_add_column_if_not_exist($plugin_prefix.$post_type."_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
 
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
+                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
                     echo "<tr>";
                     echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
@@ -313,9 +313,9 @@ 
                     echo "<td>";
                     echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
 
-                    foreach($data_types_for as $key=>$val){
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
-                        if($selected || count($data_types_for)==1){$count = $val['count'];}
+                    foreach ($data_types_for as $key=>$val) {
+                        $selected = ($key == $set_dt) ? "selected='selected'" : '';
+                        if ($selected || count($data_types_for) == 1) {$count = $val['count']; }
                         echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
                     }
                     echo "</select>";
@@ -323,8 +323,8 @@ 
                     $select_display = $post_counts > 0 ? 'display:none;' : '';
                     echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
                     $x = 1;
-                    while($x <= $count){
-                        $selected = ($x==$count) ? "selected='selected'" : '';
+                    while ($x <= $count) {
+                        $selected = ($x == $count) ? "selected='selected'" : '';
                         echo "<option $selected value='$x'>".$x."</option>";
                         $x++;
                     }
@@ -335,10 +335,10 @@ 
 
 
 
-                    if($post_counts > 0){
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+                    if ($post_counts > 0) {
+                        echo '<td><input type="button" value="'.__('Remove data', 'geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
+                    } else {
+                        echo '<td><input type="button" value="'.__('Insert data', 'geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
                     }
 
                     echo "</tr>";
@@ -374,7 +374,7 @@ 
 
                 }
 
-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';
+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';
                 var bound_lat_lng;
                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];
                 var lat = <?php echo $city_latitude; ?>;
@@ -407,7 +407,7 @@ 
                                         return x.replace(" ", '');
                                     }); // remove spaces from lat/lon
                                 } else {
-                                    alert("<?php _e( 'Geocode was not successful for the following reason:', 'geodirectory' );?> " + status);
+                                    alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);
                                 }
                             });
                     } else if (window.gdMaps == 'osm') {
@@ -431,7 +431,7 @@ 
                 var dummy_post_index = 1;
 
                 function gdRemoveDummyData(obj, nonce, posttype){
-                    if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {
+                    if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {
                         jQuery(obj).prop('disabled', true);
                         jQuery('.gd-dummy-data-results-' + posttype).remove();
                         jQuery('<tr class="gd-dummy-data-results gd-dummy-data-results-' + posttype + '" >'+
@@ -446,14 +446,14 @@ 
 
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
 
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation'));?>');
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation')); ?>');
 
 
                         jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=geodir_dummy_delete&posttype=' + posttype + '&_wpnonce=' + nonce,
                             function (data) {
-                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
+                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
                                 jQuery(obj).removeClass('gd-remove-data');
-                                jQuery(obj).val('<?php _e('Insert data','geodirectory');?>');
+                                jQuery(obj).val('<?php _e('Insert data', 'geodirectory'); ?>');
                                 jQuery(obj).prop('disabled', false);
                                 jQuery('#'+posttype+'_data_type_count').show();
                                 jQuery('#'+posttype+'_data_type').prop('disabled', false);
@@ -496,7 +496,7 @@ 
 
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
 
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation'));?>');
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation')); ?>');
                     }
 
                     if (!(typeof bound_lat_lng == 'object' && bound_lat_lng.length == 4)) {
@@ -516,15 +516,15 @@ 
                             percentage = percentage > 100 ? 100 : percentage;
 
 
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation'));?>');
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation')); ?>');
 
                             gdInstallDummyData(obj, nonce, posttype,insertedCount);
                         }
                         else {
                             percentage = 100;
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
                             jQuery(obj).addClass('gd-remove-data');
-                            jQuery(obj).val('<?php _e('Remove data','geodirectory');?>');
+                            jQuery(obj).val('<?php _e('Remove data', 'geodirectory'); ?>');
                             jQuery(obj).prop('disabled', false);
 
                         }

Braces +13 added lines, -11 removed lines

@@ -42,10 +42,11 @@ 
                     }
 
 
-                    if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                    else
-                        $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
+                    if (geodir_dummy_folder_exists()) {
+                                            $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                    } else {
+                                            $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
+                    }
 
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
@@ -86,10 +87,11 @@ 
             if (!term_exists($catname, $post_type.'category')) {
                 $last_catid = wp_insert_term($catname, $post_type.'category');
 
-                if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                else
-                    $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
+                if (geodir_dummy_folder_exists()) {
+                                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                } else {
+                                    $dummy_image_url = 'http://wpgeodirectory.com/dummy/cat_icon';
+                }
 
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
@@ -220,7 +222,7 @@ 
                  * @package GeoDirectory
                  */
                 include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
+            } elseif($key=='property_sale'){
                 /**
                  * Contains dummy property for sale post content.
                  *
@@ -228,7 +230,7 @@ 
                  * @package GeoDirectory
                  */
                 include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
+            } elseif($key=='property_rent'){
                 /**
                  * Contains dummy property for sale post content.
                  *
@@ -337,7 +339,7 @@ 
 
                     if($post_counts > 0){
                         echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
+                    } else{
                         echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
                     }
 

geodirectory-functions/custom_fields_predefined.php

Indentation +404 added lines, -404 removed lines

@@ -17,370 +17,370 @@ 
  */
 function geodir_custom_fields_predefined($post_type=''){
 
-    $custom_fields = array();
-
-
-    // price
-    $custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-price',
-        'icon'        =>  'fa fa-usd',
-        'name'        =>  __('Price', 'geodirectory'),
-        'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'decimal_point'       =>  '2',
-            'admin_title'         =>  'Price',
-            'site_title'          =>  'Price',
-            'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
-            'htmlvar_name'        =>  'price',
-            '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'          =>  'fa fa-usd',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true,
-            'extra_fields'        =>  array(
-                'is_price'                  =>  1,
-                'thousand_separator'        =>  'comma',
-                'decimal_separator'         =>  'period',
-                'decimal_display'           =>  'if',
-                'currency_symbol'           =>  '$',
-                'currency_symbol_placement' =>  'left'
-            )
-        )
-    );
-
-    // property status
-    $custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-status',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Status', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Status',
-            'site_title'          =>  'Property Status',
-            'admin_desc'          =>  'Enter the status of the property.',
-            'htmlvar_name'        =>  'property_status',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property furnishing
-    $custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-furnishing',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Furnishing', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Furnishing',
-            'site_title'          =>  'Furnishing',
-            'admin_desc'          =>  'Enter the furnishing status of the property.',
-            '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'          =>  'fa fa-th-large',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property type
-    $custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-type',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Type', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Type',
-            'site_title'          =>  'Property Type',
-            'admin_desc'          =>  'Select the property type.',
-            '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','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bedrooms
-    $custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bedrooms',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Bedrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bedrooms',
-            'site_title'          =>  'Bedrooms',
-            'admin_desc'          =>  'Select the number of bedrooms',
-            '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'          =>  'fa fa-bed',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bathrooms
-    $custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bathrooms',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Bathrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bathrooms',
-            'site_title'          =>  'Bathrooms',
-            'admin_desc'          =>  'Select the number of bathrooms',
-            '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'          =>  'fa fa-bold',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property area
-    $custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-area',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Area', 'geodirectory'),
-        'description' =>  __('Adds a input for the property area.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'admin_title'         =>  'Property Area',
-            'site_title'          =>  'Area (Sq Ft)',
-            'admin_desc'          =>  'Enter the Sq Ft value for the property',
-            'htmlvar_name'        =>  'property_area',
-            '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 the property area in numbers only: 1500',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-area-chart',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property features
-    $custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'multiselect',
-        'class'       =>  'gd-property-features',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Features', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Features',
-            'site_title'          =>  'Features',
-            'admin_desc'          =>  'Select the property features.',
-            'htmlvar_name'        =>  'property_features',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,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'          =>  'fa fa-plus-square',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // Twitter feed
-    $custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-twitter',
-        'icon'        =>  'fa fa-twitter',
-        'name'        =>  __('Twitter feed', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Twitter',
-            'site_title'          =>  'Twitter',
-            'admin_desc'          =>  'Enter your Twitter username',
-            'htmlvar_name'        =>  'twitterusername',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[owntab]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
-            'validation_msg'      =>  'Please enter a valid twitter username.',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-twitter',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-    // Get directions link
-    $custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-get-directions',
-        'icon'        =>  'fa fa-location-arrow',
-        'name'        =>  __('Get Directions Link', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Get Directions',
-            'site_title'          =>  'Get Directions',
-            'admin_desc'          =>  '',
-            'htmlvar_name'        =>  'get_directions',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  true,
-            'default_value'       =>  'Get Directions',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-location-arrow',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-
-    // JOB TYPE CF
-
-    // job type
-    $custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fa fa-briefcase',
-        'name'        =>  __('Job Type', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
-        'defaults'    => array(
-            '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'          =>  'fa fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // job sector
-    $custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fa fa-briefcase',
-        'name'        =>  __('Job Sector', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
-        'defaults'    => array(
-            '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'          =>  'fa fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-
-    /**
-     * @see `geodir_custom_fields`
-     */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+	$custom_fields = array();
+
+
+	// price
+	$custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-price',
+		'icon'        =>  'fa fa-usd',
+		'name'        =>  __('Price', 'geodirectory'),
+		'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'decimal_point'       =>  '2',
+			'admin_title'         =>  'Price',
+			'site_title'          =>  'Price',
+			'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
+			'htmlvar_name'        =>  'price',
+			'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'          =>  'fa fa-usd',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true,
+			'extra_fields'        =>  array(
+				'is_price'                  =>  1,
+				'thousand_separator'        =>  'comma',
+				'decimal_separator'         =>  'period',
+				'decimal_display'           =>  'if',
+				'currency_symbol'           =>  '$',
+				'currency_symbol_placement' =>  'left'
+			)
+		)
+	);
+
+	// property status
+	$custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-status',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Status', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Status',
+			'site_title'          =>  'Property Status',
+			'admin_desc'          =>  'Enter the status of the property.',
+			'htmlvar_name'        =>  'property_status',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property furnishing
+	$custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-furnishing',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Furnishing', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Furnishing',
+			'site_title'          =>  'Furnishing',
+			'admin_desc'          =>  'Enter the furnishing status of the property.',
+			'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'          =>  'fa fa-th-large',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property type
+	$custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-type',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Type', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Type',
+			'site_title'          =>  'Property Type',
+			'admin_desc'          =>  'Select the property type.',
+			'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','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bedrooms
+	$custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bedrooms',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Bedrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bedrooms',
+			'site_title'          =>  'Bedrooms',
+			'admin_desc'          =>  'Select the number of bedrooms',
+			'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'          =>  'fa fa-bed',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bathrooms
+	$custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bathrooms',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Bathrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bathrooms',
+			'site_title'          =>  'Bathrooms',
+			'admin_desc'          =>  'Select the number of bathrooms',
+			'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'          =>  'fa fa-bold',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property area
+	$custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-area',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Area', 'geodirectory'),
+		'description' =>  __('Adds a input for the property area.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'admin_title'         =>  'Property Area',
+			'site_title'          =>  'Area (Sq Ft)',
+			'admin_desc'          =>  'Enter the Sq Ft value for the property',
+			'htmlvar_name'        =>  'property_area',
+			'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 the property area in numbers only: 1500',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-area-chart',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property features
+	$custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'multiselect',
+		'class'       =>  'gd-property-features',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Features', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Features',
+			'site_title'          =>  'Features',
+			'admin_desc'          =>  'Select the property features.',
+			'htmlvar_name'        =>  'property_features',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Features/,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'          =>  'fa fa-plus-square',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// Twitter feed
+	$custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-twitter',
+		'icon'        =>  'fa fa-twitter',
+		'name'        =>  __('Twitter feed', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Twitter',
+			'site_title'          =>  'Twitter',
+			'admin_desc'          =>  'Enter your Twitter username',
+			'htmlvar_name'        =>  'twitterusername',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[owntab]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
+			'validation_msg'      =>  'Please enter a valid twitter username.',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-twitter',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+	// Get directions link
+	$custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-get-directions',
+		'icon'        =>  'fa fa-location-arrow',
+		'name'        =>  __('Get Directions Link', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Get Directions',
+			'site_title'          =>  'Get Directions',
+			'admin_desc'          =>  '',
+			'htmlvar_name'        =>  'get_directions',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  true,
+			'default_value'       =>  'Get Directions',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-location-arrow',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+
+	// JOB TYPE CF
+
+	// job type
+	$custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fa fa-briefcase',
+		'name'        =>  __('Job Type', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
+		'defaults'    => array(
+			'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'          =>  'fa fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// job sector
+	$custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fa fa-briefcase',
+		'name'        =>  __('Job Sector', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
+		'defaults'    => array(
+			'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'          =>  'fa fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+
+	/**
+	 * @see `geodir_custom_fields`
+	 */
+	return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
 }
 
 
@@ -395,32 +395,32 @@ 
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
-    global $post;
+	global $post;
 
 
-    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="fa fa-clock-o"></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="fa fa-clock-o"></i>' : "";
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon = '';
+		}
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
-        $html .= '</div>';
+		$html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
+		$html .= '</div>';
 
-    endif;
+	endif;
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
 
@@ -435,37 +435,37 @@ 
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
-    global $post;
+	global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+	if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
 
-        $field_icon = geodir_field_icon_proccess( $cf );
-        if ( strpos( $field_icon, 'http' ) !== false ) {
-            $field_icon_af = '';
-        } elseif ( $field_icon == '' ) {
-            $field_icon_af = '<i class="fa fa-location-arrow"></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 = '<i class="fa fa-location-arrow"></i>';
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon    = '';
+		}
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+		$link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
-            $html .= $field_icon_af;
-        }
+		if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+			$html .= $field_icon_af;
+		}
 
-        // We use maps.apple.com here because it will handle redirects nicely in most cases
-        $html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
-        $html .= '</div>';
+		// We use maps.apple.com here because it will handle redirects nicely in most cases
+		$html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
+		$html .= '</div>';
 
-    }else{
-        $html ='';
-    }
+	}else{
+		$html ='';
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);

Spacing +31 added lines, -31 removed lines

@@ -15,7 +15,7 @@ 
  * @package GeoDirectory
  * @see `geodir_custom_field_save` for array details.
  */
-function geodir_custom_fields_predefined($post_type=''){
+function geodir_custom_fields_predefined($post_type = '') {
 
     $custom_fields = array();
 
@@ -75,7 +75,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -104,7 +104,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -133,7 +133,7 @@ 
             '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','geodirectory'),
+            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -162,7 +162,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -191,7 +191,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -248,7 +248,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+            'option_values'       =>  __('Select Features/,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'        =>  '',
@@ -328,15 +328,15 @@ 
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
             'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','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'),
+            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -356,16 +356,16 @@ 
         'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+            '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'),
+            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -380,7 +380,7 @@ 
     /**
      * @see `geodir_custom_fields`
      */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+    return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
 }
 
 
@@ -394,11 +394,11 @@ 
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
     global $post;
 
 
-    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";
 
@@ -413,7 +413,7 @@ 
         }
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
         $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
         $html .= '</div>';
@@ -422,7 +422,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
 
 /**
  * Filter the get_directions custom field output to show a link.
@@ -434,38 +434,38 @@ 
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
     global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+    if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
 
-        $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="fa fa-location-arrow"></i>';
         } else {
             $field_icon_af = $field_icon;
             $field_icon    = '';
         }
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+        $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+        if (isset($cf['field_icon']) && $cf['field_icon']) {
             $html .= $field_icon_af;
         }
 
         // We use maps.apple.com here because it will handle redirects nicely in most cases
-        $html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
+        $html .= '<a href="https://maps.apple.com/?daddr='.$post->post_latitude.','.$post->post_longitude.'" target="_blank" >'.$link_text.'</a>';
         $html .= '</div>';
 
-    }else{
-        $html ='';
+    } else {
+        $html = '';
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
+add_filter('geodir_custom_field_output_text_key_get_directions', 'geodir_predefined_custom_field_output_get_directions', 10, 3);

Braces +1 added lines, -1 removed lines

@@ -462,7 +462,7 @@
         $html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
         $html .= '</div>';
 
-    }else{
+    } else{
         $html ='';
     }
 

geodirectory-functions/custom_field_html.php

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 fa-') !== false) {

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

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

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

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

-}else{

+} else{

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

 }

 

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

     $field_type_name = $cf['name'];

-}else{

+} else{

     $field_type_name = $field_type;

 }

 

@@ -143,11 +145,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'];

                 }

                 ?>

@@ -161,11 +163,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'];

                 }

                 ?>

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

                 }

                 ?>

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

                 }

                 ?>

@@ -246,11 +248,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'];

                 }

                 ?>

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

                 }

                 ?>

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

                 }

                 ?>

@@ -356,11 +358,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'];

                 }

                 ?>

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

                 }

                 ?>

@@ -444,7 +446,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]']);

                         }

 

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

                 }

                 ?>

@@ -598,11 +600,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'];

                 }

                 ?>

@@ -643,11 +645,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'];

                 }

                 ?>

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

                 }

                 ?>

@@ -709,12 +711,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;'" : '';

                 }

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 fa-') !== false) {

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

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

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

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

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

 }else{

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

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

 }

 

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

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

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

 }else{

-    $field_type_name = $field_type;

+	$field_type_name = $field_type;

 }

 

 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="fa fa-times" aria-hidden="true"></i></div>

         <?php endif;

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

-            ?>

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

+			?>

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

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

             <b style="cursor:pointer;"

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

         <?php

-        } else {echo $field_icon;

-            ?>

+		} else {echo $field_icon;

+			?>

             <b style="cursor:pointer;"

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

         <?php

-        }

-        ?>

+		}

+		?>

     </div>

 

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

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

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

-             echo 'block;';

-         } else {

-             echo 'none;';

-         } ?>">

+			 echo 'block;';

+		 } else {

+			 echo 'none;';

+		 } ?>">

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

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

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

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

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

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

-            echo $field_info->data_type;

-        } ?>"/>

+			echo $field_info->data_type;

+		} ?>"/>

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

 

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

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

                         <div class="gdcf-tooltip">

                             <?php

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

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

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

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

-                            } else {

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

-                            }

-                            ?>

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

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

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

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

+							} else {

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

+							}

+							?>

                         </div>

                     </label>

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

@@ -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="fa 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="fa 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="fa 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="fa 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 fa-') !== false) {

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

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

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

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

-}else{

+} else {

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

 }

 

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

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

     $field_type_name = $cf['name'];

-}else{

+} else {

     $field_type_name = $field_type;

 }

 

@@ -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="fa fa-long-arrow-left " aria-hidden="true"></i>

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

             <b style="cursor:pointer;"

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

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

         <?php

         } else {echo $field_icon;

             ?>

             <b style="cursor:pointer;"

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

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

         <?php

         }

         ?>

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

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

                         <div class="gdcf-tooltip">

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

                         </div>

                     </label>

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

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

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

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

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

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

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

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

                         <div class="gdcf-tooltip">

                             <?php

                             if ($field_type == 'checkbox') {

@@ -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="fa 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="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Upload icon :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

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

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

                         </div>

                     </label>

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

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

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

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

                     </div>

 

                 </li>

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

                         <div class="gdcf-tooltip">

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

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

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

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

                         </div>

                     </label>

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

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

                         <div class="gdcf-tooltip">

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

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

                         </div>

                     </label>

 

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

                             <?php if (!$value) {

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

                 </li>

@@ -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; ?>

geodirectory-functions/map-functions/map_functions.php

Braces +4 added lines, -3 removed lines

@@ -263,7 +263,7 @@ 
                         global $sitepress;

                         $default_lang = $sitepress->get_default_language();

                         $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);

-                    }else{

+                    } else{

                         $term_id = $cat_term->term_id;

                     }

                     if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {

@@ -291,8 +291,9 @@ 
 

         return $out;

     } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

+        if ($cat_parent == 0) {
+                    return _e('No category', 'geodirectory');
+        }
     }

     return;

 }

Indentation +238 added lines, -238 removed lines

@@ -15,8 +15,8 @@ 
  */

 function  geodir_init_map_jason()

 {

-    global $map_jason;

-    $map_jason = array();

+	global $map_jason;

+	$map_jason = array();

 }

 

 /**

@@ -28,8 +28,8 @@ 
  */

 function geodir_init_map_canvas_array()

 {

-    global $map_canvas_arr;

-    $map_canvas_arr = array();

+	global $map_canvas_arr;

+	$map_canvas_arr = array();

 }

 

 

@@ -50,63 +50,63 @@ 
  */

 function create_marker_jason_of_posts($post)

 {

-    global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;

+	global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;

 

-    if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {

+	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {

 

-        if(isset($map_jason[$post->ID])){return null;}

+		if(isset($map_jason[$post->ID])){return null;}

 

-        $srcharr = array("'", "/", "-", '"', '\\');

-        $replarr = array("′", "⁄", "–", "“", '');

+		$srcharr = array("'", "/", "-", '"', '\\');

+		$replarr = array("′", "⁄", "–", "“", '');

 

 

-        $geodir_cat_icons = geodir_get_term_icon();

-        $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';

+		$geodir_cat_icons = geodir_get_term_icon();

+		$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';

 

-        $post_title = $post->post_title;

-        $title = str_replace($srcharr, $replarr, $post_title);

+		$post_title = $post->post_title;

+		$title = str_replace($srcharr, $replarr, $post_title);

 

-        if (is_ssl()) {

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

-        }

+		if (is_ssl()) {

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

+		}

         

-        if ($icon != '') {

-            $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;

+		if ($icon != '') {

+			$gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;

             

-            if (isset($gd_marker_sizes[$icon])) {

-                $icon_size = $gd_marker_sizes[$icon];

-            } else {

-                $icon_size = geodir_get_marker_size($icon);

-                $gd_marker_sizes[$icon] = $icon_size;

-            }               

-        } else {

-            $icon_size = array('w' => 36, 'h' => 45);

-        }

-

-        $post_json = '{"id":"' . $post->ID

-                     . '","t": "' . $title

-                     . '","lt": "' . $post->post_latitude

-                     . '","ln": "' . $post->post_longitude

-                     . '","mk_id":"' . $post->ID . '_' . $post->default_category

-                     . '","i":"' . $icon

-                     . '","w":"' . $icon_size['w']

-                     . '","h":"' . $icon_size['h'] . '"}';

-

-        /**

-         * Filter the json data when creating output for post json marker..

-         *

-         * @since 1.5.7

-         * @param string $post_json JSON representation of the post marker info.

-         * @param object $post The post object.

-         */

-        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

-

-        // only assign it if it has a value

-        if($post_map_json){

-            $map_jason[$post->ID] = $post_map_json;

-        }

-

-    }

+			if (isset($gd_marker_sizes[$icon])) {

+				$icon_size = $gd_marker_sizes[$icon];

+			} else {

+				$icon_size = geodir_get_marker_size($icon);

+				$gd_marker_sizes[$icon] = $icon_size;

+			}               

+		} else {

+			$icon_size = array('w' => 36, 'h' => 45);

+		}

+

+		$post_json = '{"id":"' . $post->ID

+					 . '","t": "' . $title

+					 . '","lt": "' . $post->post_latitude

+					 . '","ln": "' . $post->post_longitude

+					 . '","mk_id":"' . $post->ID . '_' . $post->default_category

+					 . '","i":"' . $icon

+					 . '","w":"' . $icon_size['w']

+					 . '","h":"' . $icon_size['h'] . '"}';

+

+		/**

+		 * Filter the json data when creating output for post json marker..

+		 *

+		 * @since 1.5.7

+		 * @param string $post_json JSON representation of the post marker info.

+		 * @param object $post The post object.

+		 */

+		$post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+

+		// only assign it if it has a value

+		if($post_map_json){

+			$map_jason[$post->ID] = $post_map_json;

+		}

+

+	}

 }

 

 /**

@@ -119,67 +119,67 @@ 
  */

 function send_marker_jason_to_js()

 {

-    global $map_jason, $map_canvas_arr;

-

-    if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {

-        foreach ($map_canvas_arr as $canvas => $jason) {

-            if (is_array($map_jason) && !empty($map_jason)) {

-

-                // on details page only show the main marker on the map

-                if(geodir_is_page('detail')){

-                    global $post;

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

-                        $map_jason = array($map_jason[$post->ID]);

-                    }

-                }

-                $canvas_jason = $canvas . "_jason";

-                $map_canvas_arr[$canvas] = array_unique($map_jason);

-                unset($cat_content_info);

-                $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

-                $totalcount = count(array_unique($map_jason));

-                if (!empty($cat_content_info)) {

-                    $json_content = substr(implode(',', $cat_content_info), 1);

-                    $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

-                    $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08

-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

-                } else {

-                    $canvas_jason = '[{"totalcount":"0"}]';

-                }

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

-

-                /**

-                 * Filter the send_marker_jason_to_js() function map canvas json args.

-                 *

-                 * You can use this filter to modify map canvas json args.

-                 *

-                 * @since 1.0.0

-                 * @package GeoDirectory

-                 * @param string $canvas Map canvas array key.

-                 * @param array $map_canvas_jason_args Map canvas args.

-                 */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

-

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

-            } else {

-                $canvas_jason = '[{"totalcount":"0"}]';

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

-

-                /**

-                 * Filter the send_marker_jason_to_js() function map canvas json args.

-                 *

-                 * You can use this filter to modify map canvas json args.

-                 *

-                 * @since 1.0.0

-                 * @package GeoDirectory

-                 * @param string $canvas Map canvas array key.

-                 * @param array $map_canvas_jason_args Map canvas args.

-                 */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

-            }

-        }

-

-    }

+	global $map_jason, $map_canvas_arr;

+

+	if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {

+		foreach ($map_canvas_arr as $canvas => $jason) {

+			if (is_array($map_jason) && !empty($map_jason)) {

+

+				// on details page only show the main marker on the map

+				if(geodir_is_page('detail')){

+					global $post;

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

+						$map_jason = array($map_jason[$post->ID]);

+					}

+				}

+				$canvas_jason = $canvas . "_jason";

+				$map_canvas_arr[$canvas] = array_unique($map_jason);

+				unset($cat_content_info);

+				$cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

+				$totalcount = count(array_unique($map_jason));

+				if (!empty($cat_content_info)) {

+					$json_content = substr(implode(',', $cat_content_info), 1);

+					$json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

+					$json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08

+					$canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+				} else {

+					$canvas_jason = '[{"totalcount":"0"}]';

+				}

+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+

+				/**

+				 * Filter the send_marker_jason_to_js() function map canvas json args.

+				 *

+				 * You can use this filter to modify map canvas json args.

+				 *

+				 * @since 1.0.0

+				 * @package GeoDirectory

+				 * @param string $canvas Map canvas array key.

+				 * @param array $map_canvas_jason_args Map canvas args.

+				 */

+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

+

+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+			} else {

+				$canvas_jason = '[{"totalcount":"0"}]';

+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+

+				/**

+				 * Filter the send_marker_jason_to_js() function map canvas json args.

+				 *

+				 * You can use this filter to modify map canvas json args.

+				 *

+				 * @since 1.0.0

+				 * @package GeoDirectory

+				 * @param string $canvas Map canvas array key.

+				 * @param array $map_canvas_jason_args Map canvas args.

+				 */

+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+			}

+		}

+

+	}

 }

 

 /**

@@ -202,99 +202,99 @@ 
  */

 function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false)

 {

-    global $cat_count, $geodir_cat_icons, $gd_session;

+	global $cat_count, $geodir_cat_icons, $gd_session;

 

-    $exclude_categories = get_option('geodir_exclude_cat_on_map');

-    $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');

+	$exclude_categories = get_option('geodir_exclude_cat_on_map');

+	$exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');

 

-    // check if exclude categories saved before fix of categories identical names

-    if ($exclude_categories_new) {

-        $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';

-        $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();

-    }

+	// check if exclude categories saved before fix of categories identical names

+	if ($exclude_categories_new) {

+		$gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';

+		$exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();

+	}

 

-    $exclude_cat_str = implode(',', $exclude_categories);

+	$exclude_cat_str = implode(',', $exclude_categories);

 

-    if ($exclude_cat_str == '') {

-        $exclude_cat_str = '0';

-    }

+	if ($exclude_cat_str == '') {

+		$exclude_cat_str = '0';

+	}

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));

 

-    if ($hide_empty) {

-        $cat_terms = geodir_filter_empty_terms($cat_terms);

-    }

+	if ($hide_empty) {

+		$cat_terms = geodir_filter_empty_terms($cat_terms);

+	}

 

-    $main_list_class = '';

-    //If there are terms, start displaying

-    if (count($cat_terms) > 0) {

-        //Displaying as a list

-        $p = $pading * 15;

-        $pading++;

+	$main_list_class = '';

+	//If there are terms, start displaying

+	if (count($cat_terms) > 0) {

+		//Displaying as a list

+		$p = $pading * 15;

+		$pading++;

 

-        if ($cat_parent == 0) {

-            $list_class = 'main_list';

-            $display = '';

-        } else {

-            $list_class = 'sub_list';

-            $display = !$child_collapse ? '' : 'display:none';

-        }

+		if ($cat_parent == 0) {

+			$list_class = 'main_list';

+			$display = '';

+		} else {

+			$list_class = 'sub_list';

+			$display = !$child_collapse ? '' : 'display:none';

+		}

 

-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+		$out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';

 

-        $geodir_cat_icons = geodir_get_term_icon();

+		$geodir_cat_icons = geodir_get_term_icon();

 

-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

-        if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {

-            $geodir_default_map_search_pt = $homemap_catlist_ptype;

-        }

-        $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt);

+		$geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

+		if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {

+			$geodir_default_map_search_pt = $homemap_catlist_ptype;

+		}

+		$post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt);

         

-        foreach ($cat_terms as $cat_term):

-            $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';

-

-            if (!in_array($cat_term->term_id, $exclude_categories)):

-                //Secret sauce.  Function calls itself to display child elements, if any

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

-

-                // Untick the category by default on home map

-                if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

-                    if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML

-                        global $sitepress;

-                        $default_lang = $sitepress->get_default_language();

-                        $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);

-                    }else{

-                        $term_id = $cat_term->term_id;

-                    }

-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {

-                        $checked = '';

-                    }

-                }

-

-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

-                $term_check .= '  title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

-

-            endif;

-

-

-            // get sub category by recursion

-            $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);

-

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

-

-        endforeach;

-

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

-

-        return $out;

-    } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

-    }

-    return;

+		foreach ($cat_terms as $cat_term):

+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';

+

+			if (!in_array($cat_term->term_id, $exclude_categories)):

+				//Secret sauce.  Function calls itself to display child elements, if any

+				$checked = 'checked="checked"';

+

+				// Untick the category by default on home map

+				if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

+					if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML

+						global $sitepress;

+						$default_lang = $sitepress->get_default_language();

+						$term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);

+					}else{

+						$term_id = $cat_term->term_id;

+					}

+					if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {

+						$checked = '';

+					}

+				}

+

+				$term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

+				$term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

+				$term_check .= '  title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

+				$term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';

+				$out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

+

+			endif;

+

+

+			// get sub category by recursion

+			$out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);

+

+			$out .= '</li>';

+

+		endforeach;

+

+		$out .= '</ul>';

+

+		return $out;

+	} else {

+		if ($cat_parent == 0)

+			return _e('No category', 'geodirectory');

+	}

+	return;

 }

 

 /**

@@ -306,19 +306,19 @@ 
  * @return string The map API provider name.

  */

 function geodir_map_name() {

-    $geodir_map_name = get_option('geodir_load_map', 'google');

+	$geodir_map_name = get_option('geodir_load_map', 'google');

     

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

-        $geodir_map_name = 'auto';

-    }

-

-    /**

-     * Filter the map JS API provider name.

-     *

-     * @since 1.6.1

-     * @param string $geodir_map_name The map API provider name.

-     */

-    return apply_filters('geodir_map_name', $geodir_map_name);

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

+		$geodir_map_name = 'auto';

+	}

+

+	/**

+	 * Filter the map JS API provider name.

+	 *

+	 * @since 1.6.1

+	 * @param string $geodir_map_name The map API provider name.

+	 */

+	return apply_filters('geodir_map_name', $geodir_map_name);

 }

 

 /**

@@ -334,48 +334,48 @@ 
  * @return array The icon size.

  */

 function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {

-    global $gd_marker_sizes;

+	global $gd_marker_sizes;

     

-    if (empty($gd_marker_sizes)) {

-        $gd_marker_sizes = array();

-    }

+	if (empty($gd_marker_sizes)) {

+		$gd_marker_sizes = array();

+	}

       

-    if (!empty($gd_marker_sizes[$icon])) {

-        return $gd_marker_sizes[$icon];

-    }

+	if (!empty($gd_marker_sizes[$icon])) {

+		return $gd_marker_sizes[$icon];

+	}

     

-    if (empty($icon)) {

-        $gd_marker_sizes[$icon] = $default_size;

+	if (empty($icon)) {

+		$gd_marker_sizes[$icon] = $default_size;

         

-        return $default_size;

-    }

+		return $default_size;

+	}

     

-    $icon_url = $icon;

+	$icon_url = $icon;

     

-    $uploads = wp_upload_dir(); // Array of key => value pairs

+	$uploads = wp_upload_dir(); // Array of key => value pairs

       

-    if (!path_is_absolute($icon)) {

-        $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);

-    }

+	if (!path_is_absolute($icon)) {

+		$icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);

+	}

     

-    if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {

-        $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);

-    }

+	if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {

+		$icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);

+	}

     

-    $sizes = array();

-    if (is_file($icon) && file_exists($icon)) {

-        $size = getimagesize(trim($icon));

+	$sizes = array();

+	if (is_file($icon) && file_exists($icon)) {

+		$size = getimagesize(trim($icon));

         

-        if (!empty($size[0]) && !empty($size[1])) {

-            $sizes = array('w' => $size[0], 'h' => $size[1]);

-        }

-    }

+		if (!empty($size[0]) && !empty($size[1])) {

+			$sizes = array('w' => $size[0], 'h' => $size[1]);

+		}

+	}

     

-    $sizes = !empty($sizes) ? $sizes : $default_size;

+	$sizes = !empty($sizes) ? $sizes : $default_size;

     

-    $gd_marker_sizes[$icon_url] = $sizes;

+	$gd_marker_sizes[$icon_url] = $sizes;

     

-    return $sizes;

+	return $sizes;

 }

 

 add_action('wp_footer', 'geodir_map_load_script', 10);

@@ -387,8 +387,8 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_script() {

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {

-        $plugin_url = geodir_plugin_url();

+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {

+		$plugin_url = geodir_plugin_url();

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

@@ -403,5 +403,5 @@ 
 }

 </script>

 <?php

-    }

+	}

 }
\ No newline at end of file

Spacing +39 added lines, -39 removed lines

@@ -54,7 +54,7 @@ 
 

     if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {

 

-        if(isset($map_jason[$post->ID])){return null;}

+        if (isset($map_jason[$post->ID])) {return null; }

 

         $srcharr = array("'", "/", "-", '"', '\\');

         $replarr = array("′", "⁄", "–", "“", '');

@@ -67,7 +67,7 @@ 
         $title = str_replace($srcharr, $replarr, $post_title);

 

         if (is_ssl()) {

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

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

         }

         

         if ($icon != '') {

@@ -83,14 +83,14 @@ 
             $icon_size = array('w' => 36, 'h' => 45);

         }

 

-        $post_json = '{"id":"' . $post->ID

-                     . '","t": "' . $title

-                     . '","lt": "' . $post->post_latitude

-                     . '","ln": "' . $post->post_longitude

-                     . '","mk_id":"' . $post->ID . '_' . $post->default_category

-                     . '","i":"' . $icon

-                     . '","w":"' . $icon_size['w']

-                     . '","h":"' . $icon_size['h'] . '"}';

+        $post_json = '{"id":"'.$post->ID

+                     . '","t": "'.$title

+                     . '","lt": "'.$post->post_latitude

+                     . '","ln": "'.$post->post_longitude

+                     . '","mk_id":"'.$post->ID.'_'.$post->default_category

+                     . '","i":"'.$icon

+                     . '","w":"'.$icon_size['w']

+                     . '","h":"'.$icon_size['h'].'"}';

 

         /**

          * Filter the json data when creating output for post json marker..

@@ -99,10 +99,10 @@ 
          * @param string $post_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);

 

         // only assign it if it has a value

-        if($post_map_json){

+        if ($post_map_json) {

             $map_jason[$post->ID] = $post_map_json;

         }

 

@@ -126,13 +126,13 @@ 
             if (is_array($map_jason) && !empty($map_jason)) {

 

                 // on details page only show the main marker on the map

-                if(geodir_is_page('detail')){

+                if (geodir_is_page('detail')) {

                     global $post;

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

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

                         $map_jason = array($map_jason[$post->ID]);

                     }

                 }

-                $canvas_jason = $canvas . "_jason";

+                $canvas_jason = $canvas."_jason";

                 $map_canvas_arr[$canvas] = array_unique($map_jason);

                 unset($cat_content_info);

                 $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

@@ -141,11 +141,11 @@ 
                     $json_content = substr(implode(',', $cat_content_info), 1);

                     $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

                     $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08

-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+                    $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';

                 } else {

                     $canvas_jason = '[{"totalcount":"0"}]';

                 }

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);

 

                 /**

                  * Filter the send_marker_jason_to_js() function map canvas json args.

@@ -157,12 +157,12 @@ 
                  * @param string $canvas Map canvas array key.

                  * @param array $map_canvas_jason_args Map canvas args.

                  */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);

 

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);

             } else {

                 $canvas_jason = '[{"totalcount":"0"}]';

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);

 

                 /**

                  * Filter the send_marker_jason_to_js() function map canvas json args.

@@ -174,8 +174,8 @@ 
                  * @param string $canvas Map canvas array key.

                  * @param array $map_canvas_jason_args Map canvas args.

                  */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);

+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);

             }

         }

 

@@ -240,11 +240,11 @@ 
             $display = !$child_collapse ? '' : 'display:none';

         }

 

-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+        $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">';

 

         $geodir_cat_icons = geodir_get_term_icon();

 

-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

+        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';

         if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {

             $geodir_default_map_search_pt = $homemap_catlist_ptype;

         }

@@ -259,23 +259,23 @@ 
 

                 // Untick the category by default on home map

                 if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

-                    if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML

+                    if (geodir_wpml_is_taxonomy_translated($post_type.'category')) { // if WPML

                         global $sitepress;

                         $default_lang = $sitepress->get_default_language();

                         $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);

-                    }else{

+                    } else {

                         $term_id = $cat_term->term_id;

                     }

-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {

+                    if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {

                         $checked = '';

                     }

                 }

 

-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

-                $term_check .= '  title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

+                $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"';

+                $term_check .= ' name="'.$map_canvas_name.'_cat[]" ';

+                $term_check .= '  title="'.esc_attr(geodir_utf8_ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">';

+                $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.geodir_utf8_ucfirst($cat_term->name).'"/>';

+                $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.geodir_utf8_ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>';

 

             endif;

 

@@ -387,19 +387,19 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_script() {

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {

+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('google-maps-api', 'done')) {

         $plugin_url = geodir_plugin_url();

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

-    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");

+    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");

     document.getElementsByTagName("head")[0].appendChild(css);

-    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");

+    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");

     document.getElementsByTagName("head")[0].appendChild(css);

-    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

-    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

-    document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

-    document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url;?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

 }

 </script>

 <?php

geodirectory_hooks_actions.php

Doc Comments +2 added lines, -2 removed lines

@@ -2178,7 +2178,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $attachment_id Attachment ID.

- * @return bool|void Returns false on failure.

+ * @return false|null Returns false on failure.

  */

 function geodirectory_before_featured_image_delete($attachment_id)

 {

@@ -2685,7 +2685,7 @@ 
  * @since 1.6.16

  * @package GeoDirectory

  * @param array $classes The class array of the HTML element.

- * @return array Modified class array.

+ * @return string[] Modified class array.

  */

 function geodir_body_class_active_map($classes = array()) {

     $classes[] = 'gd-map-' . geodir_map_name();

Braces +89 added lines, -72 removed lines

@@ -86,8 +86,9 @@ 
 add_filter('query_vars', 'geodir_add_location_var');

 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

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

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+if (get_option('permalink_structure') != '') {
+    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
+}
 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -431,8 +432,9 @@ 
      */

     do_action('geodir_after_social_sharing_buttons');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

@@ -488,8 +490,9 @@ 
      */

     do_action('geodir_after_edit_post_link');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1063,8 +1066,9 @@ 
      */

     do_action('geodir_after_google_analytics');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1206,8 +1210,9 @@ 
     do_action('geodir_after_detail_page_more_info');

 

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

@@ -1334,8 +1339,9 @@ 
     $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

 

     foreach ($arr_alert_msg as $key => $value) {

-        if (!is_scalar($value))

-            continue;

+        if (!is_scalar($value)) {
+                    continue;
+        }
         $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

     }

 

@@ -1391,17 +1397,19 @@ 
     global $geodir_sidebars;

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
     $geodir_old_sidebars = array();

 

     if (is_array($geodir_sidebars)) {

         foreach ($geodir_sidebars as $val) {

             if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

+                if (array_key_exists($val, $sidebars_widgets)) {
+                                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];
+                } else {
+                                    $geodir_old_sidebars[$val] = array();
+                }
             }

         }

     }

@@ -1422,16 +1430,19 @@ 
 {

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
 

     if (is_array($sidebars_widgets)) {

         $geodir_old_sidebars = get_option('geodir_sidebars');

         if (is_array($geodir_old_sidebars)) {

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

-                if(0 === strpos($key, 'geodir_'))// if gd widget

+                if(0 === strpos($key, 'geodir_')) {
+                	// if gd widget

                 {

-                    $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

+                    $sidebars_widgets[$key] = $geodir_old_sidebars[$key];
+                }
                 }

 

 

@@ -1567,20 +1578,25 @@ 
         }

     }

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+    if ($tab == 'post_info') {
+            $is_display = (!empty($geodir_post_detail_fields)) ? true : false;
+    }
     

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+    if ($tab == 'post_images') {
+            $is_display = (!empty($post_images)) ? true : false;
+    }
 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+    if ($tab == 'post_video') {
+            $is_display = (!empty($video)) ? true : false;
+    }
 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+    if ($tab == 'special_offers') {
+            $is_display = (!empty($special_offers)) ? true : false;
+    }
 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+    if ($tab == 'reviews') {
+            $is_display = (geodir_is_page('detail')) ? true : false;
+    }
 

     if ($tab == 'related_listing') {

        $message = __('No listings found which match your selection.', 'geodirectory');

@@ -1814,11 +1830,13 @@ 
     $region_slug = $default_location->region_slug;

     $city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

+    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) {
+            return $slug_exists = true;
+    }
 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

-        return $slug_exists = true;

+    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id)))) {
+            return $slug_exists = true;
+    }
 

     return $slug_exists;

 }

@@ -1861,40 +1879,31 @@ 
     if(geodir_is_page('home')){

         $gd_page = 'home';

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

-    }

-    elseif(geodir_is_page('detail')){

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

         $gd_page = 'detail';

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

-    }

-    elseif(geodir_is_page('pt')){

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

         $gd_page = 'pt';

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

-    }

-    elseif(geodir_is_page('listing')){

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

         $gd_page = 'listing';

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

-    }

-    elseif(geodir_is_page('location')){

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

         $gd_page = 'location';

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

-    }

-    elseif(geodir_is_page('search')){

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

         $gd_page = 'search';

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

-    }

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

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

         $gd_page = 'add-listing';

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

-    }

-    elseif(geodir_is_page('author')){

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

         $gd_page = 'author';

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

-    }

-    elseif(geodir_is_page('login')){

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

         $gd_page = 'login';

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

-    }

-    elseif(geodir_is_page('listing-success')){

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

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -1972,11 +1981,13 @@ 
 

     if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+        if (get_option('geodir_listingurl_separator')) {
+                    delete_option('geodir_listingurl_separator');
+        }
 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+        if (get_option('geodir_detailurl_separator')) {
+                    delete_option('geodir_detailurl_separator');
+        }
 

         flush_rewrite_rules(false);

 

@@ -2000,8 +2011,9 @@ 
 {

     foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') {
+                    unset($permalink_arr[$key]);
+        }
 

     }

 

@@ -2136,16 +2148,18 @@ 
 

             $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

-            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

-                $tabs_arr['post_video']['heading_text'] = $field_title;

+            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') {
+                            $tabs_arr['post_video']['heading_text'] = $field_title;
+            }
         }

 

         if (array_key_exists('special_offers', $tabs_arr)) {

 

             $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

-            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

-                $tabs_arr['special_offers']['heading_text'] = $field_title;

+            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') {
+                            $tabs_arr['special_offers']['heading_text'] = $field_title;
+            }
         }

 

     }

@@ -2200,8 +2214,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

         $uploads = wp_upload_dir();

 

@@ -2275,8 +2290,9 @@ 
                         $file_info = pathinfo($attach->file);

 

                         $sub_dir = '';

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

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

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

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

                         $uploads_path = $uploads['basedir'];

@@ -2297,8 +2313,9 @@ 
 

                     if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                        if ($attachment_data->ID) {
+                                                    $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
+                        }
 

                     } else {

 

@@ -2489,7 +2506,7 @@ 
                         $variables_array['label'] = __($type['site_title'], 'geodirectory');

                         $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';

 

-                    }else{

+                    } else{

                         $i = 0;

                         $fieldset_count++;

                         $field_set_start = 1;

@@ -2618,7 +2635,7 @@ 
             $status_icon = '<i class="fa fa-play"></i>';

             if ($real_status == 'publish') {

                 $status .= __('Published', 'geodirectory');

-            }elseif ($real_status == 'pending') {

+            } elseif ($real_status == 'pending') {

                 $status .= __('Awaiting Review', 'geodirectory');

             } else {

                 $status .= __('Not published', 'geodirectory');

Spacing +198 added lines, -198 removed lines

@@ -136,7 +136,7 @@ 
 /* ON TEMPLATE INCLUDE */

 /////////////////////////

 

-add_filter('template_include', 'geodir_template_loader',9);

+add_filter('template_include', 'geodir_template_loader', 9);

 

 /////////////////////////

 /* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */

@@ -176,9 +176,9 @@ 
 /* WP REVIEW COUNT ACTIONS */

 ////////////////////////

 

-add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100,1);

+add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100, 1);

 //add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);

-add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);

+add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);

 //add_action('created_term', 'geodir_term_review_count_force_update', 100);

 add_action('edited_term', 'geodir_term_review_count_force_update', 100);

 add_action('delete_term', 'geodir_term_review_count_force_update', 100);

@@ -223,7 +223,7 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

+    $geodir_theme_location = get_option('geodir_theme_location_nav_'.$newname);

     if ($geodir_theme_location) {

         update_option('geodir_theme_location_nav', $geodir_theme_location);

     } else {

@@ -258,13 +258,13 @@ 
     include_once('geodirectory-functions/listing_filters.php');

     

     // Theme My Login compatibility fix

-    if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {

-        remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) );

+    if (isset($_REQUEST['geodir_search']) && class_exists('Theme_My_Login')) {

+        remove_action('pre_get_posts', array(Theme_My_Login::get_object(), 'pre_get_posts'));

     }

     

-    if ( isset( $_REQUEST['geodir_search'] ) ) {

-        add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 );

-        add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 );

+    if (isset($_REQUEST['geodir_search'])) {

+        add_filter('geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3);

+        add_filter('geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3);

     }

 }

 

@@ -331,8 +331,8 @@ 
 

 /////// GEO DIRECOTORY CUSTOM HOOKS ///

 

-add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content 

-add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content

+add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content 

+add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content

 

 // Detail page sidebar content 

 add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);

@@ -432,8 +432,8 @@ 
     do_action('geodir_after_social_sharing_buttons');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

          *

@@ -473,12 +473,12 @@ 
             $post_id = $post->ID;

             

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

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

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

             }

 

             $postlink = get_permalink(geodir_add_listing_page_id());

             $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

-            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

+            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="'.esc_url($editlink).'">'.__('Edit this Post', 'geodirectory').'</a></p>';

         }

     }// end of if, if its a preview or not

     /**

@@ -489,8 +489,8 @@ 
     do_action('geodir_after_edit_post_link');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -511,8 +511,8 @@ 
  */

 function geodir_detail_page_google_analytics()

 {

-    global $post,$preview;

-    if($preview){return '';}

+    global $post, $preview;

+    if ($preview) {return ''; }

     $package_info = array();

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

 

@@ -544,14 +544,14 @@ 
     $hide_refresh = get_option('geodir_ga_auto_refresh');

     

     $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+    if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {

         $page_url = urlencode($_SERVER['REQUEST_URI']);

         ?>

         <script type="text/javascript">

             var gd_gaTimeOut;

-            var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

-            var gd_gaHideRefresh = <?php echo (int)$hide_refresh;?>;

-            var gd_gaAutoRefresh = <?php echo $auto_refresh;?>;

+            var gd_gaTime = parseInt('<?php echo $refresh_time; ?>');

+            var gd_gaHideRefresh = <?php echo (int) $hide_refresh; ?>;

+            var gd_gaAutoRefresh = <?php echo $auto_refresh; ?>;

             ga_data1 = false;

             ga_data2 = false;

             ga_data3 = false;

@@ -692,7 +692,7 @@ 
             }

 

             function gdga_noResults() {

-                jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');

+                jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');

                 jQuery('#gdga-legend-container').html('');

             }

 

@@ -724,18 +724,18 @@ 
                     var data2 = results[1].rows.map(function(row) { return +row[2]; });

                     //var labelsN = results[0].rows.map(function(row) { return +row[1]; });

 

-                    var labels = ['<?php _e('Jan', 'geodirectory');?>',

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

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

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

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

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

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

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

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

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

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

-                        '<?php _e('Dec', 'geodirectory');?>'];

+                    var labels = ['<?php _e('Jan', 'geodirectory'); ?>',

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

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

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

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

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

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

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

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

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

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

+                        '<?php _e('Dec', 'geodirectory'); ?>'];

 

                     // Ensure the data arrays are at least as long as the labels array.

                     // Chart.js bar charts don't (yet) accept sparse datasets.

@@ -748,13 +748,13 @@ 
                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Year', 'geodirectory');?>',

+                                label: '<?php _e('Last Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Year', 'geodirectory');?>',

+                                label: '<?php _e('This Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 data : data1

@@ -799,30 +799,30 @@ 
 

                     <?php

                     // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

+                    __("Mon", 'geodirectory');

+                    __("Tue", 'geodirectory');

+                    __("Wed", 'geodirectory');

+                    __("Thu", 'geodirectory');

+                    __("Fri", 'geodirectory');

+                    __("Sat", 'geodirectory');

+                    __("Sun", 'geodirectory');

                     ?>

 

                     labels = [

-                        "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"

+                        "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"

                     ];

 

                     var data = {

                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Week', 'geodirectory');?>',

+                                label: '<?php _e('Last Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 pointColor : "rgba(220,220,220,1)",

@@ -830,7 +830,7 @@ 
                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Week', 'geodirectory');?>',

+                                label: '<?php _e('This Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 pointColor : "rgba(151,187,205,1)",

@@ -1037,18 +1037,18 @@ 
         </style>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>

-        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory');?></button>

+        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory'); ?></button>

         <span id="ga_stats" class="gdga-analytics-box" style="display:none">

-            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>

+            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>

             <div id="gd-active-users-container">

-                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory');?>"></i><?php _e("Active Users:", 'geodirectory');?>

+                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory'); ?>"></i><?php _e("Active Users:", 'geodirectory'); ?>

                     <b class="gd-ActiveUsers-value">0</b>

                 </div>

             </div>

             <select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;">

-                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>

-                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>

-                <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>

+                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>

+                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>

+                <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>

             </select>

             <div class="Chartjs-figure" id="gdga-chart-container"></div>

             <ol class="Chartjs-legend" id="gdga-legend-container"></ol>

@@ -1064,8 +1064,8 @@ 
     do_action('geodir_after_google_analytics');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -1091,7 +1091,7 @@ 
 {

     global $post, $preview, $post_images;

     

-    if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {

+    if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int) $post->ID)) {

         return;

     }

     ob_start(); // Start  buffering;

@@ -1126,10 +1126,10 @@ 
        

 	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

-	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

+	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="'.$post_avgratings.'">'.$post_avgratings.'</span> / <span itemprop="best" content="5">5</span> '.__("based on", 'geodirectory').' </span><span class="count" itemprop="count" content="'.$comment_count.'">'.$comment_count.' '.$reviews_text.'</span><br />';

 

         $html .= '<span class="item">';

-        $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

+        $html .= '<span class="fn" itemprop="itemreviewed">'.$post->post_title.'</span>';

 

         if ($post_images) {

             foreach ($post_images as $img) {

@@ -1139,7 +1139,7 @@ 
         }

 

         if (isset($post_img) && $post_img) {

-            $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

+            $html .= '<br /><img src="'.$post_img.'" class="photo" alt="'.esc_attr($post->post_title).'" itemprop="photo" content="'.$post_img.'" class="photo" />';

         }

 

         $html .= '</span>';

@@ -1166,9 +1166,9 @@ 
     do_action('geodir_after_detail_page_review_rating');

     $content_html = ob_get_clean();

     if (trim($content_html) != '') {

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">'.$content_html.'</div>';

     }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+    if ((int) get_option('geodir_disable_rating_info_section') != 1) {

         /**

          * Filter the geodir_detail_page_review_rating() function content.

          *

@@ -1207,8 +1207,8 @@ 
 

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

          *

@@ -1307,7 +1307,7 @@ 
 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

 		'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

-		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

+		'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

         'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,

         'geodir_map_name' => geodir_map_name(),

@@ -1336,10 +1336,10 @@ 
     foreach ($arr_alert_msg as $key => $value) {

         if (!is_scalar($value))

             continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+        $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');

     }

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

+    $script = "var geodir_all_js_msg = ".json_encode($arr_alert_msg).';';

     echo '<script>';

     echo $script;

     echo '</script>';

@@ -1429,7 +1429,7 @@ 
         $geodir_old_sidebars = get_option('geodir_sidebars');

         if (is_array($geodir_old_sidebars)) {

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

-                if(0 === strpos($key, 'geodir_'))// if gd widget

+                if (0 === strpos($key, 'geodir_'))// if gd widget

                 {

                     $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

                 }

@@ -1508,7 +1508,7 @@ 
         global $post;

         $term_condition = '';

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

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

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

             $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

         }

 

@@ -1522,7 +1522,7 @@ 
                     echo 'checked="checked"';

                 } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

-                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

+                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

@@ -1562,7 +1562,7 @@ 
         /** This action is documented in geodirectory_template_actions.php */

         $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+        if (!($desc_limit === '' || (int) $desc_limit > 0)) {

             $is_display = false;

         }

     }

@@ -1610,16 +1610,16 @@ 
     global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

-	$listings_page_id = (int)get_option('geodir_listing_page');

+	$listings_page_id = (int) get_option('geodir_listing_page');

 	if ($listings_page_id) {

-		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

+		$wpdb->query($wpdb->prepare("DELETE FROM ".$wpdb->posts." WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

         delete_option('geodir_listing_page');

 	}

 

     if (!get_option('geodir_changes_in_custom_fields_table')) {

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

+                "UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET is_default=%s, is_admin=%s WHERE is_default=%s",

                 array('1', '1', 'admin')

             )

         );

@@ -1627,9 +1627,9 @@ 
 

         /* --- terms meta value set --- */

 

-        update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

+        update_option('geodir_default_marker_icon', geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png');

 

-        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

+        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."options WHERE option_name LIKE %s", array('%tax_meta_%')));

 

         if (!empty($options_data)) {

 

@@ -1637,7 +1637,7 @@ 
 

                 $option_val = str_replace('tax_meta_', '', $optobj->option_name);

 

-                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

+                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM ".$wpdb->prefix."term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

 

                 if (!empty($taxonomies_data)) {

 

@@ -1646,17 +1646,17 @@ 
                         $taxObject = get_taxonomy($taxobj->taxonomy);

                         $post_type = $taxObject->object_type[0];

 

-                        $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

+                        $opt_value = 'tax_meta_'.$post_type.'_'.$option_val;

 

-                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

+                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM ".$wpdb->prefix."options WHERE option_name=%s", array('tax_meta_'.$option_val)));

 

                         if ($duplicate_data) {

 

-                            $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

+                            $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->prefix."options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

 

                         } else {

 

-                            $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

+                            $wpdb->query($wpdb->prepare("INSERT INTO ".$wpdb->prefix."options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

 

                         }

 

@@ -1690,14 +1690,14 @@ 
 

     global $wpdb, $table_prefix;

 

-    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

+    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($slug)));

 

     if ($slug_exists) {

 

         $suffix = 1;

         do {

-            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

-            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

+            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";

+            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($alt_location_name)));

             $suffix++;

         } while ($location_slug_check && $suffix < 100);

 

@@ -1751,7 +1751,7 @@ 
 

         $suffix = 1;

         do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";

 

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

             $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

@@ -1763,7 +1763,7 @@ 
 

         //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

 

-        $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

+        $wpdb->query($wpdb->prepare("UPDATE ".$table_prefix."terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

 

     }

 	

@@ -1772,18 +1772,18 @@ 
 	$post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;

 	

 	$post_types = geodir_get_posttypes();

-	if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {		

-		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));

+	if ($post_type && in_array($post_type, $post_types) && $post_type.'_tags' == $taxonomy) {		

+		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM ".$wpdb->term_relationships." WHERE term_taxonomy_id = %d", array($tt_id)));

 		

 		if (!empty($posts_obj)) {

 			foreach ($posts_obj as $post_obj) {

 				$post_id = $post_obj->object_id;

 				

-				$raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));

+				$raw_tags = wp_get_object_terms($post_id, $post_type.'_tags', array('fields' => 'names'));

 				$post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';

 				

-				$listing_table = $plugin_prefix . $post_type . '_detail';

-				$wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

+				$listing_table = $plugin_prefix.$post_type.'_detail';

+				$wpdb->query($wpdb->prepare("UPDATE ".$listing_table." SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

 			}

 		}

 	}

@@ -1817,7 +1817,7 @@ 
     if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

         return $slug_exists = true;

 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

+    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

         return $slug_exists = true;

 

     return $slug_exists;

@@ -1858,43 +1858,43 @@ 
 

 

     $gd_page = '';

-    if(geodir_is_page('home')){

+    if (geodir_is_page('home')) {

         $gd_page = 'home';

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

     }

-    elseif(geodir_is_page('detail')){

+    elseif (geodir_is_page('detail')) {

         $gd_page = 'detail';

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

     }

-    elseif(geodir_is_page('pt')){

+    elseif (geodir_is_page('pt')) {

         $gd_page = 'pt';

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

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

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

     }

-    elseif(geodir_is_page('location')){

+    elseif (geodir_is_page('location')) {

         $gd_page = 'location';

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

     }

-    elseif(geodir_is_page('search')){

+    elseif (geodir_is_page('search')) {

         $gd_page = 'search';

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

     }

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

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

         $gd_page = 'add-listing';

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

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

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

     }

-    elseif(geodir_is_page('login')){

+    elseif (geodir_is_page('login')) {

         $gd_page = 'login';

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

     }

-    elseif(geodir_is_page('listing-success')){

+    elseif (geodir_is_page('listing-success')) {

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -1926,12 +1926,12 @@ 
 

     if (!get_option('geodir_set_post_attachments')) {

 

-        require_once(ABSPATH . 'wp-admin/includes/image.php');

-        require_once(ABSPATH . 'wp-admin/includes/file.php');

+        require_once(ABSPATH.'wp-admin/includes/image.php');

+        require_once(ABSPATH.'wp-admin/includes/file.php');

 

         $all_postypes = geodir_get_posttypes();

 

-        foreach($all_postypes as $post_type){

+        foreach ($all_postypes as $post_type) {

             $args = array(

                 'posts_per_page' => -1,

                 'post_type' => $post_type,

@@ -2025,7 +2025,7 @@ 
 {

     $user_id = get_current_user_id();

 

-    if(!$user_id){return $post;}

+    if (!$user_id) {return $post; }

 

     $gd_post_types = geodir_get_posttypes();

 

@@ -2134,7 +2134,7 @@ 
 

         if (array_key_exists('post_video', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

+            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

             if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

                 $tabs_arr['post_video']['heading_text'] = $field_title;

@@ -2142,7 +2142,7 @@ 
 

         if (array_key_exists('special_offers', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

+            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

             if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

                 $tabs_arr['special_offers']['heading_text'] = $field_title;

@@ -2163,7 +2163,7 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

+    if (geodir_is_page('login')) {

         remove_all_actions('template_redirect');

         remove_action('init', 'avia_modify_front', 10);

     }

@@ -2210,25 +2210,25 @@ 
         $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

         $wpdb->query(

-            $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

+            $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d AND file=%s ",

                 array($post_id, $split_img_file_path)

             )

         );

 

         $attachment_data = $wpdb->get_row(

-            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

+            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=%d",

                 array($post_id)

             )

         );

 

         if (!empty($attachment_data)) {

-            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

         }

 

 

-        $table_name = $plugin_prefix . $post_type . '_detail';

+        $table_name = $plugin_prefix.$post_type.'_detail';

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

+        $wpdb->query("UPDATE ".$table_name." SET featured_image='' WHERE post_id =".$post_id);

 

         geodir_set_wp_featured_image($post_id);

 

@@ -2256,9 +2256,9 @@ 
 

     foreach ($all_postypes as $posttype) {

 

-        $tablename = $plugin_prefix . $posttype . '_detail';

+        $tablename = $plugin_prefix.$posttype.'_detail';

 

-        $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

+        $get_post_data = $wpdb->get_results("SELECT post_id FROM ".$tablename);

 

         if (!empty($get_post_data)) {

 

@@ -2266,7 +2266,7 @@ 
 

                 $post_id = $data->post_id;

 

-                $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

+                $attachment_data = $wpdb->get_results("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id =".$post_id." AND file!=''");

 

                 if (!empty($attachment_data)) {

 

@@ -2283,22 +2283,22 @@ 
 

                         $file_name = $file_info['basename'];

 

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

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

 

                         if (!file_exists($img_arr['path'])) {

 

-                            $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

+                            $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ID=".$attach->ID);

 

                         }

 

                     }

 

-                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

+                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=".$post_id." GROUP BY post_id");

 

                     if (!empty($attachment_data)) {

 

                         if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

 

                     } else {

 

@@ -2312,7 +2312,7 @@ 
 

                     }

 

-                    $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

+                    $wpdb->query("UPDATE ".$tablename." SET featured_image='' WHERE post_id =".$post_id);

 

                     geodir_set_wp_featured_image($post_id);

 

@@ -2341,7 +2341,7 @@ 
 {

 

     if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+        update_option('geodir_default_rating_star_icon', geodir_plugin_url().'/geodirectory-assets/images/stars.png');

     }

 

 }

@@ -2361,7 +2361,7 @@ 
 function geodir_user_post_listing_count($user_id = 0)

 {

     global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

+    if (!$user_id) {

         $user_id = $current_user->ID;

     }

 

@@ -2370,7 +2370,7 @@ 
     $user_listing = array();

     if ($user_id && is_array($all_posts) && !empty($all_posts)) {

         foreach ($all_posts as $ptype) {

-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' OR post_status = 'pending' )");

+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_author=".$user_id." AND post_type='".$ptype."' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' OR post_status = 'pending' )");

 

             if ($total_posts > 0) {

                 $user_listing[$ptype] = $total_posts;

@@ -2411,19 +2411,19 @@ 
 

         $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

         //remove video and special offers if it is already set to show

-        if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

+        if (isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']) {

             $unset_video = true;

         }

 

-        if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

+        if (isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']) {

             $unset_special_offers = true;

         }

-        if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

-            foreach($custom_fields as $key => $custom_field){

-                if($custom_field['name']=='geodir_video' && isset($unset_video)){

+        if (isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)) {

+            foreach ($custom_fields as $key => $custom_field) {

+                if ($custom_field['name'] == 'geodir_video' && isset($unset_video)) {

                     unset($custom_fields[$key]);

                 }

-                if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

+                if ($custom_field['name'] == 'geodir_special_offers' && isset($unset_special_offers)) {

                     unset($custom_fields[$key]);

                 }

             }

@@ -2440,7 +2440,7 @@ 
                     $post->{$field_name} = $_REQUEST[$field_name];

                 }

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {

                     if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

                         continue;

                     }

@@ -2473,7 +2473,7 @@ 
                     $post->{$field_name} = $_REQUEST[$field_name];

                 }

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {

                     $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

                     $site_title = trim($field['site_title']);

                     $type = $field;

@@ -2489,21 +2489,21 @@ 
                         $variables_array['label'] = __($type['site_title'], 'geodirectory');

                         $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';

 

-                    }else{

+                    } else {

                         $i = 0;

                         $fieldset_count++;

                         $field_set_start = 1;

-                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_'.$fieldset_count;

                         $fieldset_arr[$fieldset_count]['label'] = $label;

                     }

 

 

-                    if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

+                    if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }

                     $type = stripslashes_deep($type); // strip slashes

-                    if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

+                    if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }

                     $html = '';

                     $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

-                    if($html_var=='post'){$html_var='post_address';}

+                    if ($html_var == 'post') {$html_var = 'post_address'; }

                     $field_icon = geodir_field_icon_proccess($type);

                     $filed_type = $type['type'];

 

@@ -2516,7 +2516,7 @@ 
                      * @param string $fields_location The location the field is to be show.

                      * @param array $type The array of field values.

                      */

-                    $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+                    $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);

 

 

                     /**

@@ -2562,7 +2562,7 @@ 
                                  * @param string $htmlvar_name The field HTML var name.

                                  */

                                 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

-                                'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

+                                'tab_content' => '<div class="geodir-company_info field-group xxx">'.$fieldset_html.'</div>'

                             );

                         }

                     } else {

@@ -2626,7 +2626,7 @@ 
             }

             $status .= ")</strong>";

 

-            $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

+            $html = '<span class="geodir-post-status">'.$status_icon.' <font class="geodir-status-label">'.__('Status: ', 'geodirectory').'</font>'.$status.'</span>';

         }

     }

 

@@ -2695,7 +2695,7 @@ 
  * @return array Modified class array.

  */

 function geodir_body_class_active_map($classes = array()) {

-    $classes[] = 'gd-map-' . geodir_map_name();

+    $classes[] = 'gd-map-'.geodir_map_name();

 

     return $classes;

 }

@@ -2710,7 +2710,7 @@ 
  * @return string Modified class string.

  */

 function geodir_admin_body_class_active_map($class = '') {    

-    $class .= ' gd-map-' . geodir_map_name();

+    $class .= ' gd-map-'.geodir_map_name();

 

     return $class;

 }

@@ -2730,7 +2730,7 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+    $translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array();

 

     $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

 

@@ -2796,17 +2796,17 @@ 
  * @param array $args The array of menu arguments.

  * @return array The modified arguments.

  */

-function geodir_add_nav_menu_class( $args )

+function geodir_add_nav_menu_class($args)

 {

 

-        if(isset($args['menu_class'])){

+        if (isset($args['menu_class'])) {

             $args['menu_class'] = $args['menu_class']." gd-menu-z";

         }

     

     return $args;

 }

 

-add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );

+add_filter('wp_nav_menu_args', 'geodir_add_nav_menu_class');

 

 /**

  * Filters WordPress locale ID.

@@ -2846,9 +2846,9 @@ 
         }

         

         add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);

-        add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 );

+        add_action('geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1);

         if (is_admin()) {

-            add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 );

+            add_filter('geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1);

         }

     }

 }

@@ -2877,7 +2877,7 @@ 
         }        

         

         if (!empty($keep_vars)) {

-            foreach ( $languages as $code => $url) {

+            foreach ($languages as $code => $url) {

                 $filter_url = $url['url'];

                 

                 foreach ($keep_vars as $var) {

@@ -2896,7 +2896,7 @@ 
 

     return $languages;

 }

-add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );

+add_filter('icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1);

 

 /**

  * Remove Yoast SEO hook if disabled on GD pages.

@@ -2904,18 +2904,18 @@ 
  * @since 1.6.18

  *

  */

-function geodir_remove_yoast_seo_metas(){

-    if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {

+function geodir_remove_yoast_seo_metas() {

+    if (class_exists('WPSEO_Frontend') && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas()) {

         $wpseo = WPSEO_Frontend::get_instance();

         

-        remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 );

-        remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 );

-        remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 );

-        remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 );

-        remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 );

-        remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 );

+        remove_action('wp_head', array($wpseo, 'metadesc'), 6);

+        remove_action('wp_head', array($wpseo, 'metakeywords'), 11);

+        remove_filter('pre_get_document_title', array($wpseo, 'title'), 15);

+        remove_filter('wp_title', array($wpseo, 'title'), 15, 3);

+        remove_filter('thematic_doctitle', array($wpseo, 'title'), 15);

+        remove_filter('woo_title', array($wpseo, 'fix_woo_title'), 99);

         

-        remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 );

+        remove_action('template_redirect', 'wpseo_frontend_head_init', 999);

     }

 }

 

@@ -2930,22 +2930,22 @@ 
  *

  */

  function geodir_wpml_ajax_set_guest_lang() {    

-    if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {

-        if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {

+    if (geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in()) {

+        if (empty($_GET['lang']) && !(!empty($_SERVER['REQUEST_URI']) && preg_match('@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename(preg_replace('@\?.*$@', '', $_SERVER['REQUEST_URI']))))) {

             global $sitepress;

             

             $referer = wp_get_referer();

             

             $current_lang = $sitepress->get_current_language();

-            $referrer_lang = $sitepress->get_language_from_url( $referer );

+            $referrer_lang = $sitepress->get_language_from_url($referer);

             

-            if ( $referrer_lang && $current_lang != $referrer_lang ) {

+            if ($referrer_lang && $current_lang != $referrer_lang) {

                 $_GET['lang'] = $referrer_lang;

             }

         }

     }

 }

-add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 );

+add_action('plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1);

 

 /**

  * Change country slug czech-republic to czechia and redirect.

@@ -2966,18 +2966,18 @@ 
         }

         

         $redirect = false;

-        if (strpos($current_url, '/' . $search . '/') !== false) {

+        if (strpos($current_url, '/'.$search.'/') !== false) {

             $redirect = true;

-            $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);

+            $current_url = preg_replace('/\/'.$search.'\//', '/'.$replace.'/', $current_url, 1);

         }

         

         if ($has_slash != "/") {

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

         }

         

-        if (strpos($current_url, 'gd_country=' . $search) !== false) {

+        if (strpos($current_url, 'gd_country='.$search) !== false) {

             $redirect = true;

-            $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);

+            $current_url = str_replace('gd_country='.$search, 'gd_country='.$replace, $current_url);

         }

 

         if ($redirect) {

@@ -3003,10 +3003,10 @@ 
  * @param int    $post_parent   Post parent ID

  * @param string $original_slug The original post slug.

  */

-function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {

+function geodir_check_post_to_term_slug($slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug) {

     global $wpdb, $sitepress;

     

-    if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {

+    if ($post_type && strpos($post_type, 'gd_') === 0) {

         $wpml_post_join = "";

         $wpml_post_where = "";

         $wpml_term_join = "";

@@ -3020,28 +3020,28 @@ 
             }

             

             $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

-            $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'";

+            $wpml_post_where = " AND icl_t.language_code = '".$post_language."'";

             

             $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";

-            $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'";

+            $wpml_term_where = " AND icl_t.language_code = '".$post_language."'";

         }

 

-        $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );

+        $term_slug_check = $wpdb->get_var($wpdb->prepare("SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '".$post_type."category' OR tt.taxonomy = '".$post_type."_tags' ) {$wpml_term_where} LIMIT 1", $slug));

 

-        if ( $term_slug_check ) {

+        if ($term_slug_check) {

             $suffix = 1;

             

             do {

-                $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";

+                $alt_slug = _truncate_post_slug($original_slug, 200 - (strlen($suffix) + 1))."-$suffix";

                 

-                $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );

+                $term_check = $wpdb->get_var($wpdb->prepare("SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '".$post_type."category' OR tt.taxonomy = '".$post_type."_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug));

                 

-                $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );

+                $post_check = !$term_check && $wpdb->get_var($wpdb->prepare("SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID));

                 

                 $term_slug_check = $term_check || $post_check;

                 

                 $suffix++;

-            } while ( $term_slug_check );

+            } while ($term_slug_check);

             

             $slug = $alt_slug;

         }

@@ -3049,7 +3049,7 @@ 
     

     return $slug;

 }

-add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 );

+add_filter('wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6);

 

 /**

  * Check whether a post name with slug exists or not.

@@ -3066,48 +3066,48 @@ 
  * @param int $term_id The term ID.

  * @return bool true when exists. false when not exists.

  */

-function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {

+function geodir_check_term_to_post_slug($slug_exists, $slug, $term_id) {

     global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress;

     

-    if ( $slug_exists ) {

+    if ($slug_exists) {

         return $slug_exists;

     }

     

-    if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {

+    if (!empty($gd_term_taxonomy) && isset($gd_term_taxonomy[$term_id])) {

         $taxonomy = $gd_term_taxonomy[$term_id];

     } else {

-        $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) );

+        $taxonomy = $wpdb->get_var($wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id));

         $gd_term_taxonomy[$term_id] = $taxonomy;

     }

     

-    if ( empty($taxonomy) ) {

+    if (empty($taxonomy)) {

         return $slug_exists;

     }

     

-    if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {

+    if (!empty($gd_term_post_type) && $gd_term_post_type[$term_id]) {

         $post_type = $gd_term_post_type[$term_id];

     } else {

-        $taxonomy_obj = get_taxonomy( $taxonomy );

-        $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL;

+        $taxonomy_obj = get_taxonomy($taxonomy);

+        $post_type = !empty($taxonomy_obj->object_type) ? $taxonomy_obj->object_type[0] : NULL;

     }

     

     $wpml_post_join = "";

     $wpml_post_where = "";

     

     if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {

-        $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language();

+        $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_'.$taxonomy) : $sitepress->get_current_language();

         if (!$term_language) {

             $term_language = $sitepress->get_current_language();

         }

         

         $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

-        $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'";

+        $wpml_post_where = " AND icl_t.language_code = '".$term_language."'";

     }

     

-    if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s  {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {

+    if ($post_type && $wpdb->get_var($wpdb->prepare("SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s  {$wpml_post_where} LIMIT 1", $slug, $post_type))) {

         $slug_exists = true;

     }

 

     return $slug_exists;

 }

-add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 );
\ No newline at end of file
+add_filter('geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3);
\ No newline at end of file

Indentation +1212 added lines, -1212 removed lines

@@ -19,7 +19,7 @@ 
  */

 function geodir_get_ajax_url()

 {

-    return admin_url('admin-ajax.php?action=geodir_ajax_action');

+	return admin_url('admin-ajax.php?action=geodir_ajax_action');

 }

 

 /////////////////////

@@ -87,7 +87,7 @@ 
 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

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

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+	add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -154,14 +154,14 @@ 
 /* POST AND LOOP ACTIONS */

 ////////////////////////

 if (!is_admin()) {

-    add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere

-    add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

-    /** Exclude Virtual Pages From Pages List **/

-    add_action('pre_get_posts', 'set_listing_request', 0);

-    add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

-    add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

-    add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

-    add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

+	add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere

+	add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

+	/** Exclude Virtual Pages From Pages List **/

+	add_action('pre_get_posts', 'set_listing_request', 0);

+	add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

+	add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

+	add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

+	add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

 }

 

 

@@ -223,12 +223,12 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

-    if ($geodir_theme_location) {

-        update_option('geodir_theme_location_nav', $geodir_theme_location);

-    } else {

-        update_option('geodir_theme_location_nav', '');

-    }

+	$geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

+	if ($geodir_theme_location) {

+		update_option('geodir_theme_location_nav', $geodir_theme_location);

+	} else {

+		update_option('geodir_theme_location_nav', '');

+	}

 }

 

 /// add action for theme switch to blank previous theme navigation location setting

@@ -249,42 +249,42 @@ 
  */

 function geodir_add_post_filters()

 {

-    /**

-     * Contains all function for filtering listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-functions/listing_filters.php');

+	/**

+	 * Contains all function for filtering listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-functions/listing_filters.php');

     

-    // Theme My Login compatibility fix

-    if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {

-        remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) );

-    }

+	// Theme My Login compatibility fix

+	if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {

+		remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) );

+	}

     

-    if ( isset( $_REQUEST['geodir_search'] ) ) {

-        add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 );

-        add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 );

-    }

+	if ( isset( $_REQUEST['geodir_search'] ) ) {

+		add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 );

+		add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 );

+	}

 }

 

 

 if (!function_exists('geodir_init_defaults')) {

-    /**

-     * Calls the function to register the GeoDirectory default CPT and taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_init_defaults()

-    {

-        if (function_exists('geodir_register_defaults')) {

+	/**

+	 * Calls the function to register the GeoDirectory default CPT and taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_init_defaults()

+	{

+		if (function_exists('geodir_register_defaults')) {

 

-            geodir_register_defaults();

+			geodir_register_defaults();

 

-        }

+		}

 

-    }

+	}

 }

 

 

@@ -306,26 +306,26 @@ 
 // CALLED ON 'sidebars_widgets' FILTER

 

 if (!function_exists('geodir_restrict_widget')) {

-    /**

-     * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

-     *

-     * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

-     * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_restrict_widget()

-    {

-        global $is_listing, $is_single_place;

+	/**

+	 * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

+	 *

+	 * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

+	 * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_restrict_widget()

+	{

+		global $is_listing, $is_single_place;

 

-        // set is listing	

-        (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

+		// set is listing	

+		(geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

 

-        // set is single place

-        (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

+		// set is single place

+		(geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

 

 

-    }

+	}

 }

 

 

@@ -346,31 +346,31 @@ 
  */

 function geodir_detail_page_sidebar_content_sorting()

 {

-    $arr_detail_page_sidebar_content =

-        /**

-         * An array of functions to be called to be displayed on the details (post) page sidebar.

-         *

-         * This filter can be used to remove sections of the details page sidebar,

-         * add new sections or rearrange the order of the sections.

-         *

-         * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

-         * @since 1.0.0

-         */

-        apply_filters('geodir_detail_page_sidebar_content',

-            array('geodir_social_sharing_buttons',

-                'geodir_detail_page_google_analytics',

-                'geodir_edit_post_link',

-                'geodir_detail_page_review_rating',

-                'geodir_detail_page_more_info'

-            ) // end of array 

-        ); // end of apply filter

-    if (!empty($arr_detail_page_sidebar_content)) {

-        foreach ($arr_detail_page_sidebar_content as $content_function) {

-            if (function_exists($content_function)) {

-                add_action('geodir_detail_page_sidebar', $content_function);

-            }

-        }

-    }

+	$arr_detail_page_sidebar_content =

+		/**

+		 * An array of functions to be called to be displayed on the details (post) page sidebar.

+		 *

+		 * This filter can be used to remove sections of the details page sidebar,

+		 * add new sections or rearrange the order of the sections.

+		 *

+		 * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

+		 * @since 1.0.0

+		 */

+		apply_filters('geodir_detail_page_sidebar_content',

+			array('geodir_social_sharing_buttons',

+				'geodir_detail_page_google_analytics',

+				'geodir_edit_post_link',

+				'geodir_detail_page_review_rating',

+				'geodir_detail_page_more_info'

+			) // end of array 

+		); // end of apply filter

+	if (!empty($arr_detail_page_sidebar_content)) {

+		foreach ($arr_detail_page_sidebar_content as $content_function) {

+			if (function_exists($content_function)) {

+				add_action('geodir_detail_page_sidebar', $content_function);

+			}

+		}

+	}

 }

 

 add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);

@@ -385,14 +385,14 @@ 
  */

 function geodir_add_to_favourite_link()

 {

-    global $post, $preview;

-    if (!$preview && geodir_is_page('detail')) {

-        ?>

+	global $post, $preview;

+	if (!$preview && geodir_is_page('detail')) {

+		?>

         <p class="edit_link">

             <?php geodir_favourite_html($post->post_author, $post->ID); ?>

         </p>

     <?php

-    }

+	}

 }

 

 /**

@@ -406,41 +406,41 @@ 
  */

 function geodir_social_sharing_buttons()

 {

-    global $preview;

-    ob_start(); // Start  buffering;

-    /**

-     * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_social_sharing_buttons');

-    if (!$preview) {

-        ?>

+	global $preview;

+	ob_start(); // Start  buffering;

+	/**

+	 * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_social_sharing_buttons');

+	if (!$preview) {

+		?>

         <div class="likethis">

             <?php geodir_twitter_tweet_button(); ?>

             <?php geodir_fb_like_button(); ?>

             <?php geodir_google_plus_button(); ?>

         </div>

     <?php

-    }// end of if, if its a preview or not

-

-    /**

-     * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_social_sharing_buttons');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

-        /**

-         * Filter the geodir_social_sharing_buttons() function content.

-         *

-         * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

-         */

-        echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

-    }

+	}// end of if, if its a preview or not

+

+	/**

+	 * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_social_sharing_buttons');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+		/**

+		 * Filter the geodir_social_sharing_buttons() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

+		 */

+		echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

+	}

 

 

 }

@@ -458,46 +458,46 @@ 
  */

 function geodir_edit_post_link()

 {

-    global $post, $preview;

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_edit_post_link');

-    if (!$preview) {

-        $is_current_user_owner = geodir_listing_belong_to_current_user();

+	global $post, $preview;

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_edit_post_link');

+	if (!$preview) {

+		$is_current_user_owner = geodir_listing_belong_to_current_user();

         

-        if ($is_current_user_owner) {

-            $post_id = $post->ID;

+		if ($is_current_user_owner) {

+			$post_id = $post->ID;

             

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

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

-            }

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

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

+			}

 

-            $postlink = get_permalink(geodir_add_listing_page_id());

-            $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

-            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

-        }

-    }// end of if, if its a preview or not

-    /**

-     * This is called after the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_edit_post_link');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

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

-         */

-        echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

-    }

+			$postlink = get_permalink(geodir_add_listing_page_id());

+			$editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

+			echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

+		}

+	}// end of if, if its a preview or not

+	/**

+	 * This is called after the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_edit_post_link');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_user_links_section') != 1) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

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

+		 */

+		echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

+	}

 }

 

 /**

@@ -511,42 +511,42 @@ 
  */

 function geodir_detail_page_google_analytics()

 {

-    global $post,$preview;

-    if($preview){return '';}

-    $package_info = array();

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

+	global $post,$preview;

+	if($preview){return '';}

+	$package_info = array();

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

 

-    $id = trim(get_option('geodir_ga_account_id'));

+	$id = trim(get_option('geodir_ga_account_id'));

 

-    if (!$id) {

-        return; //if no Google Analytics ID then bail.

-    }

+	if (!$id) {

+		return; //if no Google Analytics ID then bail.

+	}

 

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_google_analytics');

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_google_analytics');

     

-    $refresh_time = get_option('geodir_ga_refresh_time', 5);

-    /**

-     * Filter the time interval to check & refresh new users results.

-     *

-     * @since 1.5.9

-     *

-     * @param int $refresh_time Time interval to check & refresh new users results.

-     */

-    $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

-    $refresh_time = absint($refresh_time * 1000);

+	$refresh_time = get_option('geodir_ga_refresh_time', 5);

+	/**

+	 * Filter the time interval to check & refresh new users results.

+	 *

+	 * @since 1.5.9

+	 *

+	 * @param int $refresh_time Time interval to check & refresh new users results.

+	 */

+	$refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

+	$refresh_time = absint($refresh_time * 1000);

     

-    $hide_refresh = get_option('geodir_ga_auto_refresh');

+	$hide_refresh = get_option('geodir_ga_auto_refresh');

     

-    $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

-        $page_url = urlencode($_SERVER['REQUEST_URI']);

-        ?>

+	$auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

+	if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+		$page_url = urlencode($_SERVER['REQUEST_URI']);

+		?>

         <script type="text/javascript">

             var gd_gaTimeOut;

             var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

@@ -798,15 +798,15 @@ 
                     var labels = results[1].rows.map(function(row) { return +row[0]; });

 

                     <?php

-                    // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

-                    ?>

+					// Here we list the shorthand days of the week so it can be used in translation.

+					__("Mon",'geodirectory');

+					__("Tue",'geodirectory');

+					__("Wed",'geodirectory');

+					__("Thu",'geodirectory');

+					__("Fri",'geodirectory');

+					__("Sat",'geodirectory');

+					__("Sun",'geodirectory');

+					?>

 

                     labels = [

                         "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

@@ -1055,24 +1055,24 @@ 
         </span>

 

     <?php

-    }

-    /**

-     * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_google_analytics');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

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

-         */

-        echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

-    }

+	}

+	/**

+	 * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_google_analytics');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

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

+		 */

+		echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

+	}

 }

 

 /**

@@ -1089,94 +1089,94 @@ 
  */

 function geodir_detail_page_review_rating()

 {

-    global $post, $preview, $post_images;

+	global $post, $preview, $post_images;

     

-    if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {

-        return;

-    }

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_review_rating');

-

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    if ($post_avgratings != 0 && !$preview) {

-        /**

-         * This is called before the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the current post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-

-        $html = '<p style=" float:left;">';

-        $html .= geodir_get_rating_stars($post_avgratings, $post->ID);

-        $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

-        $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

+	if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {

+		return;

+	}

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_review_rating');

+

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	if ($post_avgratings != 0 && !$preview) {

+		/**

+		 * This is called before the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the current post.

+		 * @param int $post->ID Current post ID.

+		 */

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

+

+		$html = '<p style=" float:left;">';

+		$html .= geodir_get_rating_stars($post_avgratings, $post->ID);

+		$html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

+		$post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

        

 	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

 	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

 

-        $html .= '<span class="item">';

-        $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

+		$html .= '<span class="item">';

+		$html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

 

-        if ($post_images) {

-            foreach ($post_images as $img) {

-                $post_img = $img->src;

-                break;

-            }

-        }

-

-        if (isset($post_img) && $post_img) {

-            $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

-        }

-

-        $html .= '</span>';

-

-        echo $html .= '</div>';

-        /**

-         * This is called after the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the current post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-    }

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_review_rating');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '') {

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

-    }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

-        /**

-         * Filter the geodir_detail_page_review_rating() function content.

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

-    }

+		if ($post_images) {

+			foreach ($post_images as $img) {

+				$post_img = $img->src;

+				break;

+			}

+		}

+

+		if (isset($post_img) && $post_img) {

+			$html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

+		}

+

+		$html .= '</span>';

+

+		echo $html .= '</div>';

+		/**

+		 * This is called after the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the current post.

+		 * @param int $post->ID Current post ID.

+		 */

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

+	}

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_review_rating');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '') {

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

+	}

+	if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+		/**

+		 * Filter the geodir_detail_page_review_rating() function content.

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

+	}

 }

 

 /**

@@ -1188,35 +1188,35 @@ 
  */

 function geodir_detail_page_more_info()

 {

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_more_info');

-    if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {

-        echo $geodir_post_detail_fields;

-    }

-    /**

-     * This is called after the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_more_info');

-

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

-        /**

-         * Filter the output html for function geodir_detail_page_more_info().

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_more_info() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

-    }

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_more_info');

+	if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {

+		echo $geodir_post_detail_fields;

+	}

+	/**

+	 * This is called after the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_more_info');

+

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+		/**

+		 * Filter the output html for function geodir_detail_page_more_info().

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_more_info() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

+	}

 }

 

 

@@ -1230,15 +1230,15 @@ 
  */

 function geodir_localize_all_js_msg()

 {// check_ajax_referer function is used to make sure no files are uploaded remotely 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'));

-    }

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

+	}

 	

 	/**

 	 * Filter the allowed image type extensions for post images.

@@ -1248,62 +1248,62 @@ 
 	 */

 	$allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

 	

-    $default_marker_icon = get_option('geodir_default_marker_icon');

-    $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

-    $default_marker_width = $default_marker_size['w'];

-    $default_marker_height = $default_marker_size['h'];

+	$default_marker_icon = get_option('geodir_default_marker_icon');

+	$default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

+	$default_marker_width = $default_marker_size['w'];

+	$default_marker_height = $default_marker_size['h'];

     

-    $arr_alert_msg = array(

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_admin_ajax_url' => $ajax_url,

-        'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

-        'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

-        'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

-        'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

-        //start not show alert msg

-        'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

-        'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

-        'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

-        'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

-        'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

-        // end not show alert msg

-        'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),

-        'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),

-        //start not show alert msg

-        'rating_error_msg' => __('Error : please retry', 'geodirectory'),

-        'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

-        'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

-        'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

-        'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

-        'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

-        'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

-        'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

-        'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

-        'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

-        'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

-        'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

-        'geodir_default_marker_icon' => $default_marker_icon,

-        'geodir_default_marker_w' => $default_marker_width,

-        'geodir_default_marker_h' => $default_marker_height,

-        'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

-        'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

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

-        'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

-        'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

-        'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

-        'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

-        'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

-        'err_empty_review' => __('Please type a review.', 'geodirectory'),

-        'err_empty_reply' => __('Please type a reply.', 'geodirectory'),

-        /* on/off dragging for phone devices */

-        'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

-        'geodir_is_mobile' => wp_is_mobile() ? true : false,

-        'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

-        'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

-        'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

-        'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

-        'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

-        'geodir_action_remove' => __('Remove', 'geodirectory'),

+	$arr_alert_msg = array(

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_admin_ajax_url' => $ajax_url,

+		'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

+		'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

+		'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

+		'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

+		//start not show alert msg

+		'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

+		'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

+		'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

+		'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

+		'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

+		// end not show alert msg

+		'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),

+		'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),

+		//start not show alert msg

+		'rating_error_msg' => __('Error : please retry', 'geodirectory'),

+		'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

+		'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

+		'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

+		'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

+		'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

+		'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

+		'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

+		'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

+		'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

+		'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

+		'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

+		'geodir_default_marker_icon' => $default_marker_icon,

+		'geodir_default_marker_w' => $default_marker_width,

+		'geodir_default_marker_h' => $default_marker_height,

+		'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

+		'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

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

+		'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

+		'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

+		'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

+		'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

+		'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

+		'err_empty_review' => __('Please type a review.', 'geodirectory'),

+		'err_empty_reply' => __('Please type a reply.', 'geodirectory'),

+		/* on/off dragging for phone devices */

+		'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

+		'geodir_is_mobile' => wp_is_mobile() ? true : false,

+		'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

+		'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

+		'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

+		'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

+		'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

+		'geodir_action_remove' => __('Remove', 'geodirectory'),

 		'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),

 		'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),

 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

@@ -1311,40 +1311,40 @@ 
 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

 		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

-        'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,

-        'geodir_map_name' => geodir_map_name(),

-        'osmStart' => __('Start', 'geodirectory'),

-        'osmVia' => __('Via {viaNumber}', 'geodirectory'),

-        'osmEnd' => __('Enter Your Location', 'geodirectory'),

-        'ga_delete_check' => __('Do you wish to Deauthorize and break Analytics?', 'geodirectory'),

-        'geoMyLocation' => __('My Location', 'geodirectory'),

-        'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),

-        'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),

-        'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),

-        'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),

-        'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),

-    );

-

-    /**

-     * Filters the translated JS strings from function geodir_localize_all_js_msg().

-     *

-     * With this filter you can add, remove or change translated JS strings.

-     * You should add your own translations to this if you are building an addon rather than adding another script block.

-     *

-     * @since 1.0.0

-     */

-    $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

-

-    foreach ($arr_alert_msg as $key => $value) {

-        if (!is_scalar($value))

-            continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

-    }

+		'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,

+		'geodir_map_name' => geodir_map_name(),

+		'osmStart' => __('Start', 'geodirectory'),

+		'osmVia' => __('Via {viaNumber}', 'geodirectory'),

+		'osmEnd' => __('Enter Your Location', 'geodirectory'),

+		'ga_delete_check' => __('Do you wish to Deauthorize and break Analytics?', 'geodirectory'),

+		'geoMyLocation' => __('My Location', 'geodirectory'),

+		'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),

+		'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),

+		'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),

+		'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),

+		'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),

+	);

+

+	/**

+	 * Filters the translated JS strings from function geodir_localize_all_js_msg().

+	 *

+	 * With this filter you can add, remove or change translated JS strings.

+	 * You should add your own translations to this if you are building an addon rather than adding another script block.

+	 *

+	 * @since 1.0.0

+	 */

+	$arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

-    echo '<script>';

-    echo $script;

-    echo '</script>';

+	foreach ($arr_alert_msg as $key => $value) {

+		if (!is_scalar($value))

+			continue;

+		$arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+	}

+

+	$script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

+	echo '<script>';

+	echo $script;

+	echo '</script>';

 }

 

 add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);

@@ -1360,11 +1360,11 @@ 
  */

 function geodir_admin_bar_site_menu($wp_admin_bar)

 {

-    if (get_option("geodir_installed")) {

-        if (current_user_can('manage_options')) {

-            $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

-        }

-    }

+	if (get_option("geodir_installed")) {

+		if (current_user_can('manage_options')) {

+			$wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

+		}

+	}

 }

 

 add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/

@@ -1390,25 +1390,25 @@ 
  */

 function geodir_store_sidebars()

 {

-    global $geodir_sidebars;

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-    $geodir_old_sidebars = array();

-

-    if (is_array($geodir_sidebars)) {

-        foreach ($geodir_sidebars as $val) {

-            if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

-            }

-        }

-    }

-    update_option('geodir_sidebars', $geodir_old_sidebars);

-    geodir_option_version_backup('geodir_sidebars');

+	global $geodir_sidebars;

+	global $sidebars_widgets;

+

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

+	$geodir_old_sidebars = array();

+

+	if (is_array($geodir_sidebars)) {

+		foreach ($geodir_sidebars as $val) {

+			if (is_array($sidebars_widgets)) {

+				if (array_key_exists($val, $sidebars_widgets))

+					$geodir_old_sidebars[$val] = $sidebars_widgets[$val];

+				else

+					$geodir_old_sidebars[$val] = array();

+			}

+		}

+	}

+	update_option('geodir_sidebars', $geodir_old_sidebars);

+	geodir_option_version_backup('geodir_sidebars');

 

 }

 

@@ -1422,28 +1422,28 @@ 
  */

 function geodir_restore_sidebars()

 {

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-

-    if (is_array($sidebars_widgets)) {

-        $geodir_old_sidebars = get_option('geodir_sidebars');

-        if (is_array($geodir_old_sidebars)) {

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

-                if(0 === strpos($key, 'geodir_'))// if gd widget

-                {

-                    $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

-                }

+	global $sidebars_widgets;

 

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

 

-            }

-        }

+	if (is_array($sidebars_widgets)) {

+		$geodir_old_sidebars = get_option('geodir_sidebars');

+		if (is_array($geodir_old_sidebars)) {

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

+				if(0 === strpos($key, 'geodir_'))// if gd widget

+				{

+					$sidebars_widgets[$key] = $geodir_old_sidebars[$key];

+				}

 

-    }

 

-    update_option('sidebars_widgets', $sidebars_widgets);

-    update_option('geodir_sidebars', '');

+			}

+		}

+

+	}

+

+	update_option('sidebars_widgets', $sidebars_widgets);

+	update_option('geodir_sidebars', '');

 }

 

 add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');

@@ -1456,9 +1456,9 @@ 
  */

 function geodir_after_listing_post_gridview()

 {

-    global $gridview_columns;

+	global $gridview_columns;

 

-    $gridview_columns = '';

+	$gridview_columns = '';

 

 }

 

@@ -1486,11 +1486,11 @@ 
  */

 function so_handle_038($url, $original_url, $_context)

 {

-    if (strstr($url, "maps.google.com/maps/api/js") !== false) {

-        $url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

-    }

+	if (strstr($url, "maps.google.com/maps/api/js") !== false) {

+		$url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

+	}

 

-    return $url;

+	return $url;

 }

 

 

@@ -1506,34 +1506,34 @@ 
 function geodir_after_main_form_fields() {

 	global $gd_session;

 	

-    if (get_option('geodir_accept_term_condition')) {

-        global $post;

-        $term_condition = '';

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

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

-            $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

-        }

-

-        ?>

+	if (get_option('geodir_accept_term_condition')) {

+		global $post;

+		$term_condition = '';

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

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

+			$term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

+		}

+

+		?>

         <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix">

             <label>&nbsp;</label>

 

             <div class="geodir_taxonomy_field" style="float:left; width:70%;">

 				<span style="display:block"> 

 				<input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {

-                    echo 'checked="checked"';

-                } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

+					echo 'checked="checked"';

+				} ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

                        style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

-                    _e($required_msg, 'geodirectory');

-                } ?></span>

+					_e($required_msg, 'geodirectory');

+				} ?></span>

         </div>

     <?php

 

-    }

+	}

 }

 

 

@@ -1558,42 +1558,42 @@ 
  */

 function geodir_detail_page_tab_is_display($is_display, $tab)

 {

-    global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

+	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

 

-    if ($tab == 'post_profile') {

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

-        $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

+	if ($tab == 'post_profile') {

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

+		$desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

-            $is_display = false;

-        }

-    }

+		if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+			$is_display = false;

+		}

+	}

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+	if ($tab == 'post_info')

+		$is_display = (!empty($geodir_post_detail_fields)) ? true : false;

     

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+	if ($tab == 'post_images')

+		$is_display = (!empty($post_images)) ? true : false;

 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+	if ($tab == 'post_video')

+		$is_display = (!empty($video)) ? true : false;

 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+	if ($tab == 'special_offers')

+		$is_display = (!empty($special_offers)) ? true : false;

 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+	if ($tab == 'reviews')

+		$is_display = (geodir_is_page('detail')) ? true : false;

 

-    if ($tab == 'related_listing') {

-       $message = __('No listings found which match your selection.', 'geodirectory');

+	if ($tab == 'related_listing') {

+	   $message = __('No listings found which match your selection.', 'geodirectory');

        

-       /** This action is documented in geodirectory-functions/template_functions.php */

-       $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

+	   /** This action is documented in geodirectory-functions/template_functions.php */

+	   $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

        

-       $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

-    }

+	   $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

+	}

 

-    return $is_display;

+	return $is_display;

 }

 

 

@@ -1609,69 +1609,69 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  */

 function geodir_changes_in_custom_fields_table() {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

 	$listings_page_id = (int)get_option('geodir_listing_page');

 	if ($listings_page_id) {

 		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

-        delete_option('geodir_listing_page');

+		delete_option('geodir_listing_page');

 	}

 

-    if (!get_option('geodir_changes_in_custom_fields_table')) {

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

-                array('1', '1', 'admin')

-            )

-        );

+	if (!get_option('geodir_changes_in_custom_fields_table')) {

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

+				array('1', '1', 'admin')

+			)

+		);

 

 

-        /* --- terms meta value set --- */

+		/* --- terms meta value set --- */

 

-        update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

+		update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

 

-        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

+		$options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

 

-        if (!empty($options_data)) {

+		if (!empty($options_data)) {

 

-            foreach ($options_data as $optobj) {

+			foreach ($options_data as $optobj) {

 

-                $option_val = str_replace('tax_meta_', '', $optobj->option_name);

+				$option_val = str_replace('tax_meta_', '', $optobj->option_name);

 

-                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

+				$taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

 

-                if (!empty($taxonomies_data)) {

+				if (!empty($taxonomies_data)) {

 

-                    foreach ($taxonomies_data as $taxobj) {

+					foreach ($taxonomies_data as $taxobj) {

 

-                        $taxObject = get_taxonomy($taxobj->taxonomy);

-                        $post_type = $taxObject->object_type[0];

+						$taxObject = get_taxonomy($taxobj->taxonomy);

+						$post_type = $taxObject->object_type[0];

 

-                        $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

+						$opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

 

-                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

+						$duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

 

-                        if ($duplicate_data) {

+						if ($duplicate_data) {

 

-                            $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

+							$wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

 

-                        } else {

+						} else {

 

-                            $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

+							$wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

 

-                        }

+						}

 

-                    }

+					}

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

-        update_option('geodir_changes_in_custom_fields_table', '1');

+		update_option('geodir_changes_in_custom_fields_table', '1');

 

-    }

+	}

 

 }

 

@@ -1690,24 +1690,24 @@ 
 function geodir_location_slug_check($slug)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

+	$slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

-            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

-            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

-            $suffix++;

-        } while ($location_slug_check && $suffix < 100);

+		$suffix = 1;

+		do {

+			$alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+			$location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

+			$suffix++;

+		} while ($location_slug_check && $suffix < 100);

 

-        $slug = $alt_location_name;

+		$slug = $alt_location_name;

 

-    }

+	}

 

-    return $slug;

+	return $slug;

 

 }

 

@@ -1732,42 +1732,42 @@ 
 function geodir_update_term_slug($term_id, $tt_id, $taxonomy)

 {

 

-    global $wpdb, $plugin_prefix, $table_prefix;

+	global $wpdb, $plugin_prefix, $table_prefix;

 

-    $tern_data = get_term_by('id', $term_id, $taxonomy);

+	$tern_data = get_term_by('id', $term_id, $taxonomy);

 

-    $slug = $tern_data->slug;

+	$slug = $tern_data->slug;

 

-    /**

-     * Filter if a term slug exists.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $bool Default: false.

-     * @param string $slug The term slug.

-     * @param int $term_id The term ID.

-     */

-    $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

+	/**

+	 * Filter if a term slug exists.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $bool Default: false.

+	 * @param string $slug The term slug.

+	 * @param int $term_id The term ID.

+	 */

+	$slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+		$suffix = 1;

+		do {

+			$new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

 

-            /** This action is documented in geodirectory_hooks_actions.php */

-            $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

+			/** This action is documented in geodirectory_hooks_actions.php */

+			$term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

 

-            $suffix++;

-        } while ($term_slug_check && $suffix < 100);

+			$suffix++;

+		} while ($term_slug_check && $suffix < 100);

 

-        $slug = $new_slug;

+		$slug = $new_slug;

 

-        //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

+		//wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

 

-        $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

+		$wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

 

-    }

+	}

 	

 	// Update tag in detail table.

 	$taxonomy_obj = get_taxonomy($taxonomy);

@@ -1808,21 +1808,21 @@ 
 function geodir_term_slug_is_exists($slug_exists, $slug, $term_id)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $default_location = geodir_get_default_location();

+	$default_location = geodir_get_default_location();

 

-    $country_slug = $default_location->country_slug;

-    $region_slug = $default_location->region_slug;

-    $city_slug = $default_location->city_slug;

+	$country_slug = $default_location->country_slug;

+	$region_slug = $default_location->region_slug;

+	$city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

+	if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

+		return $slug_exists = true;

 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

-        return $slug_exists = true;

+	if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

+		return $slug_exists = true;

 

-    return $slug_exists;

+	return $slug_exists;

 }

 

 

@@ -1842,75 +1842,75 @@ 
  */

 function geodir_custom_page_title($title = '', $sep = '')

 {

-    global $wp;

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

-        return $title;

-    }

+	global $wp;

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

+		return $title;

+	}

 

-    if ($sep == '') {

-        /**

-         * Filter the page title separator.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param string $sep The separator, default: `|`.

-         */

-        $sep = apply_filters('geodir_page_title_separator', '|');

-    }

+	if ($sep == '') {

+		/**

+		 * Filter the page title separator.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param string $sep The separator, default: `|`.

+		 */

+		$sep = apply_filters('geodir_page_title_separator', '|');

+	}

 

 

-    $gd_page = '';

-    if(geodir_is_page('home')){

-        $gd_page = 'home';

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

-    }

-    elseif(geodir_is_page('detail')){

-        $gd_page = 'detail';

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

-    }

-    elseif(geodir_is_page('pt')){

-        $gd_page = 'pt';

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

-    }

-    elseif(geodir_is_page('listing')){

-        $gd_page = 'listing';

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

-    }

-    elseif(geodir_is_page('location')){

-        $gd_page = 'location';

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

-    }

-    elseif(geodir_is_page('search')){

-        $gd_page = 'search';

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

-    }

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

-        $gd_page = 'add-listing';

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

-    }

-    elseif(geodir_is_page('author')){

-        $gd_page = 'author';

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

-    }

-    elseif(geodir_is_page('login')){

-        $gd_page = 'login';

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

-    }

-    elseif(geodir_is_page('listing-success')){

-        $gd_page = 'listing-success';

-        $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

-    }

+	$gd_page = '';

+	if(geodir_is_page('home')){

+		$gd_page = 'home';

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

+	}

+	elseif(geodir_is_page('detail')){

+		$gd_page = 'detail';

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

+	}

+	elseif(geodir_is_page('pt')){

+		$gd_page = 'pt';

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

+	}

+	elseif(geodir_is_page('listing')){

+		$gd_page = 'listing';

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

+	}

+	elseif(geodir_is_page('location')){

+		$gd_page = 'location';

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

+	}

+	elseif(geodir_is_page('search')){

+		$gd_page = 'search';

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

+	}

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

+		$gd_page = 'add-listing';

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

+	}

+	elseif(geodir_is_page('author')){

+		$gd_page = 'author';

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

+	}

+	elseif(geodir_is_page('login')){

+		$gd_page = 'login';

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

+	}

+	elseif(geodir_is_page('listing-success')){

+		$gd_page = 'listing-success';

+		$title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

+	}

 

 

-    /**

-     * Filter page meta 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.

-     * @param string $sep The title separator symbol.

-     */

-    return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

+	/**

+	 * Filter page meta 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.

+	 * @param string $sep The title separator symbol.

+	 */

+	return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

 

 }

 

@@ -1926,36 +1926,36 @@ 
 function geodir_set_post_attachment()

 {

 

-    if (!get_option('geodir_set_post_attachments')) {

+	if (!get_option('geodir_set_post_attachments')) {

 

-        require_once(ABSPATH . 'wp-admin/includes/image.php');

-        require_once(ABSPATH . 'wp-admin/includes/file.php');

+		require_once(ABSPATH . 'wp-admin/includes/image.php');

+		require_once(ABSPATH . 'wp-admin/includes/file.php');

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        foreach($all_postypes as $post_type){

-            $args = array(

-                'posts_per_page' => -1,

-                'post_type' => $post_type,

-                'post_status' => 'publish');

+		foreach($all_postypes as $post_type){

+			$args = array(

+				'posts_per_page' => -1,

+				'post_type' => $post_type,

+				'post_status' => 'publish');

 

-            $posts_array = get_posts($args);

+			$posts_array = get_posts($args);

 

-            if (!empty($posts_array)) {

+			if (!empty($posts_array)) {

 

-                foreach ($posts_array as $post) {

+				foreach ($posts_array as $post) {

 

-                    geodir_set_wp_featured_image($post->ID);

+					geodir_set_wp_featured_image($post->ID);

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

 

-        update_option('geodir_set_post_attachments', '1');

+		update_option('geodir_set_post_attachments', '1');

 

-    }

+	}

 

 }

 

@@ -1972,19 +1972,19 @@ 
 function geodir_remove_url_seperator()

 {

 

-    if (!get_option('geodir_remove_url_seperator')) {

+	if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+		if (get_option('geodir_listingurl_separator'))

+			delete_option('geodir_listingurl_separator');

 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+		if (get_option('geodir_detailurl_separator'))

+			delete_option('geodir_detailurl_separator');

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        update_option('geodir_remove_url_seperator', '1');

+		update_option('geodir_remove_url_seperator', '1');

 

-    }

+	}

 

 }

 

@@ -2000,19 +2000,19 @@ 
  */

 function geodir_remove_url_seperator_form_permalink_settings($permalink_arr)

 {

-    foreach ($permalink_arr as $key => $value) {

+	foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+		if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

+			unset($permalink_arr[$key]);

 

-    }

+	}

 

-    return $permalink_arr;

+	return $permalink_arr;

 

 }

 

 if (!is_admin()) {

-    add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

+	add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

 }

 /**

  * Set status from draft to publish.

@@ -2025,16 +2025,16 @@ 
  */

 function geodir_set_status_draft_to_publish_for_own_post($post)

 {

-    $user_id = get_current_user_id();

+	$user_id = get_current_user_id();

 

-    if(!$user_id){return $post;}

+	if(!$user_id){return $post;}

 

-    $gd_post_types = geodir_get_posttypes();

+	$gd_post_types = geodir_get_posttypes();

 

-    if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {

-        $post[0]->post_status = 'publish';

-    }

-    return $post;

+	if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {

+		$post[0]->post_status = 'publish';

+	}

+	return $post;

 }

 

 

@@ -2126,33 +2126,33 @@ 
  */

 function geodir_detail_page_tab_headings_change($tabs_arr)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

 

-        if (array_key_exists('post_video', $tabs_arr)) {

+		if (array_key_exists('post_video', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

+			$field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

-            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

-                $tabs_arr['post_video']['heading_text'] = $field_title;

-        }

+			if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

+				$tabs_arr['post_video']['heading_text'] = $field_title;

+		}

 

-        if (array_key_exists('special_offers', $tabs_arr)) {

+		if (array_key_exists('special_offers', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

+			$field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

-            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

-                $tabs_arr['special_offers']['heading_text'] = $field_title;

-        }

+			if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

+				$tabs_arr['special_offers']['heading_text'] = $field_title;

+		}

 

-    }

+	}

 

-    return $tabs_arr;

+	return $tabs_arr;

 

 }

 

@@ -2165,10 +2165,10 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

-        remove_all_actions('template_redirect');

-        remove_action('init', 'avia_modify_front', 10);

-    }

+	if (geodir_is_page('login')){

+		remove_all_actions('template_redirect');

+		remove_action('init', 'avia_modify_front', 10);

+	}

 }

 

 

@@ -2190,51 +2190,51 @@ 
 function geodirectory_before_featured_image_delete($attachment_id)

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_id = get_post_field('post_parent', $attachment_id);

+	$post_id = get_post_field('post_parent', $attachment_id);

 

-    $attachment_url = wp_get_attachment_url($attachment_id);

+	$attachment_url = wp_get_attachment_url($attachment_id);

 

-    if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

+	if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

 

-        $post_type = get_post_type($post_id);

+		$post_type = get_post_type($post_id);

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

+			return false;

 

-        $uploads = wp_upload_dir();

+		$uploads = wp_upload_dir();

 

-        $split_img_path = explode($uploads['baseurl'], $attachment_url);

+		$split_img_path = explode($uploads['baseurl'], $attachment_url);

 

-        $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

+		$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

-        $wpdb->query(

-            $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

-                array($post_id, $split_img_file_path)

-            )

-        );

+		$wpdb->query(

+			$wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

+				array($post_id, $split_img_file_path)

+			)

+		);

 

-        $attachment_data = $wpdb->get_row(

-            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

-                array($post_id)

-            )

-        );

+		$attachment_data = $wpdb->get_row(

+			$wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

+				array($post_id)

+			)

+		);

 

-        if (!empty($attachment_data)) {

-            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

-        }

+		if (!empty($attachment_data)) {

+			$wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+		}

 

 

-        $table_name = $plugin_prefix . $post_type . '_detail';

+		$table_name = $plugin_prefix . $post_type . '_detail';

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

 

-        geodir_set_wp_featured_image($post_id);

+		geodir_set_wp_featured_image($post_id);

 

-    }

+	}

 

 }

 

@@ -2252,79 +2252,79 @@ 
 function geodir_temp_set_post_attachment()

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    foreach ($all_postypes as $posttype) {

+	foreach ($all_postypes as $posttype) {

 

-        $tablename = $plugin_prefix . $posttype . '_detail';

+		$tablename = $plugin_prefix . $posttype . '_detail';

 

-        $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

+		$get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

 

-        if (!empty($get_post_data)) {

+		if (!empty($get_post_data)) {

 

-            foreach ($get_post_data as $data) {

+			foreach ($get_post_data as $data) {

 

-                $post_id = $data->post_id;

+				$post_id = $data->post_id;

 

-                $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

+				$attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

 

-                if (!empty($attachment_data)) {

+				if (!empty($attachment_data)) {

 

-                    foreach ($attachment_data as $attach) {

+					foreach ($attachment_data as $attach) {

 

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

+						$file_info = pathinfo($attach->file);

 

-                        $sub_dir = '';

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

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

+						$sub_dir = '';

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

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

 

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

-                        $uploads_path = $uploads['basedir'];

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

+						$uploads_path = $uploads['basedir'];

 

-                        $file_name = $file_info['basename'];

+						$file_name = $file_info['basename'];

 

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

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

 

-                        if (!file_exists($img_arr['path'])) {

+						if (!file_exists($img_arr['path'])) {

 

-                            $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

+							$wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

 

-                        }

+						}

 

-                    }

+					}

 

-                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

+					$attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

 

-                    if (!empty($attachment_data)) {

+					if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+						if ($attachment_data->ID)

+							$wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

 

-                    } else {

+					} else {

 

-                        if (has_post_thumbnail($post_id)) {

+						if (has_post_thumbnail($post_id)) {

 

-                            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+							$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-                            wp_delete_attachment($post_thumbnail_id);

+							wp_delete_attachment($post_thumbnail_id);

 

-                        }

+						}

 

-                    }

+					}

 

-                    $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

+					$wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

 

-                    geodir_set_wp_featured_image($post_id);

+					geodir_set_wp_featured_image($post_id);

 

-                }

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -2342,9 +2342,9 @@ 
 function geodir_default_rating_star_icon()

 {

 

-    if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

-    }

+	if (!get_option('geodir_default_rating_star_icon')) {

+		update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+	}

 

 }

 

@@ -2362,25 +2362,25 @@ 
  */

 function geodir_user_post_listing_count($user_id = 0)

 {

-    global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

-        $user_id = $current_user->ID;

-    }

+	global $wpdb, $plugin_prefix, $current_user;

+	if(!$user_id){

+		$user_id = $current_user->ID;

+	}

 

-    $all_posts = get_option('geodir_listing_link_user_dashboard');

+	$all_posts = get_option('geodir_listing_link_user_dashboard');

 

-    $user_listing = array();

-    if ($user_id && is_array($all_posts) && !empty($all_posts)) {

-        foreach ($all_posts as $ptype) {

-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' OR post_status = 'pending' )");

+	$user_listing = array();

+	if ($user_id && is_array($all_posts) && !empty($all_posts)) {

+		foreach ($all_posts as $ptype) {

+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' OR post_status = 'pending' )");

 

-            if ($total_posts > 0) {

-                $user_listing[$ptype] = $total_posts;

-            }

-        }

-    }

+			if ($total_posts > 0) {

+				$user_listing[$ptype] = $total_posts;

+			}

+		}

+	}

 

-    return $user_listing;

+	return $user_listing;

 }

 

 

@@ -2400,189 +2400,189 @@ 
  */

 function geodir_detail_page_custom_field_tab($tabs_arr)

 {

-    global $post;

-

-    $post_type = geodir_get_current_posttype();

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

-        $package_info = array();

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

-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

-        $fields_location = 'owntab';

-

-        $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

-        //remove video and special offers if it is already set to show

-        if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

-            $unset_video = true;

-        }

-

-        if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

-            $unset_special_offers = true;

-        }

-        if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

-            foreach($custom_fields as $key => $custom_field){

-                if($custom_field['name']=='geodir_video' && isset($unset_video)){

-                    unset($custom_fields[$key]);

-                }

-                if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

-                    unset($custom_fields[$key]);

-                }

-            }

-        }

-

-

-        if (!empty($custom_fields)) {

-            $parse_custom_fields = array();

-            foreach ($custom_fields as $field) {

-                $field = stripslashes_deep($field); // strip slashes

-                $type = $field;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

-                    $post->{$field_name} = $_REQUEST[$field_name];

-                }

+	global $post;

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

-                    if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

-                        continue;

-                    }

+	$post_type = geodir_get_current_posttype();

+	$all_postypes = geodir_get_posttypes();

 

-                    $parse_custom_fields[] = $field;

-                }

-            }

-            $custom_fields = $parse_custom_fields;

-        }

-        //print_r($custom_fields);

-        if (!empty($custom_fields)) {

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

+		$package_info = array();

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

+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

+		$fields_location = 'owntab';

 

-            global $field_set_start;

+		$custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

+		//remove video and special offers if it is already set to show

+		if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

+			$unset_video = true;

+		}

 

-            $post = stripslashes_deep($post); // strip slashes

-            

-            $field_set_start = 0;

-            $fieldset_count = 0;

-            $fieldset = '';

-            $total_fields = count($custom_fields);

-            $count_field = 0;

-            $fieldset_arr = array();

-            $i = 0;

-            $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

-

-            foreach ($custom_fields as $field) {

-                $count_field++;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

-                    $post->{$field_name} = $_REQUEST[$field_name];

-                }

+		if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

+			$unset_special_offers = true;

+		}

+		if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

+			foreach($custom_fields as $key => $custom_field){

+				if($custom_field['name']=='geodir_video' && isset($unset_video)){

+					unset($custom_fields[$key]);

+				}

+				if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

+					unset($custom_fields[$key]);

+				}

+			}

+		}

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

-                    $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

-                    $site_title = trim($field['site_title']);

-                    $type = $field;

-                    $variables_array = array();

 

-                    if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

-                        continue;

-                    }

+		if (!empty($custom_fields)) {

+			$parse_custom_fields = array();

+			foreach ($custom_fields as $field) {

+				$field = stripslashes_deep($field); // strip slashes

+				$type = $field;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

+					$post->{$field_name} = $_REQUEST[$field_name];

+				}

 

-                    if ($type['type'] != 'fieldset') {

-                        $i++;

-                        $variables_array['post_id'] = $post->ID;

-                        $variables_array['label'] = __($type['site_title'], 'geodirectory');

-                        $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';

-

-                    }else{

-                        $i = 0;

-                        $fieldset_count++;

-                        $field_set_start = 1;

-                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

-                        $fieldset_arr[$fieldset_count]['label'] = $label;

-                    }

+				if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+					if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

+						continue;

+					}

 

+					$parse_custom_fields[] = $field;

+				}

+			}

+			$custom_fields = $parse_custom_fields;

+		}

+		//print_r($custom_fields);

+		if (!empty($custom_fields)) {

 

-                    if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

-                    $type = stripslashes_deep($type); // strip slashes

-                    if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

-                    $html = '';

-                    $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

-                    if($html_var=='post'){$html_var='post_address';}

-                    $field_icon = geodir_field_icon_proccess($type);

-                    $filed_type = $type['type'];

-

-                    /**

-                     * Filter the output for custom fields.

-                     *

-                     * Here we can remove or add new functions depending on the field type.

-                     *

-                     * @param string $html The html to be filtered (blank).

-                     * @param string $fields_location The location the field is to be show.

-                     * @param array $type The array of field values.

-                     */

-                    $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

-

-

-                    /**

-                     * Filter custom field output in tab.

-                     *

-                     * @since 1.5.6

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

-

-                    $fieldset_html = '';

-                    if ($field_set_start == 1) {

-                        $add_html = false;

-                        if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

-                            if ($fieldset != '') {

-                                $add_html = true;

-                                $label = $fieldset_arr[$fieldset_count - 1]['label'];

-                                $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

-                            }

-                            $fieldset_html = $fieldset;

-                            $fieldset = '';

-                        } else {

-                            $fieldset .= $html;

-                            if ($total_fields == $count_field && $fieldset != '') {

-                                $add_html = true;

-                                $label = $fieldset_arr[$fieldset_count]['label'];

-                                $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name'];

-                                $fieldset_html = $fieldset;

-                            }

-                        }

+			global $field_set_start;

 

-                        if ($add_html) {

-                            $tabs_arr[$htmlvar_name] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

-                                /**

-                                 * Filter if a custom field should be displayed on the details page tab.

-                                 *

-                                 * @since 1.0.0

-                                 * @param string $htmlvar_name The field HTML var name.

-                                 */

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

-                                'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

-                            );

-                        }

-                    } else {

-                        if ($html != '') {

-                            $tabs_arr[$html_var] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

-                                /** This action is documented in geodirectory_hooks_actions.php */

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

-                                'tab_content' => $html

-                            );

-                        }

-                    }

-                }

-            }

-        }

-    }

-    return $tabs_arr;

+			$post = stripslashes_deep($post); // strip slashes

+            

+			$field_set_start = 0;

+			$fieldset_count = 0;

+			$fieldset = '';

+			$total_fields = count($custom_fields);

+			$count_field = 0;

+			$fieldset_arr = array();

+			$i = 0;

+			$geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

+

+			foreach ($custom_fields as $field) {

+				$count_field++;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

+					$post->{$field_name} = $_REQUEST[$field_name];

+				}

+

+				if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+					$label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

+					$site_title = trim($field['site_title']);

+					$type = $field;

+					$variables_array = array();

+

+					if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

+						continue;

+					}

+

+					if ($type['type'] != 'fieldset') {

+						$i++;

+						$variables_array['post_id'] = $post->ID;

+						$variables_array['label'] = __($type['site_title'], 'geodirectory');

+						$variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';

+

+					}else{

+						$i = 0;

+						$fieldset_count++;

+						$field_set_start = 1;

+						$fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+						$fieldset_arr[$fieldset_count]['label'] = $label;

+					}

+

+

+					if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

+					$type = stripslashes_deep($type); // strip slashes

+					if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

+					$html = '';

+					$html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

+					if($html_var=='post'){$html_var='post_address';}

+					$field_icon = geodir_field_icon_proccess($type);

+					$filed_type = $type['type'];

+

+					/**

+					 * Filter the output for custom fields.

+					 *

+					 * Here we can remove or add new functions depending on the field type.

+					 *

+					 * @param string $html The html to be filtered (blank).

+					 * @param string $fields_location The location the field is to be show.

+					 * @param array $type The array of field values.

+					 */

+					$html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+

+

+					/**

+					 * Filter custom field output in tab.

+					 *

+					 * @since 1.5.6

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					$html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

+

+					$fieldset_html = '';

+					if ($field_set_start == 1) {

+						$add_html = false;

+						if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

+							if ($fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count - 1]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

+							}

+							$fieldset_html = $fieldset;

+							$fieldset = '';

+						} else {

+							$fieldset .= $html;

+							if ($total_fields == $count_field && $fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name'];

+								$fieldset_html = $fieldset;

+							}

+						}

+

+						if ($add_html) {

+							$tabs_arr[$htmlvar_name] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

+								/**

+								 * Filter if a custom field should be displayed on the details page tab.

+								 *

+								 * @since 1.0.0

+								 * @param string $htmlvar_name The field HTML var name.

+								 */

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

+								'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

+							);

+						}

+					} else {

+						if ($html != '') {

+							$tabs_arr[$html_var] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

+								/** This action is documented in geodirectory_hooks_actions.php */

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

+								'tab_content' => $html

+							);

+						}

+					}

+				}

+			}

+		}

+	}

+	return $tabs_arr;

 }

 

 /* display add listing page for wpml */

@@ -2606,41 +2606,41 @@ 
  */

 function geodir_add_post_status_author_page()

 {

-    global $wpdb, $post;

-

-    $html = '';

-    if (get_current_user_id()) {

-

-        $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));

-        if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

-

-            // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

-            $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

-            $status = "<strong>(";

-            $status_icon = '<i class="fa fa-play"></i>';

-            if ($real_status == 'publish') {

-                $status .= __('Published', 'geodirectory');

-            }elseif ($real_status == 'pending') {

-                $status .= __('Awaiting Review', 'geodirectory');

-            } else {

-                $status .= __('Not published', 'geodirectory');

-                $status_icon = '<i class="fa fa-pause"></i>';

-            }

-            $status .= ")</strong>";

+	global $wpdb, $post;

+

+	$html = '';

+	if (get_current_user_id()) {

+

+		$is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));

+		if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

+

+			// we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

+			$real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

+			$status = "<strong>(";

+			$status_icon = '<i class="fa fa-play"></i>';

+			if ($real_status == 'publish') {

+				$status .= __('Published', 'geodirectory');

+			}elseif ($real_status == 'pending') {

+				$status .= __('Awaiting Review', 'geodirectory');

+			} else {

+				$status .= __('Not published', 'geodirectory');

+				$status_icon = '<i class="fa fa-pause"></i>';

+			}

+			$status .= ")</strong>";

 

-            $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

-        }

-    }

+			$html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

+		}

+	}

 

-    if ($html != '') {

-        /**

-         * Filter the post status text on the author page.

-         *

-         * @since 1.0.0

-         * @param string $html The HTML of the status.

-         */

-        echo apply_filters('geodir_filter_status_text_on_author_page', $html);

-    }

+	if ($html != '') {

+		/**

+		 * Filter the post status text on the author page.

+		 *

+		 * @since 1.0.0

+		 * @param string $html The HTML of the status.

+		 */

+		echo apply_filters('geodir_filter_status_text_on_author_page', $html);

+	}

 

 

 }

@@ -2654,9 +2654,9 @@ 
  * @package GeoDirectory

  */

 function geodir_init_no_rating() {

-    if (geodir_rating_disabled_post_types()) {

-        add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

-    }

+	if (geodir_rating_disabled_post_types()) {

+		add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

+	}

 }

 

 /**

@@ -2670,22 +2670,22 @@ 
  * @return array Modified sort options array.

  */

 function geodir_no_rating_get_sort_options($options, $post_type = '') {

-    if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {

-        $new_options = array();

+	if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {

+		$new_options = array();

         

-        if (!empty($options)) {

-            foreach ($options as $option) {

-                if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

-                    continue;

-                }

-                $new_options[] = $option;

-            }

+		if (!empty($options)) {

+			foreach ($options as $option) {

+				if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

+					continue;

+				}

+				$new_options[] = $option;

+			}

 

-            $options = $new_options;

-        }

-    }

+			$options = $new_options;

+		}

+	}

 

-    return $options;

+	return $options;

 }

 

 /**

@@ -2697,9 +2697,9 @@ 
  * @return array Modified class array.

  */

 function geodir_body_class_active_map($classes = array()) {

-    $classes[] = 'gd-map-' . geodir_map_name();

+	$classes[] = 'gd-map-' . geodir_map_name();

 

-    return $classes;

+	return $classes;

 }

 add_filter('body_class', 'geodir_body_class_active_map', 100);

 

@@ -2712,9 +2712,9 @@ 
  * @return string Modified class string.

  */

 function geodir_admin_body_class_active_map($class = '') {    

-    $class .= ' gd-map-' . geodir_map_name();

+	$class .= ' gd-map-' . geodir_map_name();

 

-    return $class;

+	return $class;

 }

 add_filter('admin_body_class', 'geodir_admin_body_class_active_map', 100);

 

@@ -2732,36 +2732,36 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

-

-    $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

-

-    /**

-     * Filters the geodirectory option names that requires to add for translation.

-     *

-     * @since 1.5.7

-     * @package GeoDirectory

-     *

-     * @param  array $gd_options Array of option names.

-     */

-    $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

-    $gd_options = array_unique($gd_options);

-

-    if (!empty($gd_options)) {

-        foreach ($gd_options as $gd_option) {

-            if ($gd_option != '' && $option_value = get_option($gd_option)) {

-                $option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

+	$translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+

+	$gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

+

+	/**

+	 * Filters the geodirectory option names that requires to add for translation.

+	 *

+	 * @since 1.5.7

+	 * @package GeoDirectory

+	 *

+	 * @param  array $gd_options Array of option names.

+	 */

+	$gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

+	$gd_options = array_unique($gd_options);

+

+	if (!empty($gd_options)) {

+		foreach ($gd_options as $gd_option) {

+			if ($gd_option != '' && $option_value = get_option($gd_option)) {

+				$option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

                 

-                if ($option_value != '' && !in_array($option_value, $translation_texts)) {

-                    $translation_texts[] = stripslashes_deep($option_value);

-                }

-            }

-        }

-    }

+				if ($option_value != '' && !in_array($option_value, $translation_texts)) {

+					$translation_texts[] = stripslashes_deep($option_value);

+				}

+			}

+		}

+	}

 

-    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

-    return $translation_texts;

+	return $translation_texts;

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');

@@ -2775,15 +2775,15 @@ 
 

 add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);

 function gd_get_comments_link($comments_link, $post_id) {

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $all_postypes = geodir_get_posttypes();

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

-        $comments_link = str_replace('#comments', '#reviews', $comments_link);

-        $comments_link = str_replace('#respond', '#reviews', $comments_link);

-    }

+	$all_postypes = geodir_get_posttypes();

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

+		$comments_link = str_replace('#comments', '#reviews', $comments_link);

+		$comments_link = str_replace('#respond', '#reviews', $comments_link);

+	}

 

-    return $comments_link;

+	return $comments_link;

 }

 

 

@@ -2801,11 +2801,11 @@ 
 function geodir_add_nav_menu_class( $args )

 {

 

-        if(isset($args['menu_class'])){

-            $args['menu_class'] = $args['menu_class']." gd-menu-z";

-        }

+		if(isset($args['menu_class'])){

+			$args['menu_class'] = $args['menu_class']." gd-menu-z";

+		}

     

-    return $args;

+	return $args;

 }

 

 add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );

@@ -2822,15 +2822,15 @@ 
  * @return string Filtered locale ID.

  */

 function geodir_wpml_filter_locale($locale) {

-    global $sitepress;

+	global $sitepress;

     

-    $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : '');

+	$post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : '');

     

-    if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {

-        $locale = $sitepress->get_locale($current_lang);

-    }

+	if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {

+		$locale = $sitepress->get_locale($current_lang);

+	}

     

-    return $locale;

+	return $locale;

 }

 

 /**

@@ -2840,19 +2840,19 @@ 
  * @package GeoDirectory

  */

 function geodir_wpml_set_filter() {

-    if (geodir_is_wpml()) {

-        global $sitepress;

+	if (geodir_is_wpml()) {

+		global $sitepress;

         

-        if ($sitepress->get_setting('sync_comments_on_duplicates')) {

-            add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);

-        }

+		if ($sitepress->get_setting('sync_comments_on_duplicates')) {

+			add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);

+		}

         

-        add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);

-        add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 );

-        if (is_admin()) {

-            add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 );

-        }

-    }

+		add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);

+		add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 );

+		if (is_admin()) {

+			add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 );

+		}

+	}

 }

 add_filter('plugins_loaded', 'geodir_wpml_set_filter');

 

@@ -2865,38 +2865,38 @@ 
  * @return array Filtered languages.

  */

 function geodir_wpml_filter_ls_languages($languages) {    

-    if (geodir_is_geodir_page()) {        

-        $keep_vars = array();

+	if (geodir_is_geodir_page()) {        

+		$keep_vars = array();

         

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

-            $keep_vars = array('listing_type', 'package_id');

-        } else if (geodir_is_page('search')) {

-            $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');

-        } else if (geodir_is_page('author')) {

-            $keep_vars = array('geodir_dashbord', 'stype', 'list');

-        } else if (geodir_is_page('login')) {

-            $keep_vars = array('forgot', 'signup');

-        }        

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

+			$keep_vars = array('listing_type', 'package_id');

+		} else if (geodir_is_page('search')) {

+			$keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');

+		} else if (geodir_is_page('author')) {

+			$keep_vars = array('geodir_dashbord', 'stype', 'list');

+		} else if (geodir_is_page('login')) {

+			$keep_vars = array('forgot', 'signup');

+		}        

         

-        if (!empty($keep_vars)) {

-            foreach ( $languages as $code => $url) {

-                $filter_url = $url['url'];

+		if (!empty($keep_vars)) {

+			foreach ( $languages as $code => $url) {

+				$filter_url = $url['url'];

                 

-                foreach ($keep_vars as $var) {

-                    if (isset($_GET[$var]) && !is_array($_GET[$var])) {

-                        $filter_url = remove_query_arg(array($var), $filter_url);

-                        $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url);

-                    }

-                }

+				foreach ($keep_vars as $var) {

+					if (isset($_GET[$var]) && !is_array($_GET[$var])) {

+						$filter_url = remove_query_arg(array($var), $filter_url);

+						$filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url);

+					}

+				}

                 

-                if ($filter_url != $url['url']) {

-                    $languages[$code]['url'] = $filter_url;

-                }

-            }

-        }

-    }

+				if ($filter_url != $url['url']) {

+					$languages[$code]['url'] = $filter_url;

+				}

+			}

+		}

+	}

 

-    return $languages;

+	return $languages;

 }

 add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );

 

@@ -2907,18 +2907,18 @@ 
  *

  */

 function geodir_remove_yoast_seo_metas(){

-    if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {

-        $wpseo = WPSEO_Frontend::get_instance();

+	if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {

+		$wpseo = WPSEO_Frontend::get_instance();

         

-        remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 );

-        remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 );

-        remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 );

-        remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 );

-        remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 );

-        remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 );

+		remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 );

+		remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 );

+		remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 );

+		remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 );

+		remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 );

+		remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 );

         

-        remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 );

-    }

+		remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 );

+	}

 }

 

 /**

@@ -2932,20 +2932,20 @@ 
  *

  */

  function geodir_wpml_ajax_set_guest_lang() {    

-    if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {

-        if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {

-            global $sitepress;

+	if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {

+		if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {

+			global $sitepress;

             

-            $referer = wp_get_referer();

+			$referer = wp_get_referer();

             

-            $current_lang = $sitepress->get_current_language();

-            $referrer_lang = $sitepress->get_language_from_url( $referer );

+			$current_lang = $sitepress->get_current_language();

+			$referrer_lang = $sitepress->get_language_from_url( $referer );

             

-            if ( $referrer_lang && $current_lang != $referrer_lang ) {

-                $_GET['lang'] = $referrer_lang;

-            }

-        }

-    }

+			if ( $referrer_lang && $current_lang != $referrer_lang ) {

+				$_GET['lang'] = $referrer_lang;

+			}

+		}

+	}

 }

 add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 );

 

@@ -2957,36 +2957,36 @@ 
  * @param object $wp The WordPress object.

  */

 function geodir_check_redirect($wp) {

-    if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {

-        $current_url = geodir_curPageURL();

-        $search = 'czech-republic';

-        $replace = 'czechia';        

+	if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {

+		$current_url = geodir_curPageURL();

+		$search = 'czech-republic';

+		$replace = 'czechia';        

         

-        $has_slash = substr($current_url, -1);

-        if ($has_slash != "/") {

-            $current_url .= '/';

-        }

+		$has_slash = substr($current_url, -1);

+		if ($has_slash != "/") {

+			$current_url .= '/';

+		}

         

-        $redirect = false;

-        if (strpos($current_url, '/' . $search . '/') !== false) {

-            $redirect = true;

-            $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);

-        }

+		$redirect = false;

+		if (strpos($current_url, '/' . $search . '/') !== false) {

+			$redirect = true;

+			$current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);

+		}

         

-        if ($has_slash != "/") {

-            $current_url = trim($current_url, '/');

-        }

+		if ($has_slash != "/") {

+			$current_url = trim($current_url, '/');

+		}

         

-        if (strpos($current_url, 'gd_country=' . $search) !== false) {

-            $redirect = true;

-            $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);

-        }

-

-        if ($redirect) {

-            wp_redirect($current_url);

-            exit;

-        }

-    }

+		if (strpos($current_url, 'gd_country=' . $search) !== false) {

+			$redirect = true;

+			$current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);

+		}

+

+		if ($redirect) {

+			wp_redirect($current_url);

+			exit;

+		}

+	}

 }

 add_action('parse_request', 'geodir_check_redirect', 101, 1);

 

@@ -3006,50 +3006,50 @@ 
  * @param string $original_slug The original post slug.

  */

 function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {

-    global $wpdb, $sitepress;

+	global $wpdb, $sitepress;

     

-    if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {

-        $wpml_post_join = "";

-        $wpml_post_where = "";

-        $wpml_term_join = "";

-        $wpml_term_where = "";

+	if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {

+		$wpml_post_join = "";

+		$wpml_post_where = "";

+		$wpml_term_join = "";

+		$wpml_term_where = "";

         

-        if (geodir_wpml_is_post_type_translated($post_type)) {

-            $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language();

-            $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress);

-            if (!$post_language) {

-                $post_language = $sitepress->get_current_language();

-            }

+		if (geodir_wpml_is_post_type_translated($post_type)) {

+			$post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language();

+			$post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress);

+			if (!$post_language) {

+				$post_language = $sitepress->get_current_language();

+			}

             

-            $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

-            $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'";

+			$wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

+			$wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'";

             

-            $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";

-            $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'";

-        }

+			$wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";

+			$wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'";

+		}

 

-        $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );

+		$term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );

 

-        if ( $term_slug_check ) {

-            $suffix = 1;

+		if ( $term_slug_check ) {

+			$suffix = 1;

             

-            do {

-                $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";

+			do {

+				$alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";

                 

-                $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );

+				$term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );

                 

-                $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );

+				$post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );

                 

-                $term_slug_check = $term_check || $post_check;

+				$term_slug_check = $term_check || $post_check;

                 

-                $suffix++;

-            } while ( $term_slug_check );

+				$suffix++;

+			} while ( $term_slug_check );

             

-            $slug = $alt_slug;

-        }

-    }

+			$slug = $alt_slug;

+		}

+	}

     

-    return $slug;

+	return $slug;

 }

 add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 );

 

@@ -3069,47 +3069,47 @@ 
  * @return bool true when exists. false when not exists.

  */

 function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {

-    global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress;

+	global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress;

     

-    if ( $slug_exists ) {

-        return $slug_exists;

-    }

+	if ( $slug_exists ) {

+		return $slug_exists;

+	}

     

-    if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {

-        $taxonomy = $gd_term_taxonomy[$term_id];

-    } else {

-        $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) );

-        $gd_term_taxonomy[$term_id] = $taxonomy;

-    }

+	if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {

+		$taxonomy = $gd_term_taxonomy[$term_id];

+	} else {

+		$taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) );

+		$gd_term_taxonomy[$term_id] = $taxonomy;

+	}

     

-    if ( empty($taxonomy) ) {

-        return $slug_exists;

-    }

+	if ( empty($taxonomy) ) {

+		return $slug_exists;

+	}

     

-    if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {

-        $post_type = $gd_term_post_type[$term_id];

-    } else {

-        $taxonomy_obj = get_taxonomy( $taxonomy );

-        $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL;

-    }

+	if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {

+		$post_type = $gd_term_post_type[$term_id];

+	} else {

+		$taxonomy_obj = get_taxonomy( $taxonomy );

+		$post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL;

+	}

     

-    $wpml_post_join = "";

-    $wpml_post_where = "";

+	$wpml_post_join = "";

+	$wpml_post_where = "";

     

-    if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {

-        $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language();

-        if (!$term_language) {

-            $term_language = $sitepress->get_current_language();

-        }

+	if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {

+		$term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language();

+		if (!$term_language) {

+			$term_language = $sitepress->get_current_language();

+		}

         

-        $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

-        $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'";

-    }

+		$wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

+		$wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'";

+	}

     

-    if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s  {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {

-        $slug_exists = true;

-    }

+	if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s  {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {

+		$slug_exists = true;

+	}

 

-    return $slug_exists;

+	return $slug_exists;

 }

 add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 );
\ No newline at end of file

geodirectory-templates/geodir-signup.php

Indentation +9 added lines, -9 removed lines

@@ -14,15 +14,15 @@
  */
 if (get_current_user_id()) {
 
-    $_redirect = home_url();
-    if (isset($_REQUEST['redirect_add_listing'])) {
-        $_redirect = $_REQUEST['redirect_add_listing'];
-    } elseif (!empty($_REQUEST['redirect_to'])) {
-        $_redirect = $_REQUEST['redirect_to'];
-    }
-
-    wp_safe_redirect($_redirect , 302);
-    exit;
+	$_redirect = home_url();
+	if (isset($_REQUEST['redirect_add_listing'])) {
+		$_redirect = $_REQUEST['redirect_add_listing'];
+	} elseif (!empty($_REQUEST['redirect_to'])) {
+		$_redirect = $_REQUEST['redirect_to'];
+	}
+
+	wp_safe_redirect($_redirect , 302);
+	exit;
 }
 
 // call header

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $_redirect = $_REQUEST['redirect_to'];
     }
 
-    wp_safe_redirect($_redirect , 302);
+    wp_safe_redirect($_redirect, 302);
     exit;
 }
 

geodirectory-functions/taxonomy_functions.php

Braces +161 added lines, -116 removed lines

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

 

         $menu_class = '';

-        if (geodir_is_page('listing'))

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

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

 

         //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

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

                         if (get_post_type_archive_link($post_type)) {

                             $menu_class = '';

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

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

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

                              * Filter the menu li class.

                              *

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

 

                                 $menu_class = '';

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

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

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

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

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

@@ -159,8 +162,9 @@ 
     if (get_option('geodir_show_addlisting_nav')) {

 

         $menu_class = '';

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

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

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

         //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

         $post_types = geodir_get_posttypes('object');

@@ -176,8 +180,9 @@ 
                                 if (geodir_get_addlisting_link($post_type)) {

 

                                     $menu_class = '';

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

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

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

                                      * Filter the menu li class.

                                      *

@@ -261,8 +266,9 @@ 
                                     if (geodir_get_addlisting_link($post_type)) {

 

                                         $menu_class = '';

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

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

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

                                          * Filter the menu li class.

                                          *

@@ -319,8 +325,9 @@ 
     }

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

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

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

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

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

     return $menu;

 

@@ -407,17 +414,20 @@ 
     $geodir_post_type = get_query_var('post_type');

 

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

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

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

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

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

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

 

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

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

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

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

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

     // Retrive post type for map marker html ajax request on preview page.

     if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {

@@ -431,8 +441,9 @@ 
     $all_postypes = geodir_get_posttypes();

     $all_postypes = stripslashes_deep($all_postypes);

 

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

-        $geodir_post_type = '';

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

     if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

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

@@ -517,11 +528,12 @@ 
         endswitch;

     }

 

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

-}

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

 

 /**

  * Get Custom Post Type info.

@@ -538,9 +550,10 @@ 
     $post_types = stripslashes_deep($post_types);

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

         return $post_types[$post_type];

-    } else

-        return false;

-}

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

 

 if (!function_exists('geodir_get_taxonomies')) {

     /**

@@ -626,10 +639,11 @@ 
                 . geodir_utf8_ucfirst($category_obj->name) . '</option>';

         }

 

-        if ($echo)

-            echo $html;

-        else

-            return $html;

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

 }

 

@@ -663,11 +677,12 @@ 
 

     }

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

-}

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

 

 

 /**

@@ -698,16 +713,18 @@ 
     if (!empty($taxonomies)) {

         foreach (geodir_get_posttypes() as $pt) {

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

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

-                $post_type[] = $pt;

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

     }

 

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

-}

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

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

     /**

@@ -763,18 +780,18 @@ 
                 $checked = '';

 

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

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

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

-                    else

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

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

 

-                if ($cat_display == 'radio')

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

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

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

-

-                else {

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

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

                 }

 

@@ -783,8 +800,9 @@ 
 

             }

 

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

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

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

             return $out;

         }

@@ -810,18 +828,21 @@ 
         global $exclude_cats, $gd_session;

 

         $cat_exclude = '';

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

-            $cat_exclude = serialize($exclude_cats);

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

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

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

 

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

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

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

             $post_categories = $post->post_category_str;

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

-                $post_category_str = $post_categories[$cat_taxonomy];

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

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

             global $post;

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

             $post_cat_str = $post_categories[$cat_taxonomy];

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

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

-                $style = "display:none;";

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

         ?>

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

@@ -1048,7 +1070,7 @@ 
 

         if(is_array( $exclude_cats)){

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

-        }else{

+        } else{

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1078,7 +1100,10 @@ 
 

             <div class="post_default_category">

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

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

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

         <span> 

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

         </span>

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

 

         $option_selected = '';

-        if (!$selected)

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

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

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

 

@@ -1187,8 +1213,9 @@ 
 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

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

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

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

             // Count child terms

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

@@ -1253,8 +1280,9 @@ 
 

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

 

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

-        $listing_slug = 'places';

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

     /**

      * Taxonomies

@@ -1566,8 +1594,9 @@ 
                             'city_slug' => $post->city_slug

                         );

 

-                    } else

-                        $post_location = geodir_get_location();

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

 

                 } else {

@@ -1596,8 +1625,9 @@ 
                             );

 

                         }

-                    } else

-                        $post_location = geodir_get_location();

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

 

 

@@ -1636,16 +1666,17 @@ 
 

                     if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

                         $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

+                    } elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

                         $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

                         $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

-                    }elseif (isset($post->{$taxonomies})) {

+                    } elseif (isset($post->{$taxonomies})) {

                         $post_terms = explode(",", trim($post->{$taxonomies}, ","));

                         $post_terms = $post_terms[0];

                     }

 

-                    if (!$post_terms)

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

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

                     if (!$post_terms) {

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

@@ -1659,8 +1690,9 @@ 
 

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

 

-                if (!empty($term))

-                    $term_request = $term->slug;

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

             }

 

@@ -1675,9 +1707,13 @@ 
                 $request_term .= $term_request;

 

             } else {

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

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

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

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

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

             

@@ -1686,10 +1722,11 @@ 
                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

             }

             

-            if (!empty($request_term))

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

-            else

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

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

         }

         // temp cache the permalink

@@ -1881,11 +1918,12 @@ 
     

     $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

-}

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

 

 /**

  * Print or Get post type plural label.

@@ -1901,18 +1939,20 @@ 
 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

     $all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

     $obj_post_type = get_post_type_object($post_type);

     

     $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

-}

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

 

 /**

  * Checks whether a term exists or not.

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

 

     if (is_int($term)) {

-        if (0 == $term)

-            return 0;

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

-        if (!empty($taxonomy))

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

-        else

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

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

 

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

 

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

-        return 0;

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

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

 

@@ -1964,14 +2007,16 @@ 
         $where_fields[] = $taxonomy;

 

 

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

-            return $result;

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

         return false;

     }

 

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

-        return $result;

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

     return false;

 }

Indentation +1273 added lines, -1273 removed lines

@@ -33,265 +33,265 @@ 
  */

 function geodir_add_nav_menu_items()

 {

-    $items = '';

-    // apply filter to add more navigations // -Filter-Location-Manager

-

-    if (get_option('geodir_show_listing_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('listing'))

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

-

-

-        //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

-        if (!empty($post_types)) {

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

-                if (!empty($show_post_type_main_nav)) {

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

-                        if (get_post_type_archive_link($post_type)) {

-                            $menu_class = '';

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

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

-                            /**

-                             * Filter the menu li class.

-                             *

-                             * @since 1.0.0

-                             * @param string $menu_class The menu HTML class.

-                             */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                            /**

-                             * Filter the menu a class.

-                             *

-                             * @since 1.0.0

-                             */

-                            $a_class = apply_filters('geodir_menu_a_class', '');

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

+	$items = '';

+	// apply filter to add more navigations // -Filter-Location-Manager

+

+	if (get_option('geodir_show_listing_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('listing'))

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

+

+

+		//SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

+		if (!empty($post_types)) {

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

+				if (!empty($show_post_type_main_nav)) {

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

+						if (get_post_type_archive_link($post_type)) {

+							$menu_class = '';

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

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

+							/**

+							 * Filter the menu li class.

+							 *

+							 * @since 1.0.0

+							 * @param string $menu_class The menu HTML class.

+							 */

+							$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+							/**

+							 * Filter the menu a class.

+							 *

+							 * @since 1.0.0

+							 */

+							$a_class = apply_filters('geodir_menu_a_class', '');

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

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

 										' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

 									</a>

 								</li>';

-                        }

-                    }

-                }

-            }

-        }

-        //END LISTING OF POST TYPE IN MAIN NAVIGATION

-

-        $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

-        $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

-        if ($is_listing_sub_meny_exists) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

+						}

+					}

+				}

+			}

+		}

+		//END LISTING OF POST TYPE IN MAIN NAVIGATION

+

+		$view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

+		$is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

+		if ($is_listing_sub_meny_exists) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

 					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

-            $post_types = geodir_get_posttypes('object');

+			$post_types = geodir_get_posttypes('object');

 

-            $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

+			$show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

 

-            if (!empty($post_types)) {

-                global $geodir_add_location_url;

-                $geodir_add_location_url = true;

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

-                    if (!empty($show_listing_post_types)) {

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

-                            if (get_post_type_archive_link($post_type)) {

+			if (!empty($post_types)) {

+				global $geodir_add_location_url;

+				$geodir_add_location_url = true;

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

+					if (!empty($show_listing_post_types)) {

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

+							if (get_post_type_archive_link($post_type)) {

 

-                                $menu_class = '';

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

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

+								$menu_class = '';

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

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

 

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

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

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

 															' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

 														</a>

 													</li>';

-                            }

-                        }

-                    }

-                }

-                $geodir_add_location_url = NULL;

-            }

+							}

+						}

+					}

+				}

+				$geodir_add_location_url = NULL;

+			}

 

-            $items .= '	</ul> ';

-            /**

-             * Filter called after the sub menu closing ul tag for dynamic added menu items.

-             *

-             * @since 1.5.9

-             */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

-        }

-    }

-

-    if (get_option('geodir_show_addlisting_nav')) {

-

-        $menu_class = '';

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

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

-

-        //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

-

-        if (!empty($post_types)) {

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

-                if (!empty($geodir_allow_posttype_frontend)) {

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

-                        if (!empty($show_add_listing_post_types_main_nav)) {

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

-                                if (geodir_get_addlisting_link($post_type)) {

-

-                                    $menu_class = '';

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

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

-                                    /**

-                                     * Filter the menu li class.

-                                     *

-                                     * @since 1.0.0

-                                     * @param string $menu_class The menu HTML class.

-                                     */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                    /**

-                                     * Filter the menu a class.

-                                     *

-                                     * @since 1.0.0

-                                     */

-                                    $a_class = apply_filters('geodir_menu_a_class', '');

-                                    $cpt_name = __($args->labels->singular_name, 'geodirectory');

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

+			$items .= '	</ul> ';

+			/**

+			 * Filter called after the sub menu closing ul tag for dynamic added menu items.

+			 *

+			 * @since 1.5.9

+			 */

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

+			$items .= '</li>';

+		}

+	}

+

+	if (get_option('geodir_show_addlisting_nav')) {

+

+		$menu_class = '';

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

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

+

+		//SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+

+		if (!empty($post_types)) {

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

+				if (!empty($geodir_allow_posttype_frontend)) {

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

+						if (!empty($show_add_listing_post_types_main_nav)) {

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

+								if (geodir_get_addlisting_link($post_type)) {

+

+									$menu_class = '';

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

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

+									/**

+									 * Filter the menu li class.

+									 *

+									 * @since 1.0.0

+									 * @param string $menu_class The menu HTML class.

+									 */

+									$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+									/**

+									 * Filter the menu a class.

+									 *

+									 * @since 1.0.0

+									 */

+									$a_class = apply_filters('geodir_menu_a_class', '');

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

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

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

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

 											</a>

 										</li>';

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-        //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-    }

-

-    $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

-    $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

-    if ($is_add_listing_sub_meny_exists) {

-

-        if (get_option('geodir_show_addlisting_nav')) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		//END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+	}

+

+	$view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

+	$is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

+	if ($is_add_listing_sub_meny_exists) {

+

+		if (get_option('geodir_show_addlisting_nav')) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

 					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

 

-            $post_types = geodir_get_posttypes('object');

-

-            $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

-

-            if (!empty($post_types)) {

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

-                    if (!empty($geodir_allow_posttype_frontend)) {

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

-                            if (!empty($show_add_listing_post_types)) {

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

-                                    if (geodir_get_addlisting_link($post_type)) {

-

-                                        $menu_class = '';

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

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

-                                        /**

-                                         * Filter the menu li class.

-                                         *

-                                         * @since 1.0.0

-                                         * @param string $menu_class The menu HTML class.

-                                         */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                        $cpt_name = __($args->labels->singular_name, 'geodirectory');

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

+			$post_types = geodir_get_posttypes('object');

+

+			$show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

+

+			if (!empty($post_types)) {

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

+					if (!empty($geodir_allow_posttype_frontend)) {

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

+							if (!empty($show_add_listing_post_types)) {

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

+									if (geodir_get_addlisting_link($post_type)) {

+

+										$menu_class = '';

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

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

+										/**

+										 * Filter the menu li class.

+										 *

+										 * @since 1.0.0

+										 * @param string $menu_class The menu HTML class.

+										 */

+										$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

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

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

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

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

 														</a>

 													</li>';

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

+									}

+								}

+							}

+						}

+					}

+				}

+			}

 

-            $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

+			$items .= '	</ul> ';

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

+			$items .= '</li>';

 

-        }

-    }

-    // apply filter to add more navigations // -Filter-Location-Manager

-    return $items;

+		}

+	}

+	// apply filter to add more navigations // -Filter-Location-Manager

+	return $items;

 }

 

 

@@ -309,20 +309,20 @@ 
  */

 function geodir_pagemenu_items($menu, $args)

 {

-    $locations = get_nav_menu_locations();

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

-    $geodir_theme_location_nav = array();

-    if (empty($locations) && empty($geodir_theme_location)) {

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

-        $geodir_theme_location_nav[] = $args['theme_location'];

-        update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

-    }

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

+	$locations = get_nav_menu_locations();

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location_nav = array();

+	if (empty($locations) && empty($geodir_theme_location)) {

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

+		$geodir_theme_location_nav[] = $args['theme_location'];

+		update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

+	}

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

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

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

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

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

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

 

-    return $menu;

+	return $menu;

 

 }

 

@@ -342,18 +342,18 @@ 
 function geodir_menu_items($items, $args)

 {

 

-    $location = $args->theme_location;

+	$location = $args->theme_location;

 

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

 

-    if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

+	if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

-        return $items;

+		$items = $items . geodir_add_nav_menu_items();

+		return $items;

 

-    } else {

-        return $items;

-    }

+	} else {

+		return $items;

+	}

 }

 

 /**

@@ -368,25 +368,25 @@ 
  */

 function geodir_get_category_all_array()

 {

-    global $wpdb;

-    $return_array = array();

-

-    $taxonomies = geodir_get_taxonomies();

-    $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

-

-    $pn_categories = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

-        )

-    );

-

-    foreach ($pn_categories as $pn_categories_obj) {

-        $return_array[] = array("id" => $pn_categories_obj->cat_ID,

-            "title" => $pn_categories_obj->name,);

-    }

-    return $return_array;

+	global $wpdb;

+	$return_array = array();

+

+	$taxonomies = geodir_get_taxonomies();

+	$taxonomies = implode("','", $taxonomies);

+	$taxonomies = "'" . $taxonomies . "'";

+

+	$pn_categories = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

+			array($wpdb->terms . term_id)

+		)

+	);

+

+	foreach ($pn_categories as $pn_categories_obj) {

+		$return_array[] = array("id" => $pn_categories_obj->cat_ID,

+			"title" => $pn_categories_obj->name,);

+	}

+	return $return_array;

 }

 

 

@@ -402,49 +402,49 @@ 
  * @return string The post type.

  */

 function geodir_get_current_posttype() {

-    global $wp_query, $post, $geodir_post_type;

+	global $wp_query, $post, $geodir_post_type;

 

-    $geodir_post_type = get_query_var('post_type');

+	$geodir_post_type = get_query_var('post_type');

 

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

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

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

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

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

-    }

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

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

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

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

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

+	}

 

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

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

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

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

 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+	if (is_tax())

+		$geodir_post_type = geodir_get_taxonomy_posttype();

 

-    // Retrive post type for map marker html ajax request on preview page.

-    if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {

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

-            $geodir_post_type = $post->post_type;

-        } else if (!empty($post->listing_type)) {

-            $geodir_post_type = $post->listing_type;

-        }

-    }

+	// Retrive post type for map marker html ajax request on preview page.

+	if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {

+		if (!empty($post->post_type)) {

+			$geodir_post_type = $post->post_type;

+		} else if (!empty($post->listing_type)) {

+			$geodir_post_type = $post->listing_type;

+		}

+	}

 

-    $all_postypes = geodir_get_posttypes();

-    $all_postypes = stripslashes_deep($all_postypes);

+	$all_postypes = geodir_get_posttypes();

+	$all_postypes = stripslashes_deep($all_postypes);

 

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

-        $geodir_post_type = '';

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

+		$geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

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

-    }

+	if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

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

+	}

 

 

-    /**

-     * Filter the default CPT return.

-     *

-     * @since 1.6.9

-     */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+	/**

+	 * Filter the default CPT return.

+	 *

+	 * @since 1.6.9

+	 */

+	return apply_filters('geodir_get_current_posttype',$geodir_post_type);

 }

 

 /**

@@ -458,22 +458,22 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

-

-    $stype = false;

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

-        global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

-            $stype = $post_type; break;

-        }

-    }

-

-    if(!$stype){

-        $stype = 'gd_place';

-    }

-

-    return $stype;

+	$post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+

+	$stype = false;

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

+		global $wpdb;

+		$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

+		if ( $has_posts ) {

+			$stype = $post_type; break;

+		}

+	}

+

+	if(!$stype){

+		$stype = 'gd_place';

+	}

+

+	return $stype;

 }

 

 /**

@@ -487,21 +487,21 @@ 
  */

 function geodir_get_posttypes($output = 'names')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types)) {

-        switch ($output):

-            case 'object':

-            case 'Object':

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

-                break;

-            case 'array':

-            case 'Array':

-                $post_types = (array)$post_types;

-                break;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types)) {

+		switch ($output):

+			case 'object':

+			case 'Object':

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

+				break;

+			case 'array':

+			case 'Array':

+				$post_types = (array)$post_types;

+				break;

 			case 'options':

-                $post_types = (array)$post_types;

+				$post_types = (array)$post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -510,17 +510,17 @@ 
 					}

 				}

 				$post_types = $options;

-                break;

-            default:

-                $post_types = array_keys($post_types);

-                break;

-        endswitch;

-    }

-

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

+				break;

+			default:

+				$post_types = array_keys($post_types);

+				break;

+		endswitch;

+	}

+

+	if (!empty($post_types))

+		return $post_types;

+	else

+		return array();

 }

 

 /**

@@ -533,104 +533,104 @@ 
  */

 function geodir_get_posttype_info($post_type = '')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

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

-        return $post_types[$post_type];

-    } else

-        return false;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

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

+		return $post_types[$post_type];

+	} else

+		return false;

 }

 

 if (!function_exists('geodir_get_taxonomies')) {

-    /**

-     * Get all custom taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @return array|bool Taxonomies on success. false on failure.

-     */

-    function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {

-        $taxonomies = array();

-        $gd_taxonomies = array();

-

-        if ($taxonomies = get_option('geodir_taxonomies')) {

-            $gd_taxonomies = array_keys($taxonomies);

-

-            if ($post_type != '') {

-                $gd_taxonomies = array();

-            }

+	/**

+	 * Get all custom taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @return array|bool Taxonomies on success. false on failure.

+	 */

+	function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {

+		$taxonomies = array();

+		$gd_taxonomies = array();

+

+		if ($taxonomies = get_option('geodir_taxonomies')) {

+			$gd_taxonomies = array_keys($taxonomies);

+

+			if ($post_type != '') {

+				$gd_taxonomies = array();

+			}

 

-            $i = 0;

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

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

-                    $gd_taxonomies[] = $taxonomy;

-                }

+			$i = 0;

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

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

+					$gd_taxonomies[] = $taxonomy;

+				}

 

-                if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {

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

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

-                    }

-                }

-            }

+				if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {

+					if (array_search($taxonomy, $gd_taxonomies) !== false) {

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

+					}

+				}

+			}

 

-            $gd_taxonomies = array_values($gd_taxonomies);

-        }

-

-        /**

-         * Filter the taxonomies.

-         *

-         * @since 1.0.0

-         * @param array $gd_taxonomies The taxonomy array.

-         */

-        $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

-

-        if (!empty($taxonomies)) {

-            return $taxonomies;

-        } else {

-            return false;

-        }

-    }

+			$gd_taxonomies = array_values($gd_taxonomies);

+		}

+

+		/**

+		 * Filter the taxonomies.

+		 *

+		 * @since 1.0.0

+		 * @param array $gd_taxonomies The taxonomy array.

+		 */

+		$taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

+

+		if (!empty($taxonomies)) {

+			return $taxonomies;

+		} else {

+			return false;

+		}

+	}

 }

 

 if (!function_exists(' geodir_get_categories_dl')) {

-    /**

-     * Get categories dropdown HTML.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param string $selected The selected value.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @param bool $echo Prints the HTML when set to true. Default: true.

-     * @return void|string Dropdown HTML.

-     */

-    function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

-    {

-

-        $html = '';

-        $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

-

-        $categories = get_terms($taxonomies);

-

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

-

-        foreach ($categories as $category_obj) {

-            $select_opt = '';

-            if ($selected == $category_obj->term_id) {

-                $select_opt = 'selected="selected"';

-            }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . geodir_utf8_ucfirst($category_obj->name) . '</option>';

-        }

-

-        if ($echo)

-            echo $html;

-        else

-            return $html;

-    }

+	/**

+	 * Get categories dropdown HTML.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param string $selected The selected value.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @param bool $echo Prints the HTML when set to true. Default: true.

+	 * @return void|string Dropdown HTML.

+	 */

+	function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

+	{

+

+		$html = '';

+		$taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

+

+		$categories = get_terms($taxonomies);

+

+		$html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+

+		foreach ($categories as $category_obj) {

+			$select_opt = '';

+			if ($selected == $category_obj->term_id) {

+				$select_opt = 'selected="selected"';

+			}

+			$html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

+				. geodir_utf8_ucfirst($category_obj->name) . '</option>';

+		}

+

+		if ($echo)

+			echo $html;

+		else

+			return $html;

+	}

 }

 

 

@@ -645,28 +645,28 @@ 
 function geodir_get_listing_slug($object_type = '')

 {

 

-    $listing_slug = '';

+	$listing_slug = '';

 

-    $post_types = get_option('geodir_post_types');

-    $taxonomies = get_option('geodir_taxonomies');

+	$post_types = get_option('geodir_post_types');

+	$taxonomies = get_option('geodir_taxonomies');

 

 

-    if ($object_type != '') {

-        if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

+	if ($object_type != '') {

+		if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

 

-            $object_info = $post_types[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

-            $object_info = $taxonomies[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        }

+			$object_info = $post_types[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		} elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

+			$object_info = $taxonomies[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		}

 

-    }

+	}

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

+	if (!empty($listing_slug))

+		return $listing_slug;

+	else

+		return false;

 }

 

 

@@ -681,212 +681,212 @@ 
  */

 function geodir_get_taxonomy_posttype($taxonomy = '')

 {

-    global $wp_query;

-

-    $post_type = array();

-    $taxonomies = array();

-

-    if (!empty($taxonomy)) {

-        $taxonomies[] = $taxonomy;

-    } elseif (isset($wp_query->tax_query->queries)) {

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

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

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

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

-    }

-

-    if (!empty($taxonomies)) {

-        foreach (geodir_get_posttypes() as $pt) {

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

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

-                $post_type[] = $pt;

-        }

-    }

-

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

+	global $wp_query;

+

+	$post_type = array();

+	$taxonomies = array();

+

+	if (!empty($taxonomy)) {

+		$taxonomies[] = $taxonomy;

+	} elseif (isset($wp_query->tax_query->queries)) {

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

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

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

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

+	}

+

+	if (!empty($taxonomies)) {

+		foreach (geodir_get_posttypes() as $pt) {

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

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

+				$post_type[] = $pt;

+		}

+	}

+

+	if (!empty($post_type))

+		return $post_type[0];

+	else

+		return false;

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param int $cat_parent The parent term ID.

-     * @param bool $hide_empty Hide empty taxonomies? Default: false.

-     * @param int $pading CSS padding in pixels.

-     * @return string|void taxonomy HTML.

-     */

-    function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

-    {

-        global $cat_display, $post_cat, $exclude_cats;

-

-        $search_terms = trim($post_cat, ",");

-

-        $search_terms = explode(",", $search_terms);

-

-        $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

-

-        $display = '';

-        $onchange = '';

-        $term_check = '';

-        $main_list_class = '';

-        $out = '';

-        //If there are terms, start displaying

-        if (count($cat_terms) > 0) {

-            //Displaying as a list

-            $p = $pading * 20;

-            $pading++;

-

-

-            if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

-                if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

-                    $main_list_class = 'class="main_list_selecter"';

-                } else {

-                    //$display = 'display:none';

-                    $list_class = 'sub_list gd-sub-cats-list';

-                }

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param int $cat_parent The parent term ID.

+	 * @param bool $hide_empty Hide empty taxonomies? Default: false.

+	 * @param int $pading CSS padding in pixels.

+	 * @return string|void taxonomy HTML.

+	 */

+	function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

+	{

+		global $cat_display, $post_cat, $exclude_cats;

+

+		$search_terms = trim($post_cat, ",");

+

+		$search_terms = explode(",", $search_terms);

+

+		$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

+

+		$display = '';

+		$onchange = '';

+		$term_check = '';

+		$main_list_class = '';

+		$out = '';

+		//If there are terms, start displaying

+		if (count($cat_terms) > 0) {

+			//Displaying as a list

+			$p = $pading * 20;

+			$pading++;

+

+

+			if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

+				if ($cat_parent == 0) {

+					$list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+					$main_list_class = 'class="main_list_selecter"';

+				} else {

+					//$display = 'display:none';

+					$list_class = 'sub_list gd-sub-cats-list';

+				}

+			}

 

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

-                $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

-            }

+			if ($cat_display == 'checkbox' || $cat_display == 'radio') {

+				$p = 0;

+				$out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+			}

 

-            foreach ($cat_terms as $cat_term) {

+			foreach ($cat_terms as $cat_term) {

 

-                $checked = '';

+				$checked = '';

 

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

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

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

-                    else

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

-                }

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

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

+						$checked = 'selected="selected"';

+					else

+						$checked = 'checked="checked"';

+				}

 

-                if ($cat_display == 'radio')

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

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

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

+				if ($cat_display == 'radio')

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

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

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

 

-                else {

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

-                }

+				else {

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

+				}

 

-                // Call recurson to print sub cats

-                $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

+				// Call recurson to print sub cats

+				$out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

 

-            }

+			}

 

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

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

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

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

 

-            return $out;

-        }

-        return;

-    }

+			return $out;

+		}

+		return;

+	}

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker2')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post WordPress Post object.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param string $cat_limit Number of categories to display.

-     */

-    function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

-    {

-        $post_category = '';

-        $post_category_str = '';

-        global $exclude_cats, $gd_session;

-

-        $cat_exclude = '';

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

-            $cat_exclude = serialize($exclude_cats);

-

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

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

-

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

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

-

-            $post_categories = $post->post_category_str;

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

-                $post_category_str = $post_categories[$cat_taxonomy];

-

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

-            global $post;

-

-            $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

-            if (empty($post_category) && isset($post->{$cat_taxonomy})) {

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

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post WordPress Post object.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param string $cat_limit Number of categories to display.

+	 */

+	function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

+	{

+		$post_category = '';

+		$post_category_str = '';

+		global $exclude_cats, $gd_session;

+

+		$cat_exclude = '';

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

+			$cat_exclude = serialize($exclude_cats);

+

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

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

+

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

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

+

+			$post_categories = $post->post_category_str;

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

+				$post_category_str = $post_categories[$cat_taxonomy];

+

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

+			global $post;

+

+			$post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

+			if (empty($post_category) && isset($post->{$cat_taxonomy})) {

+				$post_category = $post->{$cat_taxonomy};

+			}

 

-            $post_categories = get_post_meta($post->ID, 'post_categories', true);

+			$post_categories = get_post_meta($post->ID, 'post_categories', true);

 

-            if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

-                foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

-                    if (is_numeric($cat_part)) {

-                        $cat_part_arr[] = $cat_part;

-                    }

-                }

-                if (is_array($cat_part_arr)) {

-                    $post_category = implode(',', $cat_part_arr);

-                }

-            }

+			if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

+				foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

+					if (is_numeric($cat_part)) {

+						$cat_part_arr[] = $cat_part;

+					}

+				}

+				if (is_array($cat_part_arr)) {

+					$post_category = implode(',', $cat_part_arr);

+				}

+			}

 

-            if (!empty($post_category)) {

-                $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+			if (!empty($post_category)) {

+				$cat1 = array_filter(explode(',', $post_category));

+				$post_category = ',' . implode(',', $cat1) . ',';

 

-            }

+			}

 

-            if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

+			if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

 

-                $post_category_upd = explode(',', $post_category);

-                $post_category_change = '';

-                foreach ($post_category_upd as $cat) {

+				$post_category_upd = explode(',', $post_category);

+				$post_category_change = '';

+				foreach ($post_category_upd as $cat) {

 

-                    if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

-                    }

-                }

-                $post_category = $post_category_change;

-            }

+					if (!in_array($cat, $exclude_cats) && $cat != '') {

+						$post_category_change .= ',' . $cat;

+					}

+				}

+				$post_category = $post_category_change;

+			}

 

 

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

-                $post_category_str = $post_categories[$cat_taxonomy];

-            }

-        }

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+				$post_category_str = $post_categories[$cat_taxonomy];

+			}

+		}

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

 

 

-        ?>

+		?>

         <div class="cat_sublist">

             <?php

 

-            $post_id = isset($post->ID) ? $post->ID : '';

+			$post_id = isset($post->ID) ? $post->ID : '';

 

-            if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

+			if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

 

-                geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

-            }

-            ?>

+				geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

+			}

+			?>

         </div>

         <script type="text/javascript">

 

@@ -1009,22 +1009,22 @@ 
 

         </script>

         <?php

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

-            $post_cat_str = $post_categories[$cat_taxonomy];

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

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

-                $style = "display:none;";

-        }

-        ?>

+		if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+			$post_cat_str = $post_categories[$cat_taxonomy];

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

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

+				$style = "display:none;";

+		}

+		?>

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

-            echo $style;

-        }?> ">

+			echo $style;

+		}?> ">

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

-            ?>

+			?>

         </div>

     <?php

 

-    }

+	}

 }

 

 /**

@@ -1041,23 +1041,23 @@ 
  */

 function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '')

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    if ($exclude != '') {

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

+	if ($exclude != '') {

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

 

-        if(is_array( $exclude_cats)){

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

-        }else{

-            $exclude_cats = intval($exclude_cats);

-        }

+		if(is_array( $exclude_cats)){

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

+		}else{

+			$exclude_cats = intval($exclude_cats);

+		}

 

-    }

+	}

 

-    if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

-        (!is_array($exclude_cats) || empty($exclude_cats))

-    ) {

-        ?>

+	if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

+		(!is_array($exclude_cats) || empty($exclude_cats))

+	) {

+		?>

 

         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

@@ -1086,8 +1086,8 @@ 
 

             <br/>

             <?php

-            $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

-            if (!empty($cat_terms)) { ?>

+			$cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

+			if (!empty($cat_terms)) { ?>

                 <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>

                 <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?>

             <?php } ?>

@@ -1109,53 +1109,53 @@ 
 function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories)

 {

 

-    if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

-        $post_cat_str = $post_categories[$request_taxonomy];

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

-        if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+	if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

+		$post_cat_str = $post_categories[$request_taxonomy];

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

+		if (is_array($post_cat_array)) {

+			$post_cat_array = array_unique( $post_cat_array );

 

 			foreach ($post_cat_array as $post_cat_html) {

 

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

-                $post_maincat_str = $post_cat_info[0];

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

+				$post_maincat_str = $post_cat_info[0];

 

-                if (!empty($post_maincat_str)) {

-                    $post_maincat_info = explode(",", $post_maincat_str);

-                    $post_maincat_id = $post_maincat_info[0];

-                    ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                    (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-                }

-                $post_sub_catid = '';

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

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

-                }

+				if (!empty($post_maincat_str)) {

+					$post_maincat_info = explode(",", $post_maincat_str);

+					$post_maincat_id = $post_maincat_info[0];

+					($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+					(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+				}

+				$post_sub_catid = '';

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

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

+				}

 

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

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

 

-            }

-        } else {

+			}

+		} else {

 

-            $post_cat_info = explode(":", $post_cat_str);

-            $post_maincat_str = $post_cat_info[0];

+			$post_cat_info = explode(":", $post_cat_str);

+			$post_maincat_str = $post_cat_info[0];

 

-            $post_sub_catid = '';

+			$post_sub_catid = '';

 

-            if (!empty($post_maincat_str)) {

-                $post_maincat_info = explode(",", $post_maincat_str);

-                $post_maincat_id = $post_maincat_info[0];

-                ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-            }

+			if (!empty($post_maincat_str)) {

+				$post_maincat_info = explode(",", $post_maincat_str);

+				$post_maincat_id = $post_maincat_info[0];

+				($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+				(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+			}

 

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

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

-            }

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

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

+			}

 

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

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

 

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -1169,35 +1169,35 @@ 
  */

 function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false)

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

 

-    if (!empty($cat_terms)) {

-        $onchange = '';

-        $onchange = ' onchange="show_subcatlist(this.value, this)" ';

+	if (!empty($cat_terms)) {

+		$onchange = '';

+		$onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

-        $option_selected = '';

-        if (!$selected)

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

+		$option_selected = '';

+		if (!$selected)

+			$option_slected = ' selected="selected" ';

 

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

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

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+		echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

 

-        foreach ($cat_terms as $cat_term) {

-            $option_selected = '';

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

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

+		foreach ($cat_terms as $cat_term) {

+			$option_selected = '';

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

+				$option_selected = ' selected="selected" ';

 

-            // Count child terms

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

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

+			// Count child terms

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

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

 

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

-        }

-        echo '</select>';

-    }

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

+		}

+		echo '</select>';

+	}

 }

 

 /**

@@ -1213,28 +1213,28 @@ 
  */

 function geodir_custom_update_messages($messages)

 {

-    global $post, $post_ID;

-

-    $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

-

-    foreach ($post_types as $post_type => $post_object) {

-

-        $messages[$post_type] = array(

-            0 => '', // Unused. Messages start at index 1.

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

-            2 => __('Custom field updated.', 'geodirectory'),

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

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

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

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

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

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

-            9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

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

-        );

-    }

-

-    return $messages;

+	global $post, $post_ID;

+

+	$post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

+

+	foreach ($post_types as $post_type => $post_object) {

+

+		$messages[$post_type] = array(

+			0 => '', // Unused. Messages start at index 1.

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

+			2 => __('Custom field updated.', 'geodirectory'),

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

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

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

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

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

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

+			9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

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

+		);

+	}

+

+	return $messages;

 }

 

 

@@ -1249,182 +1249,182 @@ 
 function geodir_register_defaults()

 {

 

-    global $wpdb;

-

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

-

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

-        $listing_slug = 'places';

-

-    /**

-     * Taxonomies

-     **/

-    //if ( ! taxonomy_exists('gd_place_tags') )

-    {

-

-        $gd_placetags = array();

-        $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

-        $gd_placetags['args'] = array(

-            'public' => true,

-            'hierarchical' => false,

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

-            'query_var' => true,

-

-            'labels' => array(

-                'name' => __('Place Tags', 'geodirectory'),

-                'singular_name' => __('Place Tag', 'geodirectory'),

-                'search_items' => __('Search Place Tags', 'geodirectory'),

-                'popular_items' => __('Popular Place Tags', 'geodirectory'),

-                'all_items' => __('All Place Tags', 'geodirectory'),

-                'edit_item' => __('Edit Place Tag', 'geodirectory'),

-                'update_item' => __('Update Place Tag', 'geodirectory'),

-                'add_new_item' => __('Add New Place Tag', 'geodirectory'),

-                'new_item_name' => __('New Place Tag Name', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

-                'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

-                'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_place_tags'] = $gd_placetags;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-

-    }

-

-    //if ( ! taxonomy_exists('gd_placecategory') )

-    {

-

-        $gd_placecategory = array();

-        $gd_placecategory['object_type'] = 'gd_place';

-        $gd_placecategory['listing_slug'] = $listing_slug;

-        $gd_placecategory['args'] = array(

-            'public' => true,

-            'hierarchical' => true,

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

-            'query_var' => true,

-            'labels' => array(

-                'name' => __('Place Categories', 'geodirectory'),

-                'singular_name' => __('Place Category', 'geodirectory'),

-                'search_items' => __('Search Place Categories', 'geodirectory'),

-                'popular_items' => __('Popular Place Categories', 'geodirectory'),

-                'all_items' => __('All Place Categories', 'geodirectory'),

-                'edit_item' => __('Edit Place Category', 'geodirectory'),

-                'update_item' => __('Update Place Category', 'geodirectory'),

-                'add_new_item' => __('Add New Place Category', 'geodirectory'),

-                'new_item_name' => __('New Place Category', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        flush_rewrite_rules();

-    }

-

-    /**

-     * Post Types

-     **/

-

-    //if ( ! post_type_exists('gd_place') )

-    {

-

-        $labels = array(

-            'name' => __('Places', 'geodirectory'),

-            'singular_name' => __('Place', 'geodirectory'),

-            'add_new' => __('Add New', 'geodirectory'),

-            'add_new_item' => __('Add New Place', 'geodirectory'),

-            'edit_item' => __('Edit Place', 'geodirectory'),

-            'new_item' => __('New Place', 'geodirectory'),

-            'view_item' => __('View Place', 'geodirectory'),

-            'search_items' => __('Search Places', 'geodirectory'),

-            'not_found' => __('No Place Found', 'geodirectory'),

-            'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

-

-        $place_default = array(

-            'labels' => $labels,

-            'can_export' => true,

-            'capability_type' => 'post',

-            'description' => 'Place post type.',

-            'has_archive' => $listing_slug,

-            'hierarchical' => false,

-            'map_meta_cap' => true,

-            'menu_icon' => $menu_icon,

-            'public' => true,

-            'query_var' => true,

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

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

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

-

-        //Update custom post types

-        $geodir_post_types = get_option('geodir_post_types');

-        $geodir_post_types['gd_place'] = $place_default;

-        update_option('geodir_post_types', $geodir_post_types);

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-    }

-

-

-    geodir_register_taxonomies();

-    geodir_register_post_types();

-

-    //die;

+	global $wpdb;

+

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

+

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

+		$listing_slug = 'places';

+

+	/**

+	 * Taxonomies

+	 **/

+	//if ( ! taxonomy_exists('gd_place_tags') )

+	{

+

+		$gd_placetags = array();

+		$gd_placetags['object_type'] = 'gd_place';

+		$gd_placetags['listing_slug'] = $listing_slug . '/tags';

+		$gd_placetags['args'] = array(

+			'public' => true,

+			'hierarchical' => false,

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

+			'query_var' => true,

+

+			'labels' => array(

+				'name' => __('Place Tags', 'geodirectory'),

+				'singular_name' => __('Place Tag', 'geodirectory'),

+				'search_items' => __('Search Place Tags', 'geodirectory'),

+				'popular_items' => __('Popular Place Tags', 'geodirectory'),

+				'all_items' => __('All Place Tags', 'geodirectory'),

+				'edit_item' => __('Edit Place Tag', 'geodirectory'),

+				'update_item' => __('Update Place Tag', 'geodirectory'),

+				'add_new_item' => __('Add New Place Tag', 'geodirectory'),

+				'new_item_name' => __('New Place Tag Name', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

+				'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

+				'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_place_tags'] = $gd_placetags;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+

+	}

+

+	//if ( ! taxonomy_exists('gd_placecategory') )

+	{

+

+		$gd_placecategory = array();

+		$gd_placecategory['object_type'] = 'gd_place';

+		$gd_placecategory['listing_slug'] = $listing_slug;

+		$gd_placecategory['args'] = array(

+			'public' => true,

+			'hierarchical' => true,

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

+			'query_var' => true,

+			'labels' => array(

+				'name' => __('Place Categories', 'geodirectory'),

+				'singular_name' => __('Place Category', 'geodirectory'),

+				'search_items' => __('Search Place Categories', 'geodirectory'),

+				'popular_items' => __('Popular Place Categories', 'geodirectory'),

+				'all_items' => __('All Place Categories', 'geodirectory'),

+				'edit_item' => __('Edit Place Category', 'geodirectory'),

+				'update_item' => __('Update Place Category', 'geodirectory'),

+				'add_new_item' => __('Add New Place Category', 'geodirectory'),

+				'new_item_name' => __('New Place Category', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		flush_rewrite_rules();

+	}

+

+	/**

+	 * Post Types

+	 **/

+

+	//if ( ! post_type_exists('gd_place') )

+	{

+

+		$labels = array(

+			'name' => __('Places', 'geodirectory'),

+			'singular_name' => __('Place', 'geodirectory'),

+			'add_new' => __('Add New', 'geodirectory'),

+			'add_new_item' => __('Add New Place', 'geodirectory'),

+			'edit_item' => __('Edit Place', 'geodirectory'),

+			'new_item' => __('New Place', 'geodirectory'),

+			'view_item' => __('View Place', 'geodirectory'),

+			'search_items' => __('Search Places', 'geodirectory'),

+			'not_found' => __('No Place Found', 'geodirectory'),

+			'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

+

+		$place_default = array(

+			'labels' => $labels,

+			'can_export' => true,

+			'capability_type' => 'post',

+			'description' => 'Place post type.',

+			'has_archive' => $listing_slug,

+			'hierarchical' => false,

+			'map_meta_cap' => true,

+			'menu_icon' => $menu_icon,

+			'public' => true,

+			'query_var' => true,

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

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

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

+

+		//Update custom post types

+		$geodir_post_types = get_option('geodir_post_types');

+		$geodir_post_types['gd_place'] = $place_default;

+		update_option('geodir_post_types', $geodir_post_types);

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+	}

+

+

+	geodir_register_taxonomies();

+	geodir_register_post_types();

+

+	//die;

 

 }

 

 $gd_wpml_get_languages = "";

 function gd_wpml_get_lang_from_url($url) {

-    global $sitepress, $gd_wpml_get_languages;

+	global $sitepress, $gd_wpml_get_languages;

     

-    if (geodir_is_wpml()) {

-        return $sitepress->get_language_from_url($url);

-    }

+	if (geodir_is_wpml()) {

+		return $sitepress->get_language_from_url($url);

+	}

     

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

-        return $_REQUEST['lang'];

-    }

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

+		return $_REQUEST['lang'];

+	}

 

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

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

 

-    // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

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

+	// site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

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

 

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

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

 

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

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

 

-    if ($gd_wpml_get_languages) {

-        $langs = $gd_wpml_get_languages;

-    } else {

-        $gd_wpml_get_languages = $sitepress->get_active_languages();

-    }

+	if ($gd_wpml_get_languages) {

+		$langs = $gd_wpml_get_languages;

+	} else {

+		$gd_wpml_get_languages = $sitepress->get_active_languages();

+	}

 

-    if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

-        return $segments[0];

-    }

+	if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

+		return $segments[0];

+	}

 

-    return false;

+	return false;

 }

 

 function gd_wpml_slug_translation_turned_on($post_type) {

 

-    global $sitepress;

-    $settings = $sitepress->get_settings();

-    return isset($settings['posts_slug_translation']['types'][$post_type])

-    && $settings['posts_slug_translation']['types'][$post_type]

-    && isset($settings['posts_slug_translation']['on'])

-    && $settings['posts_slug_translation']['on'];

+	global $sitepress;

+	$settings = $sitepress->get_settings();

+	return isset($settings['posts_slug_translation']['types'][$post_type])

+	&& $settings['posts_slug_translation']['types'][$post_type]

+	&& isset($settings['posts_slug_translation']['on'])

+	&& $settings['posts_slug_translation']['on'];

 }

 

 

@@ -1451,162 +1451,162 @@ 
  */

 function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample)

 {

-    //echo $post_link."<br />".$sample ;

+	//echo $post_link."<br />".$sample ;

 

 

-    global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

-    if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-        if($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending'){return $post_link;}

-    } elseif (isset($post_obj->post_status) && ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending')) {

-        return $post_link;

-    } else {

-        $orig_post = $post;

-        $post = $post_obj;

-    }

+	global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

+	if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

+		if($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending'){return $post_link;}

+	} elseif (isset($post_obj->post_status) && ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending')) {

+		return $post_link;

+	} else {

+		$orig_post = $post;

+		$post = $post_obj;

+	}

 

 

 

-    if (in_array($post->post_type, geodir_get_posttypes())) {//print_r($post );exit;

+	if (in_array($post->post_type, geodir_get_posttypes())) {//print_r($post );exit;

 

 

-        // if we dont have a GD post then try to grab it

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

-            $gd_post = geodir_get_post_info($post->ID);

-            if(!empty($gd_post)){

-                $post = $gd_post;

-            }

-        }

+		// if we dont have a GD post then try to grab it

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

+			$gd_post = geodir_get_post_info($post->ID);

+			if(!empty($gd_post)){

+				$post = $gd_post;

+			}

+		}

 

 

-        $post_types = get_option('geodir_post_types');

-        $slug = $post_types[$post->post_type]['rewrite']['slug'];

+		$post_types = get_option('geodir_post_types');

+		$slug = $post_types[$post->post_type]['rewrite']['slug'];

 

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

-        if(geodir_wpml_is_post_type_translated($post->post_type)){

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

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

+		if(geodir_wpml_is_post_type_translated($post->post_type)){

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

 

-                $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

-                    $slug,

-                    'WordPress',

-                    'URL slug: ' . $slug,

-                    $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters( 'wpml_translate_single_string',

+					$slug,

+					'WordPress',

+					'URL slug: ' . $slug,

+					$language_code);

 

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

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

 

-            }

-        }

+			}

+		}

 

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

         

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

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

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

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

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-

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

-        if ($fix_url) {

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

-        }

-

-        $post_link = trailingslashit(

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

-        );

-

-        if ($fix_url) {

-            $post_link = $site_url . $post_link;

-        }

-

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

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

-        }

-        if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

-            $post_id = $post->ID;

-            if (isset($orig_post)) {

-                $post = $orig_post;

-            }

-            return $gd_permalink_cache[$post_id];

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

 

-        if (!isset($post->post_locations)) {

-            $post_type = $post->post_type;

-            $ID = $post->ID;

-            $post2 = $wpdb->get_row(

-                $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                    array($post->ID)

-                )

-            );

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

+		if ($fix_url) {

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

+		}

 

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

+		$post_link = trailingslashit(

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

+		);

 

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

-        }

+		if ($fix_url) {

+			$post_link = $site_url . $post_link;

+		}

 

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

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

+		}

+		if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

+			$post_id = $post->ID;

+			if (isset($orig_post)) {

+				$post = $orig_post;

+			}

+			return $gd_permalink_cache[$post_id];

+		}

 

+		if (!isset($post->post_locations)) {

+			$post_type = $post->post_type;

+			$ID = $post->ID;

+			$post2 = $wpdb->get_row(

+				$wpdb->prepare(

+					"SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+					array($post->ID)

+				)

+			);

 

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

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

 

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

-                $location_request = '';

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

+		}

 

 

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

-                    $geodir_arr_locations = explode(',', $post->post_locations);

-                    if (count($geodir_arr_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

-                        $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

 

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

-                            'region_slug' => $post->region_slug,

-                            'city_slug' => $post->city_slug

-                        );

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

 

-                    } else

-                        $post_location = geodir_get_location();

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

+				$location_request = '';

 

 

-                } else {

+				if (!empty($post->post_locations)) {

+					$geodir_arr_locations = explode(',', $post->post_locations);

+					if (count($geodir_arr_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

+						$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

 

-                    $post_location_sql = $wpdb->get_results(

-                        $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                            array($post->ID)

-                        )

-                    );

-

-                    if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

-

-                        $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

-                        if (count($geodir_arr_locations) == 3) {

-                            $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

-                            $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

-

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

-                                'region_slug' => $post->region_slug,

-                                'city_slug' => $post->city_slug

-                            );

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

+							'region_slug' => $post->region_slug,

+							'city_slug' => $post->city_slug

+						);

 

-                        }

-                    } else

-                        $post_location = geodir_get_location();

-                }

+					} else

+						$post_location = geodir_get_location();

+

+

+				} else {

+

+					$post_location_sql = $wpdb->get_results(

+						$wpdb->prepare(

+							"SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+							array($post->ID)

+						)

+					);

+

+					if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

+

+						$geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

+						if (count($geodir_arr_locations) == 3) {

+							$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

+							$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

+

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

+								'region_slug' => $post->region_slug,

+								'city_slug' => $post->city_slug

+							);

+

+						}

+					} else

+						$post_location = geodir_get_location();

+				}

 

 

-                if (!empty($post_location)) {

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

+				if (!empty($post_location)) {

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

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

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

 					

@@ -1624,88 +1624,88 @@ 
 					$location_slug[] = $city_slug;

 					

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

-                }

-            }

+				}

+			}

 

-            if (get_option('geodir_add_categories_url')) {

+			if (get_option('geodir_add_categories_url')) {

 

-                $term_request = '';

-                $taxonomies = geodir_get_taxonomies($post->post_type);

-                $taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : '';

+				$term_request = '';

+				$taxonomies = geodir_get_taxonomies($post->post_type);

+				$taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : '';

 

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

-                    $post_terms = $post->default_category;

-                } else {

-                    $post_terms = '';

-

-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

-                        $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

-                        $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

-                        $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

-                    }elseif (isset($post->{$taxonomies})) {

-                        $post_terms = explode(",", trim($post->{$taxonomies}, ","));

-                        $post_terms = $post_terms[0];

-                    }

+				if (!empty($post->default_category)) {

+					$post_terms = $post->default_category;

+				} else {

+					$post_terms = '';

+

+					if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

+						$post_terms = absint($_POST['post_default_category']);

+					}elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

+						$post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

+						$post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

+					}elseif (isset($post->{$taxonomies})) {

+						$post_terms = explode(",", trim($post->{$taxonomies}, ","));

+						$post_terms = $post_terms[0];

+					}

 

-                    if (!$post_terms)

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

+					if (!$post_terms)

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

 

-                    if (!$post_terms) {

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

+					if (!$post_terms) {

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

 

-                        if ($post_terms) {

-                            $post_terms = explode(",", trim($post_terms, ","));

-                            $post_terms = $post_terms[0];

-                        }

-                    }

-                }

+						if ($post_terms) {

+							$post_terms = explode(",", trim($post_terms, ","));

+							$post_terms = $post_terms[0];

+						}

+					}

+				}

 

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

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

 

-                if (!empty($term))

-                    $term_request = $term->slug;

-                //$term_request = $term->slug.'/';

-            }

+				if (!empty($term))

+					$term_request = $term->slug;

+				//$term_request = $term->slug.'/';

+			}

 

-            $request_term = '';

-            $listingurl_separator = '';

-            //$detailurl_separator = get_option('geodir_detailurl_separator');

-            $detailurl_separator = '';

-            if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

-                $request_term = $location_request;

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

-                //$request_term .= $listingurl_separator.'/'.$term_request;

-                $request_term .= $term_request;

+			$request_term = '';

+			$listingurl_separator = '';

+			//$detailurl_separator = get_option('geodir_detailurl_separator');

+			$detailurl_separator = '';

+			if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

+				$request_term = $location_request;

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

+				//$request_term .= $listingurl_separator.'/'.$term_request;

+				$request_term .= $term_request;

 

-            } else {

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

+			} else {

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

 

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

-            }

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

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

+			}

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

             

-            // Fix with WPML the location terms added twice when CPT slug is translated.

-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

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

-            }

+			// Fix with WPML the location terms added twice when CPT slug is translated.

+			if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

+				$post_link = str_replace('%gd_taxonomy%/', '', $post_link);

+			}

             

-            if (!empty($request_term))

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

-            else

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

-            //echo $post_link ;

-        }

-        // temp cache the permalink

-        if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

-            $gd_permalink_cache[$post->ID] = $post_link;

-        }

-    }

-    if (isset($orig_post)) {

-        $post = $orig_post;

-    }

-

-    return $post_link;

+			if (!empty($request_term))

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

+			else

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

+			//echo $post_link ;

+		}

+		// temp cache the permalink

+		if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

+			$gd_permalink_cache[$post->ID] = $post_link;

+		}

+	}

+	if (isset($orig_post)) {

+		$post = $orig_post;

+	}

+

+	return $post_link;

 }

 

 /**

@@ -1721,117 +1721,117 @@ 
  * @return string The term link.

  */

 function geodir_term_link($termlink, $term, $taxonomy) {

-    $geodir_taxonomies = geodir_get_taxonomies('', true);

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

-    if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

-        global $geodir_add_location_url, $gd_session;

-        $include_location = false;

-        $request_term = array();

-        $add_location_url = get_option('geodir_add_location_url');

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

+	if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

+		global $geodir_add_location_url, $gd_session;

+		$include_location = false;

+		$request_term = array();

+		$add_location_url = get_option('geodir_add_location_url');

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

 

-        $listing_slug = geodir_get_listing_slug($taxonomy);

+		$listing_slug = geodir_get_listing_slug($taxonomy);

 

-        if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

-            if ($geodir_add_location_url && $add_location_url) {

-                $include_location = true;

-            }

-        } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

-            $include_location = true;

-        } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

-            $include_location = true;

-        }

-

-        if ($include_location) {

-            global $post;

-            $location_terms = array();

+		if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

+			if ($geodir_add_location_url && $add_location_url) {

+				$include_location = true;

+			}

+		} elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

+			$include_location = true;

+		} elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

+			$include_location = true;

+		}

+

+		if ($include_location) {

+			global $post;

+			$location_terms = array();

             

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

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

             

-            if (geodir_is_page('detail')) {

-                if (!isset($post->country_slug) && !empty($post->post_locations)) {

-                    $post_locations = explode(',', $post->post_locations);

-

-                    if (count($post_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $post_locations[0]);

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

-                        $post->region_slug = str_replace('[', '', $post_locations[1]);

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

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

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

-                    }

-                }

+			if (geodir_is_page('detail')) {

+				if (!isset($post->country_slug) && !empty($post->post_locations)) {

+					$post_locations = explode(',', $post->post_locations);

+

+					if (count($post_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $post_locations[0]);

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

+						$post->region_slug = str_replace('[', '', $post_locations[1]);

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

+						$post->country_slug = str_replace('[', '', $post_locations[2]);

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

+					}

+				}

 

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

-                    $location_terms = array(

-                        'gd_country' => $post->country_slug,

-                        'gd_region' => $post->region_slug,

-                        'gd_city' => $post->city_slug

-                    );

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

+					$location_terms = array(

+						'gd_country' => $post->country_slug,

+						'gd_region' => $post->region_slug,

+						'gd_city' => $post->city_slug

+					);

 

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

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

-                    }

-                }

-            }

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

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

+					}

+				}

+			}

             

-            if (empty($location_terms)) {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+			if (empty($location_terms)) {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 

-            $geodir_show_location_url = get_option('geodir_show_location_url');

-            $location_terms = geodir_remove_location_terms($location_terms);

+			$geodir_show_location_url = get_option('geodir_show_location_url');

+			$location_terms = geodir_remove_location_terms($location_terms);

 

-            if (!empty($location_terms)) {

-                $url_separator = '';

+			if (!empty($location_terms)) {

+				$url_separator = '';

 

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

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

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

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

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

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

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

+					$new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

 

-                    $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

-                } else {

-                    $termlink = geodir_getlink($termlink, $request_term);

-                }

-            }

-        }

+					$termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

+				} else {

+					$termlink = geodir_getlink($termlink, $request_term);

+				}

+			}

+		}

 

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

-        /* we can replace this with the below function

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

+		/* we can replace this with the below function

         if(geodir_is_wpml()){

             global $sitepress;

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

             $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type);

         }*/

 

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

-        if (geodir_is_wpml()) {

-            $post_types = get_option('geodir_post_types');

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

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

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

-            if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {

-                global $sitepress;

-                $default_lang = $sitepress->get_default_language();

-                $language_code = gd_wpml_get_lang_from_url($termlink);

-                if (!$language_code ) {

-                    $language_code  = $default_lang;

-                }

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

+		if (geodir_is_wpml()) {

+			$post_types = get_option('geodir_post_types');

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

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

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

+			if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {

+				global $sitepress;

+				$default_lang = $sitepress->get_default_language();

+				$language_code = gd_wpml_get_lang_from_url($termlink);

+				if (!$language_code ) {

+					$language_code  = $default_lang;

+				}

 

-                $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

 

-                if (!$slug) {

-                    $slug = $org_slug;

-                }

+				if (!$slug) {

+					$slug = $org_slug;

+				}

 

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

-            }

-        }

-    }

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

+			}

+		}

+	}

     

-    return $termlink;

+	return $termlink;

 }

 

 /**

@@ -1857,14 +1857,14 @@ 
 	if (in_array($post_type, geodir_get_posttypes())) {

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

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

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 			

 			$location_terms = geodir_remove_location_terms($location_terms);

 			

@@ -1896,17 +1896,17 @@ 
  * @return void|string Label.

  */

 function get_post_type_singular_label($post_type, $echo = false, $translate = false) {

-    $obj_post_type = get_post_type_object($post_type);

-    if (!is_object($obj_post_type)) {

-        return;

-    }

+	$obj_post_type = get_post_type_object($post_type);

+	if (!is_object($obj_post_type)) {

+		return;

+	}

     

-    $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

+	$label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1921,19 +1921,19 @@ 
  * @return void|string Label.

  */

 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

+		return false;

 

-    $obj_post_type = get_post_type_object($post_type);

+	$obj_post_type = get_post_type_object($post_type);

     

-    $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

+	$label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1951,51 +1951,51 @@ 
  */

 function geodir_term_exists($term, $taxonomy = '', $parent = 0)

 {

-    global $wpdb;

-

-    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

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

-

-    if (is_int($term)) {

-        if (0 == $term)

-            return 0;

-        $where = 't.term_id = %d';

-        if (!empty($taxonomy))

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

-        else

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

-    }

+	global $wpdb;

+

+	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

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

+

+	if (is_int($term)) {

+		if (0 == $term)

+			return 0;

+		$where = 't.term_id = %d';

+		if (!empty($taxonomy))

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

+		else

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

+	}

 

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

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

 

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

-        return 0;

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

+		return 0;

 

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

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

 

-    $where_fields = array($slug);

-    if (!empty($taxonomy)) {

-        $parent = (int)$parent;

-        if ($parent > 0) {

-            $where_fields[] = $parent;

-            $else_where_fields[] = $parent;

-            $where .= ' AND tt.parent = %d';

+	$where_fields = array($slug);

+	if (!empty($taxonomy)) {

+		$parent = (int)$parent;

+		if ($parent > 0) {

+			$where_fields[] = $parent;

+			$else_where_fields[] = $parent;

+			$where .= ' AND tt.parent = %d';

 

-        }

+		}

 

-        $where_fields[] = $taxonomy;

+		$where_fields[] = $taxonomy;

 

 

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

-            return $result;

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

+			return $result;

 

-        return false;

-    }

+		return false;

+	}

 

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

-        return $result;

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

+		return $result;

 

-    return false;

+	return false;

 }

 

 /**

@@ -2007,7 +2007,7 @@ 
 function geodir_get_term_icon_rebuild()

 {

 

-    update_option('gd_term_icons', '');

+	update_option('gd_term_icons', '');

 

 }

 

@@ -2025,61 +2025,61 @@ 
  */

 function geodir_get_term_icon($term_id = false, $rebuild = false)

 {

-    global $wpdb;

-    if (!$rebuild) {

-        $terms_icons = get_option('gd_term_icons');

-    } else {

-        $terms_icons = array();

-    }

-

-    if (empty($terms_icons)) {

-        $terms_icons = array();

-        $default_icon_url = get_option('geodir_default_marker_icon');

-        $taxonomy = geodir_get_taxonomies();

-        $post_types = geodir_get_posttypes();

-        $tax_arr = array();

-        foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

-        }

-        $tax_c = implode(',', $tax_arr);

-        $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

-        //$terms = get_terms( $taxonomy );

-

-        if($terms) {

-            foreach ($terms as $term) {

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

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

+	global $wpdb;

+	if (!$rebuild) {

+		$terms_icons = get_option('gd_term_icons');

+	} else {

+		$terms_icons = array();

+	}

 

-            }

-        }

+	if (empty($terms_icons)) {

+		$terms_icons = array();

+		$default_icon_url = get_option('geodir_default_marker_icon');

+		$taxonomy = geodir_get_taxonomies();

+		$post_types = geodir_get_posttypes();

+		$tax_arr = array();

+		foreach ($post_types as $post_type) {

+			$tax_arr[] = "'" . $post_type . "category'";

+		}

+		$tax_c = implode(',', $tax_arr);

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

+		//$terms = get_terms( $taxonomy );

 

-        if($a_terms) {

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

+		if($terms) {

+			foreach ($terms as $term) {

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

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

 

-                foreach ($t2 as $term) {

-                    $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

-                    if ($term_icon) {

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

-                    } else {

-                        $term_icon_url = $default_icon_url;

-                    }

-                    $terms_icons[$term->term_id] = $term_icon_url;

-                }

-            }

-        }

+			}

+		}

+

+		if($a_terms) {

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

 

-        update_option('gd_term_icons', $terms_icons);

-    }

+				foreach ($t2 as $term) {

+					$term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

+					if ($term_icon) {

+						$term_icon_url = $term_icon["src"];

+					} else {

+						$term_icon_url = $default_icon_url;

+					}

+					$terms_icons[$term->term_id] = $term_icon_url;

+				}

+			}

+		}

 

-    if ($term_id && isset($terms_icons[$term_id])) {

-        return $terms_icons[$term_id];

-    } elseif ($term_id && !isset($terms_icons[$term_id])) {

-        return get_option('geodir_default_marker_icon');

-    }

+		update_option('gd_term_icons', $terms_icons);

+	}

+

+	if ($term_id && isset($terms_icons[$term_id])) {

+		return $terms_icons[$term_id];

+	} elseif ($term_id && !isset($terms_icons[$term_id])) {

+		return get_option('geodir_default_marker_icon');

+	}

 

-    if (is_ssl()) {

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

-    }

+	if (is_ssl()) {

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

+	}

 

-    return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

+	return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

 }
\ No newline at end of file

Spacing +130 added lines, -130 removed lines

@@ -60,16 +60,16 @@ 
                              * @since 1.0.0

                              * @param string $menu_class The menu HTML class.

                              */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                             /**

                              * Filter the menu a class.

                              *

                              * @since 1.0.0

                              */

                             $a_class = apply_filters('geodir_menu_a_class', '');

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

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

-										' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

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

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

+										' . __(geodir_utf8_ucfirst($args->labels->name), 'geodirectory').'

 									</a>

 								</li>';

                         }

@@ -88,14 +88,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -114,9 +114,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

-					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

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

+					<a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

             $post_types = geodir_get_posttypes('object');

 

             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

@@ -133,9 +133,9 @@ 
                                 if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

                                     $menu_class = 'current-menu-item';

 

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

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

-															' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

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

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

+															' . __(geodir_utf8_ucfirst($args->labels->name), 'geodirectory').'

 														</a>

 													</li>';

                             }

@@ -151,7 +151,7 @@ 
              *

              * @since 1.5.9

              */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

         }

     }

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

                                      * @param string $menu_class The menu HTML class.

                                      */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                     /**

                                      * Filter the menu a class.

                                      *

@@ -192,9 +192,9 @@ 
                                      */

                                     $a_class = apply_filters('geodir_menu_a_class', '');

                                     $cpt_name = __($args->labels->singular_name, 'geodirectory');

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

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

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

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

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

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

 											</a>

 										</li>';

                                 }

@@ -218,14 +218,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -244,9 +244,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

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

-					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

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

+					<a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

 

             $post_types = geodir_get_posttypes('object');

 

@@ -269,11 +269,11 @@ 
                                          * @since 1.0.0

                                          * @param string $menu_class The menu HTML class.

                                          */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                         $cpt_name = __($args->labels->singular_name, 'geodirectory');

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

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

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

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

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

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

 														</a>

 													</li>';

                                     }

@@ -285,7 +285,7 @@ 
             }

 

             $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

 

         }

@@ -313,14 +313,14 @@ 
     $geodir_theme_location = get_option('geodir_theme_location_nav');

     $geodir_theme_location_nav = array();

     if (empty($locations) && empty($geodir_theme_location)) {

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

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

         $geodir_theme_location_nav[] = $args['theme_location'];

         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

     }

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

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

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

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

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

 

     return $menu;

 

@@ -348,7 +348,7 @@ 
 

     if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

+        $items = $items.geodir_add_nav_menu_items();

         return $items;

 

     } else {

@@ -373,12 +373,12 @@ 
 

     $taxonomies = geodir_get_taxonomies();

     $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

+    $taxonomies = "'".$taxonomies."'";

 

     $pn_categories = $wpdb->get_results(

         $wpdb->prepare(

             "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

+            array($wpdb->terms.term_id)

         )

     );

 

@@ -408,7 +408,7 @@ 
 

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

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

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

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

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

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

     }

@@ -434,7 +434,7 @@ 
     if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

         $geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+    if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {

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

     }

 

@@ -444,7 +444,7 @@ 
      *

      * @since 1.6.9

      */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+    return apply_filters('geodir_get_current_posttype', $geodir_post_type);

 }

 

 /**

@@ -458,18 +458,18 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+    $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));

 

     $stype = false;

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

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

         global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

+        $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+        if ($has_posts) {

             $stype = $post_type; break;

         }

     }

 

-    if(!$stype){

+    if (!$stype) {

         $stype = 'gd_place';

     }

 

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

             case 'object':

             case 'Object':

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

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

                 break;

             case 'array':

             case 'Array':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

                 break;

 			case 'options':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -569,7 +569,7 @@ 
                     $gd_taxonomies[] = $taxonomy;

                 }

 

-                if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {

+                if ($tages_taxonomies === false && substr($taxonomy, -5) == '_tags') {

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

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

                     }

@@ -615,15 +615,15 @@ 
 

         $categories = get_terms($taxonomies);

 

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+        $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';

 

         foreach ($categories as $category_obj) {

             $select_opt = '';

             if ($selected == $category_obj->term_id) {

                 $select_opt = 'selected="selected"';

             }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . geodir_utf8_ucfirst($category_obj->name) . '</option>';

+            $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">'

+                . geodir_utf8_ucfirst($category_obj->name).'</option>';

         }

 

         if ($echo)

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

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

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

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

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

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

     }

 

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

             if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

                 if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display;

                     $main_list_class = 'class="main_list_selecter"';

                 } else {

                     //$display = 'display:none';

@@ -755,7 +755,7 @@ 
 

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

                 $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+                $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">';

             }

 

             foreach ($cat_terms as $cat_term) {

@@ -770,12 +770,12 @@ 
                 }

 

                 if ($cat_display == 'radio')

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

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

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

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

+                    $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</option>';

 

                 else {

-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</span>';

                 }

 

                 // Call recurson to print sub cats

@@ -814,7 +814,7 @@ 
             $cat_exclude = serialize($exclude_cats);

 

         if (isset($_REQUEST['backandedit'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

 

             if (!is_array($post->post_category[$cat_taxonomy]))

                 $post_category = $post->post_category[$cat_taxonomy];

@@ -846,7 +846,7 @@ 
 

             if (!empty($post_category)) {

                 $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+                $post_category = ','.implode(',', $cat1).',';

 

             }

 

@@ -857,7 +857,7 @@ 
                 foreach ($post_category_upd as $cat) {

 

                     if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

+                        $post_category_change .= ','.$cat;

                     }

                 }

                 $post_category = $post_category_change;

@@ -869,11 +869,11 @@ 
             }

         }

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']"  />';

 

 

         ?>

@@ -892,14 +892,14 @@ 
 

             function show_subcatlist(main_cat, catObj) {

                 if (main_cat != '') {

-					var url = '<?php echo geodir_get_ajax_url();?>';

-                    var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

-                    var cat_exclude = '<?php echo base64_encode($cat_exclude);?>';

+					var url = '<?php echo geodir_get_ajax_url(); ?>';

+                    var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

+                    var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>';

                     var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();

-					<?php if ((int)$cat_limit > 0) { ?>

+					<?php if ((int) $cat_limit > 0) { ?>

 					var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);

 					if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {

-						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");

+						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");

 						return false;

 					}

 					<?php } ?>

@@ -938,7 +938,7 @@ 
             }

 

             function update_listing_cat(el) {

-                var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

+                var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

                 var cat_ids = '';

                 var main_cat = '';

                 var sub_cat = '';

@@ -1019,7 +1019,7 @@ 
         <div class="main_cat_list" style=" <?php if (isset($style)) {

             echo $style;

         }?> ">

-            <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

+            <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list

             ?>

         </div>

     <?php

@@ -1046,9 +1046,9 @@ 
     if ($exclude != '') {

         $exclude_cats = maybe_unserialize(base64_decode($exclude));

 

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        if (is_array($exclude_cats)) {

+            $exclude_cats = array_map('intval', $exclude_cats);

+        } else {

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1062,25 +1062,25 @@ 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

         <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;">

-            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>"

+            <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>"

                  onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>

             <?php /* ?>

 		<img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" /> 

 		<?php */ ?>

 

-            <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat"

+            <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat"

                    onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"

                    checked="checked" disabled="disabled"/>

        <span> 

-        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             <br/>

 

             <div class="post_default_category">

-                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"

+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />

         <span> 

-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             </div>

 

@@ -1113,7 +1113,7 @@ 
         $post_cat_str = $post_categories[$request_taxonomy];

         $post_cat_array = explode("#", $post_cat_str);

         if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+            $post_cat_array = array_unique($post_cat_array);

 

 			foreach ($post_cat_array as $post_cat_html) {

 

@@ -1128,7 +1128,7 @@ 
                 }

                 $post_sub_catid = '';

                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

+                    $post_sub_catid = (int) $post_cat_info[1];

                 }

 

                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1149,7 +1149,7 @@ 
             }

 

             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

+                $post_sub_catid = (int) $post_cat_info[1];

             }

 

             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1181,9 +1181,9 @@ 
         if (!$selected)

             $option_slected = ' selected="selected" ';

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+        echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';

 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

@@ -1191,10 +1191,10 @@ 
                 $option_selected = ' selected="selected" ';

 

             // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));

+            $has_child = !empty($child_terms) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';

+            echo '<option  '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.geodir_utf8_ucfirst($cat_term->name).'</option>';

         }

         echo '</select>';

     }

@@ -1225,7 +1225,7 @@ 
             2 => __('Custom field updated.', 'geodirectory'),

             3 => __('Custom field deleted.', 'geodirectory'),

             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,

             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1251,7 +1251,7 @@ 
 

     global $wpdb;

 

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+    $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico';

 

     if (!$listing_slug = get_option('geodir_listing_prefix'))

         $listing_slug = 'places';

@@ -1264,11 +1264,11 @@ 
 

         $gd_placetags = array();

         $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';

         $gd_placetags['args'] = array(

             'public' => true,

             'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+            'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),

             'query_var' => true,

 

             'labels' => array(

@@ -1362,7 +1362,7 @@ 
             'menu_icon' => $menu_icon,

             'public' => true,

             'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

 

@@ -1395,12 +1395,12 @@ 
         return $_REQUEST['lang'];

     }

 

-    $url = str_replace(array("http://","https://"),"",$url);

+    $url = str_replace(array("http://", "https://"), "", $url);

 

     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+    $site_url = str_replace(array("http://", "https://"), "", site_url());

 

-    $url = str_replace($site_url,"",$url);

+    $url = str_replace($site_url, "", $url);

 

     $segments = explode('/', trim($url, '/'));

 

@@ -1456,7 +1456,7 @@ 
 

     global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

     if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-        if($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending'){return $post_link;}

+        if ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending') {return $post_link; }

     } elseif (isset($post_obj->post_status) && ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending')) {

         return $post_link;

     } else {

@@ -1470,9 +1470,9 @@ 
 

 

         // if we dont have a GD post then try to grab it

-        if(!isset($post->default_category)){

+        if (!isset($post->default_category)) {

             $gd_post = geodir_get_post_info($post->ID);

-            if(!empty($gd_post)){

+            if (!empty($gd_post)) {

                 $post = $gd_post;

             }

         }

@@ -1482,17 +1482,17 @@ 
         $slug = $post_types[$post->post_type]['rewrite']['slug'];

 

         // Alter the CPT slug if WPML is set to do so

-        if(geodir_wpml_is_post_type_translated($post->post_type)){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+        if (geodir_wpml_is_post_type_translated($post->post_type)) {

+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

             }

         }

@@ -1514,11 +1514,11 @@ 
         }

 

         $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+            preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)

         );

 

         if ($fix_url) {

-            $post_link = $site_url . $post_link;

+            $post_link = $site_url.$post_link;

         }

 

         if (isset($comment_post_cache[$post->ID])) {

@@ -1537,12 +1537,12 @@ 
             $ID = $post->ID;

             $post2 = $wpdb->get_row(

                 $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                     array($post->ID)

                 )

             );

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+            $post = (object) array_merge((array) $post, (array) $post2);

 

             $comment_post_cache[$post->ID] = $post;

         }

@@ -1551,7 +1551,7 @@ 
 

         if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {

                 $location_request = '';

 

 

@@ -1565,7 +1565,7 @@ 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                         $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

+                        $post_location = (object) array('country_slug' => $post->country_slug,

                             'region_slug' => $post->region_slug,

                             'city_slug' => $post->city_slug

                         );

@@ -1578,7 +1578,7 @@ 
 

                     $post_location_sql = $wpdb->get_results(

                         $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                             array($post->ID)

                         )

                     );

@@ -1594,7 +1594,7 @@ 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                             $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                            $post_location = (object)array('country_slug' => $post->country_slug,

+                            $post_location = (object) array('country_slug' => $post->country_slug,

                                 'region_slug' => $post->region_slug,

                                 'city_slug' => $post->city_slug

                             );

@@ -1623,7 +1623,7 @@ 
 					}

 					$location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+					$location_request .= implode('/', $location_slug).'/';

                 }

             }

 

@@ -1638,9 +1638,9 @@ 
                 } else {

                     $post_terms = '';

 

-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

+                    if (isset($_POST['post_default_category']) && $_POST['post_default_category']) {

                         $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

+                    }elseif (isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

                         $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

                         $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

                     }elseif (isset($post->{$taxonomies})) {

@@ -1686,14 +1686,14 @@ 
             $request_term = trim($request_term, '/');

             

             // Fix with WPML the location terms added twice when CPT slug is translated.

-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

+            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/'.$request_term.$detailurl_separator) !== false) {

                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

             }

             

             if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1786,9 +1786,9 @@ 
                 $url_separator = '';

 

                 if (get_option('permalink_structure') != '') {

-                    $old_listing_slug = '/' . $listing_slug . '/';

+                    $old_listing_slug = '/'.$listing_slug.'/';

                     $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';

 

                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

                 } else {

@@ -1808,25 +1808,25 @@ 
         // Alter the CPT slug if WPML is set to do so

         if (geodir_is_wpml()) {

             $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-            $post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("category", "", $taxonomy);

+            $post_type = str_replace("_tags", "", $post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

             if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {

                 global $sitepress;

                 $default_lang = $sitepress->get_default_language();

                 $language_code = gd_wpml_get_lang_from_url($termlink);

-                if (!$language_code ) {

-                    $language_code  = $default_lang;

+                if (!$language_code) {

+                    $language_code = $default_lang;

                 }

 

                 $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: '.$slug, $language_code);

 

                 if (!$slug) {

                     $slug = $org_slug;

                 }

 

-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

+                $termlink = trailingslashit(preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1));

             }

         }

     }

@@ -1856,7 +1856,7 @@ 
 	

 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

+			if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1873,7 +1873,7 @@ 
 					$location_terms = implode("/", $location_terms);

 					$location_terms = rtrim($location_terms, '/');

 					

-					$link .= urldecode($location_terms) . '/';

+					$link .= urldecode($location_terms).'/';

 				} else {

 					$link = geodir_getlink($link, $location_terms);

 				}

@@ -1961,9 +1961,9 @@ 
             return 0;

         $where = 't.term_id = %d';

         if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+            return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

         else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+            return $wpdb->get_var($wpdb->prepare($select.$where, $term));

     }

 

     $term = trim(wp_unslash($term));

@@ -1975,7 +1975,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -2039,13 +2039,13 @@ 
         $post_types = geodir_get_posttypes();

         $tax_arr = array();

         foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

+            $tax_arr[] = "'".$post_type."category'";

         }

         $tax_c = implode(',', $tax_arr);

         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

         //$terms = get_terms( $taxonomy );

 

-        if($terms) {

+        if ($terms) {

             foreach ($terms as $term) {

                 $post_type = str_replace("category", "", $term->taxonomy);

                 $a_terms[$post_type][] = $term;

@@ -2053,7 +2053,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

             foreach ($a_terms as $pt => $t2) {

 

                 foreach ($t2 as $term) {

@@ -2078,7 +2078,7 @@ 
     }

 

     if (is_ssl()) {

-        $terms_icons = str_replace("http:","https:",$terms_icons );

+        $terms_icons = str_replace("http:", "https:", $terms_icons);

     }

 

     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

geodirectory-functions/map-functions/get_markers.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
  *

  * @param string $map_json The map marker json.

  * @since 1.6.22

- * @return mixed

+ * @return string

  */

 function geodir_save_map_cache($map_json){

 

Braces +10 added lines, -8 removed lines

@@ -247,11 +247,13 @@ 
         }

     }

 

-    if (!empty($field_default_cat))

-        $field_default_cat = '';

+    if (!empty($field_default_cat)) {
+            $field_default_cat = '';
+    }
 

-    if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+    if (!empty($cat_find_array)) {
+            $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
+    }
 

     $main_query_array = $map_cat_ids_array;

   

@@ -283,8 +285,9 @@ 
         $gd_posttype = " AND p.post_type = %s";

         $main_query_array[] = $_REQUEST['gd_posttype'];

 

-    } else

-        $table = $plugin_prefix . 'gd_place_detail';

+    } else {
+            $table = $plugin_prefix . 'gd_place_detail';
+    }
 

     $join = ", " . $table . " AS pd ";

 

@@ -606,8 +609,7 @@ 
 

     if (!empty($cat_content_info)) {

         $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

-    }

-    else {

+    } else {

         $map_json =  '[{"totalcount":"0"}]';

     }

 

Indentation +445 added lines, -445 removed lines

@@ -8,8 +8,8 @@ 
 

 // Enable map cache if set

 if(get_option('geodir_enable_map_cache')){

-    add_filter('geodir_get_markers_cache','geodir_get_map_cache');

-    add_filter('geodir_markers_json','geodir_save_map_cache',10);

+	add_filter('geodir_get_markers_cache','geodir_get_map_cache');

+	add_filter('geodir_markers_json','geodir_save_map_cache',10);

 }

 

 

@@ -23,56 +23,56 @@ 
  */

 function geodir_get_map_cache($cache){

 

-    // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

-        return $cache;

-    }

+	// if a search is going on then dont even try to check for cache.

+	if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+		return $cache;

+	}

 

-    $url_params = array();

-    $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : '';

-    $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : '';

-    $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : '';

-    $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : '';

-    $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : '';

-    $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : '';

-    $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : '';

-    $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : '';

-    $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : '';

-    $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : '';

-    $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : '';

-    $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

-    $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

+	$url_params = array();

+	$url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : '';

+	$url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : '';

+	$url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : '';

+	$url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : '';

+	$url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : '';

+	$url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : '';

+	$url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : '';

+	$url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : '';

+	$url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : '';

+	$url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : '';

+	$url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : '';

+	$url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

+	$url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+	$file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

 

-    $blog_id = get_current_blog_id();

-    if($blog_id>1){

-        $file_name = $blog_id."_".$file_name;

-    }

+	$blog_id = get_current_blog_id();

+	if($blog_id>1){

+		$file_name = $blog_id."_".$file_name;

+	}

 

-    $file_path = realpath(dirname(__FILE__))."/map-cache/";

+	$file_path = realpath(dirname(__FILE__))."/map-cache/";

 

 

-    if(file_exists($file_path.$file_name.".json")){

+	if(file_exists($file_path.$file_name.".json")){

 

 

-        // do the cache delete stuff

-        $cache_time = get_option('geodir_map_cache');

-        if(!$cache_time){

-            $cache_time = time();

-            update_option('geodir_map_cache', $cache_time);

-        }

+		// do the cache delete stuff

+		$cache_time = get_option('geodir_map_cache');

+		if(!$cache_time){

+			$cache_time = time();

+			update_option('geodir_map_cache', $cache_time);

+		}

 

-        if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

-            geodir_delete_map_cache();

-        }

+		if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

+			geodir_delete_map_cache();

+		}

 

-        ob_start();

-        readfile($file_path.$file_name.".json"); // readfile is quicker then file get contents

-        return ob_get_clean();

-    }

+		ob_start();

+		readfile($file_path.$file_name.".json"); // readfile is quicker then file get contents

+		return ob_get_clean();

+	}

 

-    return $cache;

+	return $cache;

 }

 

 

@@ -85,109 +85,109 @@ 
  */

 function geodir_save_map_cache($map_json){

 

-    // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

-        return $map_json;

-    }

-

-    $url_params = array();

-    $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : '';

-    $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : '';

-    $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : '';

-    $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : '';

-    $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : '';

-    $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : '';

-    $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : '';

-    $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : '';

-    $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : '';

-    $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : '';

-    $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : '';

-    $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

-    $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

-

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

-

-    $blog_id = get_current_blog_id();

-    if($blog_id>1){

-        $file_name = $blog_id."_".$file_name;

-    }

-

-    $file_path = realpath(dirname(__FILE__))."/map-cache/";

-

-

-    global $wp_filesystem;

-    if (empty($wp_filesystem)) {

-        require_once (ABSPATH . '/wp-admin/includes/file.php');

-        WP_Filesystem();

-    }

-    $wp_filesystem->put_contents(

-        $file_path.$file_name.".json",

-        $map_json,

-        FS_CHMOD_FILE // predefined mode settings for WP files

-    );

-

-

-    return $map_json;

+	// if a search is going on then dont even try to check for cache.

+	if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+		return $map_json;

+	}

+

+	$url_params = array();

+	$url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : '';

+	$url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : '';

+	$url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : '';

+	$url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : '';

+	$url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : '';

+	$url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : '';

+	$url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : '';

+	$url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : '';

+	$url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : '';

+	$url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : '';

+	$url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : '';

+	$url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

+	$url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

+

+	$file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+

+	$blog_id = get_current_blog_id();

+	if($blog_id>1){

+		$file_name = $blog_id."_".$file_name;

+	}

+

+	$file_path = realpath(dirname(__FILE__))."/map-cache/";

+

+

+	global $wp_filesystem;

+	if (empty($wp_filesystem)) {

+		require_once (ABSPATH . '/wp-admin/includes/file.php');

+		WP_Filesystem();

+	}

+	$wp_filesystem->put_contents(

+		$file_path.$file_name.".json",

+		$map_json,

+		FS_CHMOD_FILE // predefined mode settings for WP files

+	);

+

+

+	return $map_json;

 

 }

 

 

 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'homemap_catlist') {

-    global $gd_session;

-    $gd_post_type = sanitize_text_field($_REQUEST['post_type']);

-    $gd_session->set('homemap_catlist_ptype', $gd_post_type);

-    $post_taxonomy = geodir_get_taxonomies($gd_post_type);

-    $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

-    $child_collapse = (bool)$_REQUEST['child_collapse'];

-    echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

-    die;

+	global $gd_session;

+	$gd_post_type = sanitize_text_field($_REQUEST['post_type']);

+	$gd_session->set('homemap_catlist_ptype', $gd_post_type);

+	$post_taxonomy = geodir_get_taxonomies($gd_post_type);

+	$map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

+	$child_collapse = (bool)$_REQUEST['child_collapse'];

+	echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

+	die;

 }

 

 // Send the content-type header with correct encoding

 header("Content-type: text/javascript; charset=utf-8");

 

 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'cat') { // Retrives markers data for categories

-    echo get_markers();

-    exit;

+	echo get_markers();

+	exit;

 } else if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'info') { // Retrives marker info window html

-    /**

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $gd_session GeoDirectory Session object.

-     */

-    global $wpdb, $plugin_prefix, $gd_session;

-

-    if ($_REQUEST['m_id'] != '') {

-        $pid = (int)$_REQUEST['m_id'];

-    } else {

-        echo __('No marker data found', 'geodirectory');

-        exit;

-    }

-

-    if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = (object)$gd_ses_listing;

-        echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

-    } else {

-        $geodir_post_type = get_post_type($pid);

-

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

-

-        $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

-

-        $postinfo = $wpdb->get_results($sql);

-

-        $data_arr = array();

-

-        if ($postinfo) {

-            $srcharr = array("'", "/", "-", '"', '\\');

-            $replarr = array("′", "⁄", "–", "“", '');

-

-            foreach ($postinfo as $postinfo_obj) {

-                echo geodir_get_infowindow_html($postinfo_obj);

-            }

-        }

-    }

-    exit;

+	/**

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $gd_session GeoDirectory Session object.

+	 */

+	global $wpdb, $plugin_prefix, $gd_session;

+

+	if ($_REQUEST['m_id'] != '') {

+		$pid = (int)$_REQUEST['m_id'];

+	} else {

+		echo __('No marker data found', 'geodirectory');

+		exit;

+	}

+

+	if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

+		$post = (object)$gd_ses_listing;

+		echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

+	} else {

+		$geodir_post_type = get_post_type($pid);

+

+		$table = $plugin_prefix . $geodir_post_type . '_detail';

+

+		$sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

+

+		$postinfo = $wpdb->get_results($sql);

+

+		$data_arr = array();

+

+		if ($postinfo) {

+			$srcharr = array("'", "/", "-", '"', '\\');

+			$replarr = array("′", "⁄", "–", "“", '');

+

+			foreach ($postinfo as $postinfo_obj) {

+				echo geodir_get_infowindow_html($postinfo_obj);

+			}

+		}

+	}

+	exit;

 }

 

 /**

@@ -206,93 +206,93 @@ 
  */

 function get_markers() {

     

-    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

+	global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

 

 

-    /**

-     * Filter to allow for any map caching to be output before queries.

-     *

-     * @since 1.6.22

-     */

-    $map_cache = apply_filters('geodir_get_markers_cache','');

-    if($map_cache){

-        return $map_cache;

-        wp_die();

-    }

+	/**

+	 * Filter to allow for any map caching to be output before queries.

+	 *

+	 * @since 1.6.22

+	 */

+	$map_cache = apply_filters('geodir_get_markers_cache','');

+	if($map_cache){

+		return $map_cache;

+		wp_die();

+	}

 

 

 

-    $search = '';

+	$search = '';

 

-    $srcharr = array("'", "/", "-", '"', '\\', ''');

-    $replarr = array("′", "⁄", "–", "“", '', "′");

+	$srcharr = array("'", "/", "-", '"', '\\', ''');

+	$replarr = array("′", "⁄", "–", "“", '', "′");

 

-    $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

+	$post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

 

-    $map_cat_ids_array = array('0');

-    $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

+	$map_cat_ids_array = array('0');

+	$cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

 

 

-    $field_default_cat = '';

-    if (isset($_REQUEST['cat_id']) && $_REQUEST['cat_id'] != '') {

-        $map_cat_arr = trim($_REQUEST['cat_id'], ',');

+	$field_default_cat = '';

+	if (isset($_REQUEST['cat_id']) && $_REQUEST['cat_id'] != '') {

+		$map_cat_arr = trim($_REQUEST['cat_id'], ',');

 

-        if (!empty($map_cat_arr)) {

-            $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

+		if (!empty($map_cat_arr)) {

+			$field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

 

-            $map_cat_ids_array = explode(',', $map_cat_arr);

-            $cat_find_array = array();

-            foreach ($map_cat_ids_array as $cat_id) {

-                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

-                $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

-                $main_query_array[] = $cat_id;

-            }

+			$map_cat_ids_array = explode(',', $map_cat_arr);

+			$cat_find_array = array();

+			foreach ($map_cat_ids_array as $cat_id) {

+				$field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

+				$cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

+				$main_query_array[] = $cat_id;

+			}

 

-        }

-    }

+		}

+	}

 

-    if (!empty($field_default_cat))

-        $field_default_cat = '';

+	if (!empty($field_default_cat))

+		$field_default_cat = '';

 

-    if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+	if (!empty($cat_find_array))

+		$search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

 

-    $main_query_array = $map_cat_ids_array;

+	$main_query_array = $map_cat_ids_array;

   

-    if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

-        $search .= " AND p.post_title LIKE %s";

-        $main_query_array[] = "%" . $_REQUEST['search'] . "%";

-    }

-

-    /**

-     * Filter the marker query search SQL, values are replaces with %s or %d.

-     *

-     * @since 1.5.3

-     *

-     * @param string $search The SQL query for search/where.

-     */

-    $search = apply_filters('geodir_marker_search', $search);

-    /**

-     * Filter the marker query search SQL values %s and %d, this is an array of values.

-     *

-     * @since 1.5.3

-     *

-     * @param array $main_query_array The SQL query values for search/where.

-     */

-    $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);

-

-    $gd_posttype = '';

-    if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {

-        $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

-        $gd_posttype = " AND p.post_type = %s";

-        $main_query_array[] = $_REQUEST['gd_posttype'];

-

-    } else

-        $table = $plugin_prefix . 'gd_place_detail';

-

-    $join = ", " . $table . " AS pd ";

-

-    /**

+	if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

+		$search .= " AND p.post_title LIKE %s";

+		$main_query_array[] = "%" . $_REQUEST['search'] . "%";

+	}

+

+	/**

+	 * Filter the marker query search SQL, values are replaces with %s or %d.

+	 *

+	 * @since 1.5.3

+	 *

+	 * @param string $search The SQL query for search/where.

+	 */

+	$search = apply_filters('geodir_marker_search', $search);

+	/**

+	 * Filter the marker query search SQL values %s and %d, this is an array of values.

+	 *

+	 * @since 1.5.3

+	 *

+	 * @param array $main_query_array The SQL query values for search/where.

+	 */

+	$main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);

+

+	$gd_posttype = '';

+	if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {

+		$table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

+		$gd_posttype = " AND p.post_type = %s";

+		$main_query_array[] = $_REQUEST['gd_posttype'];

+

+	} else

+		$table = $plugin_prefix . 'gd_place_detail';

+

+	$join = ", " . $table . " AS pd ";

+

+	/**

 	 * Filter the SQL JOIN clause for the markers data

 	 *

 	 * @since 1.0.0

@@ -309,16 +309,16 @@ 
 	 * @param string $search Row of searched fields to use in WHERE clause.

 	 */

 	$search = apply_filters('geodir_home_map_listing_where', $search);

-    $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

-    $cat_type = $post_type . 'category';

-    if ($post_type == 'gd_event') {

-        $event_select = ", pd.recurring_dates, pd.is_recurring";

-    } else {

-        $event_select = "";

-    }

-

-    $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

-    /**

+	$search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

+	$cat_type = $post_type . 'category';

+	if ($post_type == 'gd_event') {

+		$event_select = ", pd.recurring_dates, pd.is_recurring";

+	} else {

+		$event_select = "";

+	}

+

+	$sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

+	/**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

 	 * @since 1.0.0

@@ -337,7 +337,7 @@ 
 	 */

 	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

-    $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

+	$catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -353,276 +353,276 @@ 
 //    print_r($gd_session);

 //    print_r($_SESSION);

 

-    $catinfo = $wpdb->get_results($catsql);

+	$catinfo = $wpdb->get_results($catsql);

 	

-    $cat_content_info = array();

-    $content_data = array();

-    $post_ids = array();

-

-    /**

-     * Called before marker data is processed into JSON.

-     *

-     * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.5.3

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_after_marker_post_process'

-     */

-    $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);

-

-    /**

-     * Called before marker data is processed into JSON.

-     *

-     * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.4.9

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_after_marker_post_process'

-     */

-    do_action('geodir_before_marker_post_process_action', $catinfo);

-

-    // Sort any posts into a ajax array

-    if (!empty($catinfo)) {

-        $geodir_cat_icons = geodir_get_term_icon();

-        global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

-

-        $today = strtotime(date_i18n('Y-m-d'));

-        $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

+	$cat_content_info = array();

+	$content_data = array();

+	$post_ids = array();

+

+	/**

+	 * Called before marker data is processed into JSON.

+	 *

+	 * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.5.3

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_after_marker_post_process'

+	 */

+	$catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);

+

+	/**

+	 * Called before marker data is processed into JSON.

+	 *

+	 * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.4.9

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_after_marker_post_process'

+	 */

+	do_action('geodir_before_marker_post_process_action', $catinfo);

+

+	// Sort any posts into a ajax array

+	if (!empty($catinfo)) {

+		$geodir_cat_icons = geodir_get_term_icon();

+		global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

+

+		$today = strtotime(date_i18n('Y-m-d'));

+		$show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

         

-        foreach ($catinfo as $catinfo_obj) {

-            $post_title = $catinfo_obj->post_title;

+		foreach ($catinfo as $catinfo_obj) {

+			$post_title = $catinfo_obj->post_title;

             

-            if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {

-                $event_dates = '';

-                $recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array();

+			if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {

+				$event_dates = '';

+				$recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array();

 

-                $post_info = geodir_get_post_info($catinfo_obj->post_id);

+				$post_info = geodir_get_post_info($catinfo_obj->post_id);

                 

-                if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {

-                    $starttimes = '';

-                    $endtimes = '';

-                    $astarttimes = array();

-                    $aendtimes = array();

-                    if ( !isset( $recurring_data['repeat_type'] ) ) {

-                        $recurring_data['repeat_type'] = 'custom';

-                    }

-                    $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom

-                    $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false;

+				if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {

+					$starttimes = '';

+					$endtimes = '';

+					$astarttimes = array();

+					$aendtimes = array();

+					if ( !isset( $recurring_data['repeat_type'] ) ) {

+						$recurring_data['repeat_type'] = 'custom';

+					}

+					$repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom

+					$different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false;

         

-                    $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

+					$recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

                     

-                    if ( !empty( $recurring_dates ) ) {

-                        if ( empty( $recurring_data['all_day'] ) ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                                $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

-                            } else {

-                                $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                                $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

-                            }

-                        }

+					if ( !empty( $recurring_dates ) ) {

+						if ( empty( $recurring_data['all_day'] ) ) {

+							if ( $repeat_type == 'custom' && $different_times ) {

+								$astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

+								$aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+							} else {

+								$starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

+								$endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+							}

+						}

                         

-                        $e = 0;

-                        foreach( $recurring_dates as $key => $date ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

-                                    $starttimes = $astarttimes[$key];

-                                    $endtimes = $aendtimes[$key];

-                                } else {

-                                    $starttimes = '';

-                                    $endtimes = '';

-                                }

-                            }

+						$e = 0;

+						foreach( $recurring_dates as $key => $date ) {

+							if ( $repeat_type == 'custom' && $different_times ) {

+								if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

+									$starttimes = $astarttimes[$key];

+									$endtimes = $aendtimes[$key];

+								} else {

+									$starttimes = '';

+									$endtimes = '';

+								}

+							}

                             

-                            $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

-                            $duration--;

-                            $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

+							$duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

+							$duration--;

+							$enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

                             

-                            // Hide past dates

-                            if ( strtotime( $enddate ) < $today ) {

-                                continue;

-                            }

+							// Hide past dates

+							if ( strtotime( $enddate ) < $today ) {

+								continue;

+							}

                                     

-                            $sdate = strtotime( $date . ' ' . $starttimes );

-                            $edate = strtotime( $enddate . ' ' . $endtimes );

+							$sdate = strtotime( $date . ' ' . $starttimes );

+							$edate = strtotime( $enddate . ' ' . $endtimes );

                                         

-                            $start_date = date_i18n( $geodir_date_time_format, $sdate );

-                            $end_date = date_i18n( $geodir_date_time_format, $edate );

+							$start_date = date_i18n( $geodir_date_time_format, $sdate );

+							$end_date = date_i18n( $geodir_date_time_format, $edate );

                             

-                            $same_day = false;

-                            $full_day = false;

-                            $same_datetime = false;

+							$same_day = false;

+							$full_day = false;

+							$same_datetime = false;

                             

-                            if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

-                                $full_day = true;

-                            }

+							if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

+								$full_day = true;

+							}

                             

-                            if ( $start_date == $end_date && $full_day ) {

-                                $same_datetime = true;

-                            }

-

-                            $link_date = date_i18n( 'Y-m-d', $sdate );

-                            $title_date = date_i18n( $geodir_date_format, $sdate );

-                            if ( $full_day ) {

-                                $start_date = $title_date;

-                                $end_date = date_i18n( $geodir_date_format, $edate );

-                            }

+							if ( $start_date == $end_date && $full_day ) {

+								$same_datetime = true;

+							}

+

+							$link_date = date_i18n( 'Y-m-d', $sdate );

+							$title_date = date_i18n( $geodir_date_format, $sdate );

+							if ( $full_day ) {

+								$start_date = $title_date;

+								$end_date = date_i18n( $geodir_date_format, $edate );

+							}

                             

-                            if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

-                                $same_day = true;

+							if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

+								$same_day = true;

                                 

-                                $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

-                            }

+								$start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

+							}

                             

-                            $event_dates .= ' :: ' . $start_date;

+							$event_dates .= ' :: ' . $start_date;

                         

-                            if ( !$same_day && !$same_datetime ) {

-                                $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

-                            }

+							if ( !$same_day && !$same_datetime ) {

+								$event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+							}

                             

-                            $e++;

+							$e++;

                             

-                            if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates

-                                break;

-                            }

-                        }

-                    }

-                } else {

-                    $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

-                    $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

-                    $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false;

-                    $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                    $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+							if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates

+								break;

+							}

+						}

+					}

+				} else {

+					$start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

+					$end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

+					$all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false;

+					$starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

+					$endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

                 

-                    $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

-                    $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                    $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+					$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+					$starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

+					$endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

                     

-                    if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

-                        $start_date = $event_recurring_dates[0];

-                    }

+					if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

+						$start_date = $event_recurring_dates[0];

+					}

                                 

-                    if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

-                        $end_date = $start_date;

-                    }

+					if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

+						$end_date = $start_date;

+					}

                     

-                    if ($end_date != '' && strtotime($end_date) >= $today) {

-                        if ( $starttime == '' && !empty( $starttimes ) ) {

-                            $starttime = $starttimes[0];

-                            $endtime = $endtimes[0];

-                        }

+					if ($end_date != '' && strtotime($end_date) >= $today) {

+						if ( $starttime == '' && !empty( $starttimes ) ) {

+							$starttime = $starttimes[0];

+							$endtime = $endtimes[0];

+						}

                         

-                        $same_day = false;

-                        $one_day = false;

-                        if ( $start_date == $end_date && $all_day ) {

-                            $one_day = true;

-                        }

-

-                        if ( $all_day ) {

-                            $start_datetime = strtotime( $start_date );

-                            $end_datetime = strtotime( $end_date );

+						$same_day = false;

+						$one_day = false;

+						if ( $start_date == $end_date && $all_day ) {

+							$one_day = true;

+						}

+

+						if ( $all_day ) {

+							$start_datetime = strtotime( $start_date );

+							$end_datetime = strtotime( $end_date );

                             

-                            $start_date = date_i18n( $geodir_date_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_format, $end_datetime );

-                            if ( $start_date == $end_date ) {

-                                $one_day = true;

-                            }

-                        } else {

-                            if ( $start_date == $end_date && $starttime == $endtime ) {

-                                $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

-                                $one_day = false;

-                            }

-                            $start_datetime = strtotime( $start_date . ' ' . $starttime );

-                            $end_datetime = strtotime( $end_date . ' ' . $endtime );

+							$start_date = date_i18n( $geodir_date_format, $start_datetime );

+							$end_date = date_i18n( $geodir_date_format, $end_datetime );

+							if ( $start_date == $end_date ) {

+								$one_day = true;

+							}

+						} else {

+							if ( $start_date == $end_date && $starttime == $endtime ) {

+								$end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

+								$one_day = false;

+							}

+							$start_datetime = strtotime( $start_date . ' ' . $starttime );

+							$end_datetime = strtotime( $end_date . ' ' . $endtime );

                             

-                            $start_date = date_i18n( $geodir_date_time_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_time_format, $end_datetime );

-                        }

+							$start_date = date_i18n( $geodir_date_time_format, $start_datetime );

+							$end_date = date_i18n( $geodir_date_time_format, $end_datetime );

+						}

 

-                        if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

-                            $same_day = true;

+						if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

+							$same_day = true;

                             

-                            $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

-                        }

+							$start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

+						}

                         

-                        $event_dates .= ' :: ' . $start_date;

+						$event_dates .= ' :: ' . $start_date;

                         

-                        if ( !$same_day && !$one_day ) {

-                            $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

-                        }

-                    }

-                }

-

-                if (empty($event_dates)) {

-                    continue;

-                }

+						if ( !$same_day && !$one_day ) {

+							$event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+						}

+					}

+				}

+

+				if (empty($event_dates)) {

+					continue;

+				}

                 

-                $post_title .= $event_dates;

-            }

+				$post_title .= $event_dates;

+			}

 

-            $map_cat_ids_array;

-            $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

+			$map_cat_ids_array;

+			$default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

 

-            // if single cat lets just show that icon

-            if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

-                $default_cat = (int)$map_cat_ids_array[0];

-            }

+			// if single cat lets just show that icon

+			if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

+				$default_cat = (int)$map_cat_ids_array[0];

+			}

 

-            $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : '';

-            $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

-            $title = str_replace($srcharr, $replarr, $post_title);

+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : '';

+			$mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

+			$title = str_replace($srcharr, $replarr, $post_title);

             

-            if ($icon != '') {

-                $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;

+			if ($icon != '') {

+				$gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;

                 

-                if (isset($gd_marker_sizes[$icon])) {

-                    $icon_size = $gd_marker_sizes[$icon];

-                } else {

-                    $icon_size = geodir_get_marker_size($icon);

-                    $gd_marker_sizes[$icon] = $icon_size;

-                }               

-            } else {

-                $icon_size = array('w' => 36, 'h' => 45);

-            }

-

-            $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

-            $post_ids[] = $catinfo_obj->post_id;

-        }

-    }

-

-    /**

-     * Called after marker data is processed into JSON.

-     *

-     * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.4.9

-     * @param array $content_data The array containing all markers in JSON format.

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_before_marker_post_process'

-     */

-    do_action('geodir_after_marker_post_process', $content_data, $catinfo);

-

-    if (!empty($content_data)) {

-        $cat_content_info[] = implode(',', $content_data);

-    }

-

-    $totalcount = count(array_unique($post_ids));

-

-    if (!empty($cat_content_info)) {

-        $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

-    }

-    else {

-        $map_json =  '[{"totalcount":"0"}]';

-    }

-

-

-    /**

-     * Filter the marker json return.

-     *

-     * @since 1.6.22

-     * @param string $map_json The JSON string of the map markers results.

-     */

-    return apply_filters('geodir_markers_json',$map_json);

+				if (isset($gd_marker_sizes[$icon])) {

+					$icon_size = $gd_marker_sizes[$icon];

+				} else {

+					$icon_size = geodir_get_marker_size($icon);

+					$gd_marker_sizes[$icon] = $icon_size;

+				}               

+			} else {

+				$icon_size = array('w' => 36, 'h' => 45);

+			}

+

+			$content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

+			$post_ids[] = $catinfo_obj->post_id;

+		}

+	}

+

+	/**

+	 * Called after marker data is processed into JSON.

+	 *

+	 * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.4.9

+	 * @param array $content_data The array containing all markers in JSON format.

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_before_marker_post_process'

+	 */

+	do_action('geodir_after_marker_post_process', $content_data, $catinfo);

+

+	if (!empty($content_data)) {

+		$cat_content_info[] = implode(',', $content_data);

+	}

+

+	$totalcount = count(array_unique($post_ids));

+

+	if (!empty($cat_content_info)) {

+		$map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

+	}

+	else {

+		$map_json =  '[{"totalcount":"0"}]';

+	}

+

+

+	/**

+	 * Filter the marker json return.

+	 *

+	 * @since 1.6.22

+	 * @param string $map_json The JSON string of the map markers results.

+	 */

+	return apply_filters('geodir_markers_json',$map_json);

 }

 

 

Spacing +102 added lines, -102 removed lines

@@ -7,9 +7,9 @@ 
  */

 

 // Enable map cache if set

-if(get_option('geodir_enable_map_cache')){

-    add_filter('geodir_get_markers_cache','geodir_get_map_cache');

-    add_filter('geodir_markers_json','geodir_save_map_cache',10);

+if (get_option('geodir_enable_map_cache')) {

+    add_filter('geodir_get_markers_cache', 'geodir_get_map_cache');

+    add_filter('geodir_markers_json', 'geodir_save_map_cache', 10);

 }

 

 

@@ -21,10 +21,10 @@ 
  * @since 1.6.22

  * @return string

  */

-function geodir_get_map_cache($cache){

+function geodir_get_map_cache($cache) {

 

     // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+    if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {

         return $cache;

     }

 

@@ -43,27 +43,27 @@ 
     $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

     $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+    $file_name = sanitize_file_name(md5(implode("-", $url_params)));

 

     $blog_id = get_current_blog_id();

-    if($blog_id>1){

+    if ($blog_id > 1) {

         $file_name = $blog_id."_".$file_name;

     }

 

     $file_path = realpath(dirname(__FILE__))."/map-cache/";

 

 

-    if(file_exists($file_path.$file_name.".json")){

+    if (file_exists($file_path.$file_name.".json")) {

 

 

         // do the cache delete stuff

         $cache_time = get_option('geodir_map_cache');

-        if(!$cache_time){

+        if (!$cache_time) {

             $cache_time = time();

             update_option('geodir_map_cache', $cache_time);

         }

 

-        if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

+        if ((time() - $cache_time) > 86400) { // delete the cache every 24 hours

             geodir_delete_map_cache();

         }

 

@@ -83,10 +83,10 @@ 
  * @since 1.6.22

  * @return mixed

  */

-function geodir_save_map_cache($map_json){

+function geodir_save_map_cache($map_json) {

 

     // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+    if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {

         return $map_json;

     }

 

@@ -105,10 +105,10 @@ 
     $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

     $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+    $file_name = sanitize_file_name(md5(implode("-", $url_params)));

 

     $blog_id = get_current_blog_id();

-    if($blog_id>1){

+    if ($blog_id > 1) {

         $file_name = $blog_id."_".$file_name;

     }

 

@@ -117,7 +117,7 @@ 
 

     global $wp_filesystem;

     if (empty($wp_filesystem)) {

-        require_once (ABSPATH . '/wp-admin/includes/file.php');

+        require_once (ABSPATH.'/wp-admin/includes/file.php');

         WP_Filesystem();

     }

     $wp_filesystem->put_contents(

@@ -138,7 +138,7 @@ 
     $gd_session->set('homemap_catlist_ptype', $gd_post_type);

     $post_taxonomy = geodir_get_taxonomies($gd_post_type);

     $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

-    $child_collapse = (bool)$_REQUEST['child_collapse'];

+    $child_collapse = (bool) $_REQUEST['child_collapse'];

     echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

     die;

 }

@@ -158,21 +158,21 @@ 
     global $wpdb, $plugin_prefix, $gd_session;

 

     if ($_REQUEST['m_id'] != '') {

-        $pid = (int)$_REQUEST['m_id'];

+        $pid = (int) $_REQUEST['m_id'];

     } else {

         echo __('No marker data found', 'geodirectory');

         exit;

     }

 

     if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = (object)$gd_ses_listing;

+        $post = (object) $gd_ses_listing;

         echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

     } else {

         $geodir_post_type = get_post_type($pid);

 

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+        $table = $plugin_prefix.$geodir_post_type.'_detail';

 

-        $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

+        $sql = $wpdb->prepare("SELECT * FROM ".$table." WHERE post_id = %d", array($pid));

 

         $postinfo = $wpdb->get_results($sql);

 

@@ -206,7 +206,7 @@ 
  */

 function get_markers() {

     

-    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

+    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes, $gd_session;

 

 

     /**

@@ -214,8 +214,8 @@ 
      *

      * @since 1.6.22

      */

-    $map_cache = apply_filters('geodir_get_markers_cache','');

-    if($map_cache){

+    $map_cache = apply_filters('geodir_get_markers_cache', '');

+    if ($map_cache) {

         return $map_cache;

         wp_die();

     }

@@ -230,7 +230,7 @@ 
     $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

 

     $map_cat_ids_array = array('0');

-    $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

+    $cat_find_array = array(" FIND_IN_SET(%d, pd.".$post_type."category)");

 

 

     $field_default_cat = '';

@@ -238,13 +238,13 @@ 
         $map_cat_arr = trim($_REQUEST['cat_id'], ',');

 

         if (!empty($map_cat_arr)) {

-            $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

+            $field_default_cat .= "WHEN (default_category IN (".$map_cat_arr.")) THEN default_category ";

 

             $map_cat_ids_array = explode(',', $map_cat_arr);

             $cat_find_array = array();

             foreach ($map_cat_ids_array as $cat_id) {

-                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

-                $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

+                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `".$post_type."category`) > 0) THEN $cat_id ";

+                $cat_find_array[] = " FIND_IN_SET(%d, pd.".$post_type."category)";

                 $main_query_array[] = $cat_id;

             }

 

@@ -255,13 +255,13 @@ 
         $field_default_cat = '';

 

     if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+        $search .= "AND (".implode(' OR ', $cat_find_array).")";

 

     $main_query_array = $map_cat_ids_array;

   

     if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

         $search .= " AND p.post_title LIKE %s";

-        $main_query_array[] = "%" . $_REQUEST['search'] . "%";

+        $main_query_array[] = "%".$_REQUEST['search']."%";

     }

 

     /**

@@ -283,14 +283,14 @@ 
 

     $gd_posttype = '';

     if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {

-        $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

+        $table = $plugin_prefix.$_REQUEST['gd_posttype'].'_detail';

         $gd_posttype = " AND p.post_type = %s";

         $main_query_array[] = $_REQUEST['gd_posttype'];

 

     } else

-        $table = $plugin_prefix . 'gd_place_detail';

+        $table = $plugin_prefix.'gd_place_detail';

 

-    $join = ", " . $table . " AS pd ";

+    $join = ", ".$table." AS pd ";

 

     /**

 	 * Filter the SQL JOIN clause for the markers data

@@ -310,14 +310,14 @@ 
 	 */

 	$search = apply_filters('geodir_home_map_listing_where', $search);

     $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

-    $cat_type = $post_type . 'category';

+    $cat_type = $post_type.'category';

     if ($post_type == 'gd_event') {

         $event_select = ", pd.recurring_dates, pd.is_recurring";

     } else {

         $event_select = "";

     }

 

-    $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

+    $sql_select = 'SELECT pd.default_category, pd.'.$cat_type.', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude'.$event_select;

     /**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

@@ -337,7 +337,7 @@ 
 	 */

 	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

-    $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

+    $catsql = $wpdb->prepare("$select $field_default_cat FROM ".$wpdb->posts." as p".$join." WHERE p.ID = pd.post_id AND p.post_status = 'publish' ".$search.$gd_posttype.$groupby, $main_query_array);

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -387,7 +387,7 @@ 
         global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

 

         $today = strtotime(date_i18n('Y-m-d'));

-        $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

+        $show_dates = $post_type == 'gd_event' ? (int) get_option('geodir_event_infowindow_dates_count', 1) : 0;

         

         foreach ($catinfo as $catinfo_obj) {

             $post_title = $catinfo_obj->post_title;

@@ -403,29 +403,29 @@ 
                     $endtimes = '';

                     $astarttimes = array();

                     $aendtimes = array();

-                    if ( !isset( $recurring_data['repeat_type'] ) ) {

+                    if (!isset($recurring_data['repeat_type'])) {

                         $recurring_data['repeat_type'] = 'custom';

                     }

-                    $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom

-                    $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false;

+                    $repeat_type = isset($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom

+                    $different_times = isset($recurring_data['different_times']) && !empty($recurring_data['different_times']) ? true : false;

         

                     $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

                     

-                    if ( !empty( $recurring_dates ) ) {

-                        if ( empty( $recurring_data['all_day'] ) ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                                $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+                    if (!empty($recurring_dates)) {

+                        if (empty($recurring_data['all_day'])) {

+                            if ($repeat_type == 'custom' && $different_times) {

+                                $astarttimes = isset($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array();

+                                $aendtimes = isset($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array();

                             } else {

-                                $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                                $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+                                $starttimes = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : '';

+                                $endtimes = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : '';

                             }

                         }

                         

                         $e = 0;

-                        foreach( $recurring_dates as $key => $date ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

+                        foreach ($recurring_dates as $key => $date) {

+                            if ($repeat_type == 'custom' && $different_times) {

+                                if (!empty($astarttimes) && isset($astarttimes[$key])) {

                                     $starttimes = $astarttimes[$key];

                                     $endtimes = $aendtimes[$key];

                                 } else {

@@ -434,50 +434,50 @@ 
                                 }

                             }

                             

-                            $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

+                            $duration = isset($recurring_data['duration_x']) && (int) $recurring_data['duration_x'] > 0 ? (int) $recurring_data['duration_x'] : 1;

                             $duration--;

-                            $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

+                            $enddate = date_i18n('Y-m-d', strtotime($date.' + '.$duration.' day'));

                             

                             // Hide past dates

-                            if ( strtotime( $enddate ) < $today ) {

+                            if (strtotime($enddate) < $today) {

                                 continue;

                             }

                                     

-                            $sdate = strtotime( $date . ' ' . $starttimes );

-                            $edate = strtotime( $enddate . ' ' . $endtimes );

+                            $sdate = strtotime($date.' '.$starttimes);

+                            $edate = strtotime($enddate.' '.$endtimes);

                                         

-                            $start_date = date_i18n( $geodir_date_time_format, $sdate );

-                            $end_date = date_i18n( $geodir_date_time_format, $edate );

+                            $start_date = date_i18n($geodir_date_time_format, $sdate);

+                            $end_date = date_i18n($geodir_date_time_format, $edate);

                             

                             $same_day = false;

                             $full_day = false;

                             $same_datetime = false;

                             

-                            if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

+                            if ($starttimes == $endtimes && ($starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00')) {

                                 $full_day = true;

                             }

                             

-                            if ( $start_date == $end_date && $full_day ) {

+                            if ($start_date == $end_date && $full_day) {

                                 $same_datetime = true;

                             }

 

-                            $link_date = date_i18n( 'Y-m-d', $sdate );

-                            $title_date = date_i18n( $geodir_date_format, $sdate );

-                            if ( $full_day ) {

+                            $link_date = date_i18n('Y-m-d', $sdate);

+                            $title_date = date_i18n($geodir_date_format, $sdate);

+                            if ($full_day) {

                                 $start_date = $title_date;

-                                $end_date = date_i18n( $geodir_date_format, $edate );

+                                $end_date = date_i18n($geodir_date_format, $edate);

                             }

                             

-                            if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

+                            if (!$same_datetime && !$full_day && date_i18n('Y-m-d', $sdate) == date_i18n('Y-m-d', $edate)) {

                                 $same_day = true;

                                 

-                                $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

+                                $start_date .= ' - '.date_i18n($geodir_time_format, $edate);

                             }

                             

-                            $event_dates .= ' :: ' . $start_date;

+                            $event_dates .= ' :: '.$start_date;

                         

-                            if ( !$same_day && !$same_datetime ) {

-                                $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+                            if (!$same_day && !$same_datetime) {

+                                $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;

                             }

                             

                             $e++;

@@ -488,67 +488,67 @@ 
                         }

                     }

                 } else {

-                    $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

-                    $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

-                    $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false;

-                    $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                    $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+                    $start_date = isset($recurring_data['event_start']) ? $recurring_data['event_start'] : '';

+                    $end_date = isset($recurring_data['event_end']) ? $recurring_data['event_end'] : $start_date;

+                    $all_day = isset($recurring_data['all_day']) && !empty($recurring_data['all_day']) ? true : false;

+                    $starttime = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : '';

+                    $endtime = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : '';

                 

-                    $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

-                    $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                    $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+                    $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

+                    $starttimes = isset($recurring_data['starttimes']) && !empty($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array();

+                    $endtimes = isset($recurring_data['endtimes']) && !empty($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array();

                     

-                    if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

+                    if (!geodir_event_is_date($start_date) && !empty($event_recurring_dates)) {

                         $start_date = $event_recurring_dates[0];

                     }

                                 

-                    if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

+                    if (strtotime($end_date) < strtotime($start_date)) {

                         $end_date = $start_date;

                     }

                     

                     if ($end_date != '' && strtotime($end_date) >= $today) {

-                        if ( $starttime == '' && !empty( $starttimes ) ) {

+                        if ($starttime == '' && !empty($starttimes)) {

                             $starttime = $starttimes[0];

                             $endtime = $endtimes[0];

                         }

                         

                         $same_day = false;

                         $one_day = false;

-                        if ( $start_date == $end_date && $all_day ) {

+                        if ($start_date == $end_date && $all_day) {

                             $one_day = true;

                         }

 

-                        if ( $all_day ) {

-                            $start_datetime = strtotime( $start_date );

-                            $end_datetime = strtotime( $end_date );

+                        if ($all_day) {

+                            $start_datetime = strtotime($start_date);

+                            $end_datetime = strtotime($end_date);

                             

-                            $start_date = date_i18n( $geodir_date_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_format, $end_datetime );

-                            if ( $start_date == $end_date ) {

+                            $start_date = date_i18n($geodir_date_format, $start_datetime);

+                            $end_date = date_i18n($geodir_date_format, $end_datetime);

+                            if ($start_date == $end_date) {

                                 $one_day = true;

                             }

                         } else {

-                            if ( $start_date == $end_date && $starttime == $endtime ) {

-                                $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

+                            if ($start_date == $end_date && $starttime == $endtime) {

+                                $end_date = date_i18n('Y-m-d', strtotime($start_date.' '.$starttime.' +1 day'));

                                 $one_day = false;

                             }

-                            $start_datetime = strtotime( $start_date . ' ' . $starttime );

-                            $end_datetime = strtotime( $end_date . ' ' . $endtime );

+                            $start_datetime = strtotime($start_date.' '.$starttime);

+                            $end_datetime = strtotime($end_date.' '.$endtime);

                             

-                            $start_date = date_i18n( $geodir_date_time_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_time_format, $end_datetime );

+                            $start_date = date_i18n($geodir_date_time_format, $start_datetime);

+                            $end_date = date_i18n($geodir_date_time_format, $end_datetime);

                         }

 

-                        if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

+                        if (!$one_day && date_i18n('Y-m-d', $start_datetime) == date_i18n('Y-m-d', $end_datetime)) {

                             $same_day = true;

                             

-                            $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

+                            $start_date .= ' - '.date_i18n($geodir_time_format, $end_datetime);

                         }

                         

-                        $event_dates .= ' :: ' . $start_date;

+                        $event_dates .= ' :: '.$start_date;

                         

-                        if ( !$same_day && !$one_day ) {

-                            $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+                        if (!$same_day && !$one_day) {

+                            $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;

                         }

                     }

                 }

@@ -564,8 +564,8 @@ 
             $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

 

             // if single cat lets just show that icon

-            if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

-                $default_cat = (int)$map_cat_ids_array[0];

+            if (is_array($map_cat_ids_array) && count($map_cat_ids_array) == 1) {

+                $default_cat = (int) $map_cat_ids_array[0];

             }

 

             $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : '';

@@ -585,7 +585,7 @@ 
                 $icon_size = array('w' => 36, 'h' => 45);

             }

 

-            $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

+            $content_data[] = '{"id":"'.$catinfo_obj->post_id.'","t": "'.$title.'","lt": "'.$catinfo_obj->post_latitude.'","ln": "'.$catinfo_obj->post_longitude.'","mk_id":"'.$catinfo_obj->post_id.'_'.$default_cat.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"'.$mark_extra.'}';

             $post_ids[] = $catinfo_obj->post_id;

         }

     }

@@ -609,10 +609,10 @@ 
     $totalcount = count(array_unique($post_ids));

 

     if (!empty($cat_content_info)) {

-        $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

+        $map_json = '[{"totalcount":"'.$totalcount.'",'.substr(implode(',', $cat_content_info), 1).']';

     }

     else {

-        $map_json =  '[{"totalcount":"0"}]';

+        $map_json = '[{"totalcount":"0"}]';

     }

 

 

@@ -622,7 +622,7 @@ 
      * @since 1.6.22

      * @param string $map_json The JSON string of the map markers results.

      */

-    return apply_filters('geodir_markers_json',$map_json);

+    return apply_filters('geodir_markers_json', $map_json);

 }