GeoDirectory / geodirectory

geodirectory-admin/dummy-data/property_sale.php

Indentation +873 added lines, -873 removed lines

@@ -7,453 +7,453 @@ 
  */
 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // price
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Price', 'geodirectory'),
-                      'site_title'          =>  __('Price', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the price in $ (no currency symbol)', 'geodirectory'),
-                      'htmlvar_name'        =>  'price',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  '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 Sale,Sold,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_sale_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// price
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Price', 'geodirectory'),
+					  'site_title'          =>  __('Price', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the price in $ (no currency symbol)', 'geodirectory'),
+					  'htmlvar_name'        =>  'price',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  addslashes_gpc('\d+(\.\d{2})?'), // add slashes required
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  '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 Sale,Sold,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_sale_custom_fields', $fields);
+
+	return  $fields;
 }
 
 function geodir_property_sale_custom_fields_sort($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // price sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_price',
-        'site_title'              => __('Price','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Price (lowest first)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Price (highest first)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    // area sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_property_area',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Area (smallest first)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Area (largest first)','geodirectory'),
-        'is_active'               => 1
-    );
-
-    // bedrooms sort
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => '',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'site_title'              => __('Area (Sq Ft)','geodirectory'),
-        'asc'                     => 1,
-        'asc_title'               => __('Bedrooms (least)','geodirectory'),
-        'desc'                    => 1,
-        'desc_title'              => __('Bedrooms (most)','geodirectory'),
-        'is_active'               => 1
-    );
-
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields_sort', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// price sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_price',
+		'site_title'              => __('Price','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Price (lowest first)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Price (highest first)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	// area sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_property_area',
+		'site_title'              => __('Area (Sq Ft)','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Area (smallest first)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Area (largest first)','geodirectory'),
+		'is_active'               => 1
+	);
+
+	// bedrooms sort
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => '',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'site_title'              => __('Area (Sq Ft)','geodirectory'),
+		'asc'                     => 1,
+		'asc_title'               => __('Bedrooms (least)','geodirectory'),
+		'desc'                    => 1,
+		'desc_title'              => __('Bedrooms (most)','geodirectory'),
+		'is_active'               => 1
+	);
+
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields_sort', $fields);
+
+	return $fields;
 
 }
 
 function geodir_property_sale_custom_fields_advanced_search($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // price range
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => 'RANGE',
-        'is_active'               => 1,
-        'site_field_title'        => 'Price',
-        'field_data_type'         => 'FLOAT',
-        'main_search'             => 1,
-        'main_search_priority'    => 15,
-        'data_type_change'        => 'SELECT',
-        'search_condition_select' => 'SINGLE',
-        'search_min_value'        => '50000',
-        'search_max_value'        => '1000000',
-        'search_diff_value'       => '100000',
-        'first_search_value'      => '0',
-        'first_search_text'       => '',
-        'last_search_text'        => '',
-        'search_condition'        => 'SELECT',
-        'site_htmlvar_name'       => 'geodir_price',
-        'htmlvar_name'            => 'geodir_price',
-        'field_title'             => 'geodir_price',
-        'expand_custom_value'     => '',
-        'front_search_title'      => 'Price Range',
-        'field_desc'              => ''
-    );
-
-    // bedrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bedrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 1,
-        'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bedrooms',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'field_title'             => 'geodir_property_bedrooms',
-        'front_search_title'      => 'Bedrooms',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property type
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Type',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_type',
-        'htmlvar_name'            => 'geodir_property_type',
-        'field_title'             => 'geodir_property_type',
-        'front_search_title'      => 'Property Type',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Features
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'multiselect',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Features',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_features',
-        'htmlvar_name'            => 'geodir_property_features',
-        'field_title'             => 'geodir_property_features',
-        'front_search_title'      => 'Property Features',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'AND'
-    );
-
-    // Property Bathrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bathrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bathrooms',
-        'htmlvar_name'            => 'geodir_property_bathrooms',
-        'field_title'             => 'geodir_property_bathrooms',
-        'front_search_title'      => 'Bathrooms',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Furnishing
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Furnishing',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_furnishing',
-        'htmlvar_name'            => 'geodir_property_furnishing',
-        'field_title'             => 'geodir_property_furnishing',
-        'front_search_title'      => 'Furnishing',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-    // Property Status
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'CHECK',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Status',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_status',
-        'htmlvar_name'            => 'geodir_property_status',
-        'field_title'             => 'geodir_property_status',
-        'front_search_title'      => 'Property Status',
-        'field_desc'              => '',
-        'expand_custom_value'     => 5,
-        'expand_search'           => 1,
-        'search_operator'         => 'OR'
-    );
-
-
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields_advanced_search', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// price range
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => 'RANGE',
+		'is_active'               => 1,
+		'site_field_title'        => 'Price',
+		'field_data_type'         => 'FLOAT',
+		'main_search'             => 1,
+		'main_search_priority'    => 15,
+		'data_type_change'        => 'SELECT',
+		'search_condition_select' => 'SINGLE',
+		'search_min_value'        => '50000',
+		'search_max_value'        => '1000000',
+		'search_diff_value'       => '100000',
+		'first_search_value'      => '0',
+		'first_search_text'       => '',
+		'last_search_text'        => '',
+		'search_condition'        => 'SELECT',
+		'site_htmlvar_name'       => 'geodir_price',
+		'htmlvar_name'            => 'geodir_price',
+		'field_title'             => 'geodir_price',
+		'expand_custom_value'     => '',
+		'front_search_title'      => 'Price Range',
+		'field_desc'              => ''
+	);
+
+	// bedrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bedrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 1,
+		'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bedrooms',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'field_title'             => 'geodir_property_bedrooms',
+		'front_search_title'      => 'Bedrooms',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property type
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Type',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_type',
+		'htmlvar_name'            => 'geodir_property_type',
+		'field_title'             => 'geodir_property_type',
+		'front_search_title'      => 'Property Type',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Features
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'multiselect',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Features',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_features',
+		'htmlvar_name'            => 'geodir_property_features',
+		'field_title'             => 'geodir_property_features',
+		'front_search_title'      => 'Property Features',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'AND'
+	);
+
+	// Property Bathrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bathrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bathrooms',
+		'htmlvar_name'            => 'geodir_property_bathrooms',
+		'field_title'             => 'geodir_property_bathrooms',
+		'front_search_title'      => 'Bathrooms',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Furnishing
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Furnishing',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_furnishing',
+		'htmlvar_name'            => 'geodir_property_furnishing',
+		'field_title'             => 'geodir_property_furnishing',
+		'front_search_title'      => 'Furnishing',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+	// Property Status
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'CHECK',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Status',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_status',
+		'htmlvar_name'            => 'geodir_property_status',
+		'field_title'             => 'geodir_property_status',
+		'front_search_title'      => 'Property Status',
+		'field_desc'              => '',
+		'expand_custom_value'     => 5,
+		'expand_search'           => 1,
+		'search_operator'         => 'OR'
+	);
+
+
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields_advanced_search', $fields);
+
+	return $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -463,52 +463,52 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
-
-    // add the dummy custom fields
-    $fields = geodir_property_sale_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-
-    // add sort order items
-    $sort_fields = geodir_property_sale_custom_fields_sort($post_type);
-    foreach($sort_fields as $sort){
-        geodir_custom_sort_field_save($sort);
-    }
-
-    // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_sale');
-
-    // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
-        $search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
-        }
-    }
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
+
+	// add the dummy custom fields
+	$fields = geodir_property_sale_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+
+	// add sort order items
+	$sort_fields = geodir_property_sale_custom_fields_sort($post_type);
+	foreach($sort_fields as $sort){
+		geodir_custom_sort_field_save($sort);
+	}
+
+	// update the type currently installed
+	update_option($post_type.'_dummy_data_type','property_sale');
+
+	// add the advanced search fields
+	if (defined('GEODIRADVANCESEARCH_VERSION')){
+		$search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
+		foreach($search_fields as $sfield){
+			geodir_custom_advance_search_field_save( $sfield );
+		}
+	}
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'https://www.wpgeodirectory.com/dummy';
+	$dummy_image_url = 'https://www.wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -517,42 +517,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '350000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '350000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -562,42 +562,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '230000',
-            "geodir_property_status" => 'Sold',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '230000',
+			"geodir_property_status" => 'Sold',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -607,43 +607,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '260000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '260000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -653,42 +653,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2300000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2300000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -698,42 +698,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '330000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '330000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -743,42 +743,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '530000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '530000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -788,42 +788,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '245000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '245000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -833,43 +833,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '395000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '395000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -879,39 +879,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '12500000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '12500000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -921,93 +921,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '80000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '80000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

Spacing +27 added lines, -27 removed lines

@@ -6,9 +6,9 @@ 
  * @package GeoDirectory
  */
 
-function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
+function geodir_property_sale_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_sale_custom_fields_sort($post_type='gd_place') {
+function geodir_property_sale_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
     );
 
@@ -278,7 +278,7 @@ 
 
 }
 
-function geodir_property_sale_custom_fields_advanced_search($post_type='gd_place') {
+function geodir_property_sale_custom_fields_advanced_search($post_type = 'gd_place') {
 
 
     $fields = array();
@@ -456,15 +456,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_sale_custom_fields($post_type);
@@ -472,24 +472,24 @@ 
 
     // add sort order items
     $sort_fields = geodir_property_sale_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_sale');
+    update_option($post_type.'_dummy_data_type', 'property_sale');
 
     // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
+    if (defined('GEODIRADVANCESEARCH_VERSION')) {
         $search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
+        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://www.wpgeodirectory.com/dummy';
 

Braces +13 added lines, -10 removed lines

@@ -487,10 +487,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://www.wpgeodirectory.com/dummy';
+}
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
@@ -947,16 +948,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_hooks_actions.php

Braces +88 added lines, -71 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');

 

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

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

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

@@ -1190,8 +1194,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().

@@ -1311,8 +1316,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');

     }

 

@@ -1368,17 +1374,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();
+                }
             }

         }

     }

@@ -1399,16 +1407,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];
+                }
                 }

 

 

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

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

 }

@@ -1837,40 +1855,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;

     }

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

 

@@ -1976,8 +1987,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]);
+        }
 

     }

 

@@ -2112,16 +2124,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;
+            }
         }

 

     }

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

 

@@ -2251,8 +2266,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'];

@@ -2273,8 +2289,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 {

 

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

                         $variables_array['value'] = '';

                         $variables_array['value'] = $post->{$type['htmlvar_name']};

-                    }else{

+                    } else{

                         $i = 0;

                         $fieldset_count++;

                         $field_set_start = 1;

Doc Comments +3 added lines, -2 removed lines

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

 {

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

  * @global object $current_user Current user object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

+ * @param string $user_id
  * @return array User listing count for each post type.

  */

 function geodir_user_post_listing_count($user_id=null)

@@ -2680,7 +2681,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();

Indentation +1087 added lines, -1087 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 virtural 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 virtural 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

 }

 

 

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

@@ -248,32 +248,32 @@ 
  */

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

 }

 

 

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

 

-        }

+		}

 

-    }

+	}

 }

 

 

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

 

 

-    }

+	}

 }

 

 

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

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

-    }

+	}

 }

 

 /**

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

+	}

 

 

 }

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

+	}

 }

 

 /**

@@ -500,42 +500,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;?>');

@@ -787,15 +787,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'); ?>",

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

+	}

 }

 

 /**

@@ -1078,94 +1078,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 surrent 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 surrent 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 surrent 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 surrent 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);

+	}

 }

 

 /**

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

+	}

 }

 

 

@@ -1219,15 +1219,15 @@ 
  */

 function geodir_localize_all_js_msg()

 {// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-    if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-    }

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

@@ -1237,60 +1237,60 @@ 
 	 */

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

-        /* 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 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'),

+		/* 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) : '',

@@ -1298,40 +1298,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' => __('Are 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' => __('Are 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);

@@ -1347,11 +1347,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*/

@@ -1377,25 +1377,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');

 

 }

 

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

@@ -1443,9 +1443,9 @@ 
  */

 function geodir_after_listing_post_gridview()

 {

-    global $gridview_columns;

+	global $gridview_columns;

 

-    $gridview_columns = '';

+	$gridview_columns = '';

 

 }

 

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

 }

 

 

@@ -1493,34 +1493,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

 

-    }

+	}

 }

 

 

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

 }

 

 

@@ -1596,69 +1596,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');

 

-    }

+	}

 

 }

 

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

 

 }

 

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

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

 }

 

 

@@ -1828,75 +1828,75 @@ 
  */

 function geodir_custom_page_title($title = '', $sep = '')

 {

-    global $wp;

-    if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

-        return $title;

-    }

+	global $wp;

+	if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

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

 

 }

 

@@ -1912,36 +1912,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');

 

-    }

+	}

 

 }

 

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

 

-    }

+	}

 

 }

 

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

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

 }

 

 

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

 

 }

 

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

+	}

 }

 

 

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

 

-    }

+	}

 

 }

 

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

 

-                }

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 }

 

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

+	}

 

 }

 

@@ -2348,27 +2348,27 @@ 
  */

 function geodir_user_post_listing_count($user_id=null)

 {

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

+	}

 

-    $user_id = $current_user->ID;

-    $all_postypes = geodir_get_posttypes();

-    $all_posts = get_option('geodir_listing_link_user_dashboard');

+	$user_id = $current_user->ID;

+	$all_postypes = geodir_get_posttypes();

+	$all_posts = get_option('geodir_listing_link_user_dashboard');

 

-    $user_listing = array();

-    if (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' )");

+	$user_listing = array();

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

 

-            if ($total_posts > 0) {

-                $user_listing[$ptype] = $total_posts;

-            }

-        }

-    }

+			if ($total_posts > 0) {

+				$user_listing[$ptype] = $total_posts;

+			}

+		}

+	}

 

-    return $user_listing;

+	return $user_listing;

 }

 

 

@@ -2388,189 +2388,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'] = '';

-                        $variables_array['value'] = $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'] = '';

+						$variables_array['value'] = $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 */

@@ -2594,39 +2594,39 @@ 
  */

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

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

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

+	}

 

 

 }

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

+	}

 }

 

 /**

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

 }

 

 /**

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

 

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

 

@@ -2718,36 +2718,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');

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

 }

 

 

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

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

 }

 

 /**

@@ -2826,15 +2826,15 @@ 
  * @package GeoDirectory

  */

 function geodir_wpml_set_filter() {

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

+	if (function_exists('icl_object_id')) {

+		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_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);

+	}

 }

 add_filter('plugins_loaded', 'geodir_wpml_set_filter');

 

@@ -2847,37 +2847,37 @@ 
  * @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 );
\ No newline at end of file

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

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

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

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

          *

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

     /**

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

          *

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

 

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

@@ -681,7 +681,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('');

             }

 

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

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

@@ -788,30 +788,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)",

@@ -819,7 +819,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)",

@@ -1026,18 +1026,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>

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

          *

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

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

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

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

          *

@@ -1196,8 +1196,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().

          *

@@ -1296,7 +1296,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(),

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

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

                 }

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

         }

 

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

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

         }

     }

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

             )

         );

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

 

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

 

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

 

                         }

 

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

 

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

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

 

     }

 	

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

 			}

 		}

 	}

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

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

     }

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

@@ -2013,7 +2013,7 @@ 
 {

     $user_id = get_current_user_id();

 

-    if(!$user_id){return $post;}

+    if (!$user_id) {return $post; }

 

     $gd_post_types = geodir_get_posttypes();

 

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

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

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

     }

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

 

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

 

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

 

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

 

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

 

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

     }

 

 }

@@ -2346,10 +2346,10 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @return array User listing count for each post type.

  */

-function geodir_user_post_listing_count($user_id=null)

+function geodir_user_post_listing_count($user_id = null)

 {

     global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

+    if (!$user_id) {

         $user_id = $current_user->ID;

     }

 

@@ -2360,7 +2360,7 @@ 
     $user_listing = array();

     if (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' )");

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

 

             if ($total_posts > 0) {

                 $user_listing[$ptype] = $total_posts;

@@ -2401,19 +2401,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]);

                 }

             }

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

                     }

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

@@ -2479,21 +2479,21 @@ 
                         $variables_array['label'] = __($type['site_title'], 'geodirectory');

                         $variables_array['value'] = '';

                         $variables_array['value'] = $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'];

 

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

 

 

                     /**

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

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

         }

     }

 

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

 }

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

 }

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

 

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

@@ -2861,7 +2861,7 @@ 
         }        

         

         if (!empty($keep_vars)) {

-            foreach ( $languages as $code => $url) {

+            foreach ($languages as $code => $url) {

                 $filter_url = $url['url'];

                 

                 foreach ($keep_vars as $var) {

@@ -2880,4 +2880,4 @@ 
 

     return $languages;

 }

-add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );
\ No newline at end of file
+add_filter('icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1);
\ No newline at end of file

geodirectory-templates/login_frm.php

Indentation +40 added lines, -40 removed lines

@@ -10,13 +10,13 @@ 
  */

 

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 

 }

 

@@ -38,37 +38,37 @@ 
     <h4>

         <?php

 

-            /**

-             * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);

+			/**

+			 * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);

 

-        ?>

+		?>

     </h4>

     <?php

-    if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

-    } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

-    }

+	if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

+		echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

+	} elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

+		echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

+	}

 

-    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+	if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

+		echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

 

-    do_action('geodir_login_error_messages');

+	do_action('geodir_login_error_messages');

 

-    ?>

+	?>

     <form name="cus_loginform" id="cus_loginform" method="post">

 

         <div class="form_row clearfix">

             <input placeholder='<?php echo USERNAME_TEXT; ?>' type="text" name="log" id="user_login"

                    value="<?php global $user_login;

-                   if (!isset($user_login)) {

-                       $user_login = '';

-                   }

-                   echo esc_attr($user_login); ?>" size="20" class="textfield"/>

+				   if (!isset($user_login)) {

+					   $user_login = '';

+				   }

+				   echo esc_attr($user_login); ?>" size="20" class="textfield"/>

             <span class="user_loginInfo"></span>

         </div>

 

@@ -79,14 +79,14 @@ 
         </div>

 

         <?php

-        /**

-         * This is a default WordPress action that calls any additional elements needed for any login forms.

-         *

-         * We use this action before the remember me checkbox on the sigin form.

-         *

-         * @since 1.0.0

-         */

-        do_action('login_form'); ?>

+		/**

+		 * This is a default WordPress action that calls any additional elements needed for any login forms.

+		 *

+		 * We use this action before the remember me checkbox on the sigin form.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('login_form'); ?>

         <p class="rember">

             <input name="rememberme" type="checkbox" id="rememberme" value="forever" class="fl"/>

             <?php echo REMEMBER_ON_COMPUTER_TEXT; ?>

@@ -110,12 +110,12 @@ 
                 <input placeholder='<?php echo USERNAME_EMAIL_TEXT; ?>' type="text" name="user_login"

                        value="<?php echo esc_attr($user_login); ?>" size="20" class="user_login1 textfield"/>

                 <?php

-                /**

-                 * Called before the get new password button in the login box template.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('lostpassword_form'); ?>

+				/**

+				 * Called before the get new password button in the login box template.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('lostpassword_form'); ?>

             </div>

             <input type="submit" name="get_new_password" value="<?php echo GET_NEW_PW_TEXT; ?>" class="geodir_button"/>

         </form>

Spacing +3 added lines, -3 removed lines

@@ -49,13 +49,13 @@
     </h4>

     <?php

     if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

+        echo "<p class=\"error_msg\"> ".INVALID_USER_FPW_MSG." </p>";

     } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

+        echo "<p class=\"error_msg\"> ".INVALID_USER_PW_MSG." </p>";

     }

 

     if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+        echo '<p class="sucess_msg">'.PW_SEND_CONFIRM_MSG.'</p>';

 

     do_action('geodir_login_error_messages');

 

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
         echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

     }

 

-    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') {
+            echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';
+    }
 

     do_action('geodir_login_error_messages');

 

geodirectory-admin/google-api-php-client/src/Google/Auth/OAuth2.php

Doc Comments +2 added lines, -1 removed lines

@@ -500,7 +500,7 @@ 
    * @param [$issuer] the expected issues, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
    * @throws Google_Auth_Exception
-   * @return mixed token information if valid, false if not
+   * @return Google_Auth_LoginTicket token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
       $jwt,
@@ -626,6 +626,7 @@ 
 
   /**
    * Add a parameter to the auth params if not empty string.
+   * @param string $name
    */
   private function maybeAddParam($params, $name)
   {

Indentation +411 added lines, -411 removed lines

@@ -57,7 +57,7 @@ 
    */
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -72,8 +72,8 @@ 
    */
   public function authenticatedRequest(Google_Http_Request $request)
   {
-    $request = $this->sign($request);
-    return $this->client->getIo()->makeRequest($request);
+	$request = $this->sign($request);
+	return $this->client->getIo()->makeRequest($request);
   }
 
   /**
@@ -84,52 +84,52 @@ 
    */
   public function authenticate($code, $crossClient = false)
   {
-    if (strlen($code) == 0) {
-      throw new Google_Auth_Exception("Invalid code");
-    }
-
-    $arguments = array(
-          'code' => $code,
-          'grant_type' => 'authorization_code',
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
-    );
-
-    if ($crossClient !== true) {
-        $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
-    }
-
-    // We got here from the redirect from a successful authorization grant,
-    // fetch the access token
-    $request = new Google_Http_Request(
-        self::OAUTH2_TOKEN_URI,
-        'POST',
-        array(),
-        $arguments
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
-
-    if ($response->getResponseHttpCode() == 200) {
-      $this->setAccessToken($response->getResponseBody());
-      $this->token['created'] = time();
-      return $this->getAccessToken();
-    } else {
-      $decodedResponse = json_decode($response->getResponseBody(), true);
-      if ($decodedResponse != null && $decodedResponse['error']) {
-        $errorText = $decodedResponse['error'];
-        if (isset($decodedResponse['error_description'])) {
-          $errorText .= ": " . $decodedResponse['error_description'];
-        }
-      }
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Error fetching OAuth2 access token, message: '%s'",
-              $errorText
-          ),
-          $response->getResponseHttpCode()
-      );
-    }
+	if (strlen($code) == 0) {
+	  throw new Google_Auth_Exception("Invalid code");
+	}
+
+	$arguments = array(
+		  'code' => $code,
+		  'grant_type' => 'authorization_code',
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret')
+	);
+
+	if ($crossClient !== true) {
+		$arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
+	}
+
+	// We got here from the redirect from a successful authorization grant,
+	// fetch the access token
+	$request = new Google_Http_Request(
+		self::OAUTH2_TOKEN_URI,
+		'POST',
+		array(),
+		$arguments
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
+
+	if ($response->getResponseHttpCode() == 200) {
+	  $this->setAccessToken($response->getResponseBody());
+	  $this->token['created'] = time();
+	  return $this->getAccessToken();
+	} else {
+	  $decodedResponse = json_decode($response->getResponseBody(), true);
+	  if ($decodedResponse != null && $decodedResponse['error']) {
+		$errorText = $decodedResponse['error'];
+		if (isset($decodedResponse['error_description'])) {
+		  $errorText .= ": " . $decodedResponse['error_description'];
+		}
+	  }
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Error fetching OAuth2 access token, message: '%s'",
+			  $errorText
+		  ),
+		  $response->getResponseHttpCode()
+	  );
+	}
   }
 
   /**
@@ -141,37 +141,37 @@ 
    */
   public function createAuthUrl($scope)
   {
-    $params = array(
-        'response_type' => 'code',
-        'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
-        'client_id' => $this->client->getClassConfig($this, 'client_id'),
-        'scope' => $scope,
-        'access_type' => $this->client->getClassConfig($this, 'access_type'),
-    );
-
-    // Prefer prompt to approval prompt.
-    if ($this->client->getClassConfig($this, 'prompt')) {
-      $params = $this->maybeAddParam($params, 'prompt');
-    } else {
-      $params = $this->maybeAddParam($params, 'approval_prompt');
-    }
-    $params = $this->maybeAddParam($params, 'login_hint');
-    $params = $this->maybeAddParam($params, 'hd');
-    $params = $this->maybeAddParam($params, 'openid.realm');
-    $params = $this->maybeAddParam($params, 'include_granted_scopes');
-
-    // If the list of scopes contains plus.login, add request_visible_actions
-    // to auth URL.
-    $rva = $this->client->getClassConfig($this, 'request_visible_actions');
-    if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
-        $params['request_visible_actions'] = $rva;
-    }
-
-    if (isset($this->state)) {
-      $params['state'] = $this->state;
-    }
-
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
+	$params = array(
+		'response_type' => 'code',
+		'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
+		'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		'scope' => $scope,
+		'access_type' => $this->client->getClassConfig($this, 'access_type'),
+	);
+
+	// Prefer prompt to approval prompt.
+	if ($this->client->getClassConfig($this, 'prompt')) {
+	  $params = $this->maybeAddParam($params, 'prompt');
+	} else {
+	  $params = $this->maybeAddParam($params, 'approval_prompt');
+	}
+	$params = $this->maybeAddParam($params, 'login_hint');
+	$params = $this->maybeAddParam($params, 'hd');
+	$params = $this->maybeAddParam($params, 'openid.realm');
+	$params = $this->maybeAddParam($params, 'include_granted_scopes');
+
+	// If the list of scopes contains plus.login, add request_visible_actions
+	// to auth URL.
+	$rva = $this->client->getClassConfig($this, 'request_visible_actions');
+	if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
+		$params['request_visible_actions'] = $rva;
+	}
+
+	if (isset($this->state)) {
+	  $params['state'] = $this->state;
+	}
+
+	return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
   }
 
   /**
@@ -180,38 +180,38 @@ 
    */
   public function setAccessToken($token)
   {
-    $token = json_decode($token, true);
-    if ($token == null) {
-      throw new Google_Auth_Exception('Could not json decode the token');
-    }
-    if (! isset($token['access_token'])) {
-      throw new Google_Auth_Exception("Invalid token format");
-    }
-    $this->token = $token;
+	$token = json_decode($token, true);
+	if ($token == null) {
+	  throw new Google_Auth_Exception('Could not json decode the token');
+	}
+	if (! isset($token['access_token'])) {
+	  throw new Google_Auth_Exception("Invalid token format");
+	}
+	$this->token = $token;
   }
 
   public function getAccessToken()
   {
-    return json_encode($this->token);
+	return json_encode($this->token);
   }
 
   public function getRefreshToken()
   {
-    if (array_key_exists('refresh_token', $this->token)) {
-      return $this->token['refresh_token'];
-    } else {
-      return null;
-    }
+	if (array_key_exists('refresh_token', $this->token)) {
+	  return $this->token['refresh_token'];
+	} else {
+	  return null;
+	}
   }
 
   public function setState($state)
   {
-    $this->state = $state;
+	$this->state = $state;
   }
 
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
-    $this->assertionCredentials = $creds;
+	$this->assertionCredentials = $creds;
   }
 
   /**
@@ -222,43 +222,43 @@ 
    */
   public function sign(Google_Http_Request $request)
   {
-    // add the developer key to the request before signing it
-    if ($this->client->getClassConfig($this, 'developer_key')) {
-      $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
-    }
-
-    // Cannot sign the request without an OAuth access token.
-    if (null == $this->token && null == $this->assertionCredentials) {
-      return $request;
-    }
-
-    // Check if the token is set to expire in the next 30 seconds
-    // (or has already expired).
-    if ($this->isAccessTokenExpired()) {
-      if ($this->assertionCredentials) {
-        $this->refreshTokenWithAssertion();
-      } else {
-        $this->client->getLogger()->debug('OAuth2 access token expired');
-        if (! array_key_exists('refresh_token', $this->token)) {
-          $error = "The OAuth 2.0 access token has expired,"
-                  ." and a refresh token is not available. Refresh tokens"
-                  ." are not returned for responses that were auto-approved.";
-
-          $this->client->getLogger()->error($error);
-          throw new Google_Auth_Exception($error);
-        }
-        $this->refreshToken($this->token['refresh_token']);
-      }
-    }
-
-    $this->client->getLogger()->debug('OAuth2 authentication');
-
-    // Add the OAuth2 header to the request
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
-
-    return $request;
+	// add the developer key to the request before signing it
+	if ($this->client->getClassConfig($this, 'developer_key')) {
+	  $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
+	}
+
+	// Cannot sign the request without an OAuth access token.
+	if (null == $this->token && null == $this->assertionCredentials) {
+	  return $request;
+	}
+
+	// Check if the token is set to expire in the next 30 seconds
+	// (or has already expired).
+	if ($this->isAccessTokenExpired()) {
+	  if ($this->assertionCredentials) {
+		$this->refreshTokenWithAssertion();
+	  } else {
+		$this->client->getLogger()->debug('OAuth2 access token expired');
+		if (! array_key_exists('refresh_token', $this->token)) {
+		  $error = "The OAuth 2.0 access token has expired,"
+				  ." and a refresh token is not available. Refresh tokens"
+				  ." are not returned for responses that were auto-approved.";
+
+		  $this->client->getLogger()->error($error);
+		  throw new Google_Auth_Exception($error);
+		}
+		$this->refreshToken($this->token['refresh_token']);
+	  }
+	}
+
+	$this->client->getLogger()->debug('OAuth2 authentication');
+
+	// Add the OAuth2 header to the request
+	$request->setRequestHeaders(
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
+	);
+
+	return $request;
   }
 
   /**
@@ -268,14 +268,14 @@ 
    */
   public function refreshToken($refreshToken)
   {
-    $this->refreshTokenRequest(
-        array(
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
-          'refresh_token' => $refreshToken,
-          'grant_type' => 'refresh_token'
-        )
-    );
+	$this->refreshTokenRequest(
+		array(
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
+		  'refresh_token' => $refreshToken,
+		  'grant_type' => 'refresh_token'
+		)
+	);
   }
 
   /**
@@ -285,83 +285,83 @@ 
    */
   public function refreshTokenWithAssertion($assertionCredentials = null)
   {
-    if (!$assertionCredentials) {
-      $assertionCredentials = $this->assertionCredentials;
-    }
-
-    $cacheKey = $assertionCredentials->getCacheKey();
-
-    if ($cacheKey) {
-      // We can check whether we have a token available in the
-      // cache. If it is expired, we can retrieve a new one from
-      // the assertion.
-      $token = $this->client->getCache()->get($cacheKey);
-      if ($token) {
-        $this->setAccessToken($token);
-      }
-      if (!$this->isAccessTokenExpired()) {
-        return;
-      }
-    }
-
-    $this->client->getLogger()->debug('OAuth2 access token expired');
-    $this->refreshTokenRequest(
-        array(
-          'grant_type' => 'assertion',
-          'assertion_type' => $assertionCredentials->assertionType,
-          'assertion' => $assertionCredentials->generateAssertion(),
-        )
-    );
-
-    if ($cacheKey) {
-      // Attempt to cache the token.
-      $this->client->getCache()->set(
-          $cacheKey,
-          $this->getAccessToken()
-      );
-    }
+	if (!$assertionCredentials) {
+	  $assertionCredentials = $this->assertionCredentials;
+	}
+
+	$cacheKey = $assertionCredentials->getCacheKey();
+
+	if ($cacheKey) {
+	  // We can check whether we have a token available in the
+	  // cache. If it is expired, we can retrieve a new one from
+	  // the assertion.
+	  $token = $this->client->getCache()->get($cacheKey);
+	  if ($token) {
+		$this->setAccessToken($token);
+	  }
+	  if (!$this->isAccessTokenExpired()) {
+		return;
+	  }
+	}
+
+	$this->client->getLogger()->debug('OAuth2 access token expired');
+	$this->refreshTokenRequest(
+		array(
+		  'grant_type' => 'assertion',
+		  'assertion_type' => $assertionCredentials->assertionType,
+		  'assertion' => $assertionCredentials->generateAssertion(),
+		)
+	);
+
+	if ($cacheKey) {
+	  // Attempt to cache the token.
+	  $this->client->getCache()->set(
+		  $cacheKey,
+		  $this->getAccessToken()
+	  );
+	}
   }
 
   private function refreshTokenRequest($params)
   {
-    if (isset($params['assertion'])) {
-      $this->client->getLogger()->info(
-          'OAuth2 access token refresh with Signed JWT assertion grants.'
-      );
-    } else {
-      $this->client->getLogger()->info('OAuth2 access token refresh');
-    }
-
-    $http = new Google_Http_Request(
-        self::OAUTH2_TOKEN_URI,
-        'POST',
-        array(),
-        $params
-    );
-    $http->disableGzip();
-    $request = $this->client->getIo()->makeRequest($http);
-
-    $code = $request->getResponseHttpCode();
-    $body = $request->getResponseBody();
-    if (200 == $code) {
-      $token = json_decode($body, true);
-      if ($token == null) {
-        throw new Google_Auth_Exception("Could not json decode the access token");
-      }
-
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
-        throw new Google_Auth_Exception("Invalid token format");
-      }
-
-      if (isset($token['id_token'])) {
-        $this->token['id_token'] = $token['id_token'];
-      }
-      $this->token['access_token'] = $token['access_token'];
-      $this->token['expires_in'] = $token['expires_in'];
-      $this->token['created'] = time();
-    } else {
-      throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
-    }
+	if (isset($params['assertion'])) {
+	  $this->client->getLogger()->info(
+		  'OAuth2 access token refresh with Signed JWT assertion grants.'
+	  );
+	} else {
+	  $this->client->getLogger()->info('OAuth2 access token refresh');
+	}
+
+	$http = new Google_Http_Request(
+		self::OAUTH2_TOKEN_URI,
+		'POST',
+		array(),
+		$params
+	);
+	$http->disableGzip();
+	$request = $this->client->getIo()->makeRequest($http);
+
+	$code = $request->getResponseHttpCode();
+	$body = $request->getResponseBody();
+	if (200 == $code) {
+	  $token = json_decode($body, true);
+	  if ($token == null) {
+		throw new Google_Auth_Exception("Could not json decode the access token");
+	  }
+
+	  if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+		throw new Google_Auth_Exception("Invalid token format");
+	  }
+
+	  if (isset($token['id_token'])) {
+		$this->token['id_token'] = $token['id_token'];
+	  }
+	  $this->token['access_token'] = $token['access_token'];
+	  $this->token['expires_in'] = $token['expires_in'];
+	  $this->token['created'] = time();
+	} else {
+	  throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
+	}
   }
 
   /**
@@ -373,31 +373,31 @@ 
    */
   public function revokeToken($token = null)
   {
-    if (!$token) {
-      if (!$this->token) {
-        // Not initialized, no token to actually revoke
-        return false;
-      } elseif (array_key_exists('refresh_token', $this->token)) {
-        $token = $this->token['refresh_token'];
-      } else {
-        $token = $this->token['access_token'];
-      }
-    }
-    $request = new Google_Http_Request(
-        self::OAUTH2_REVOKE_URI,
-        'POST',
-        array(),
-        "token=$token"
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
-    $code = $response->getResponseHttpCode();
-    if ($code == 200) {
-      $this->token = null;
-      return true;
-    }
-
-    return false;
+	if (!$token) {
+	  if (!$this->token) {
+		// Not initialized, no token to actually revoke
+		return false;
+	  } elseif (array_key_exists('refresh_token', $this->token)) {
+		$token = $this->token['refresh_token'];
+	  } else {
+		$token = $this->token['access_token'];
+	  }
+	}
+	$request = new Google_Http_Request(
+		self::OAUTH2_REVOKE_URI,
+		'POST',
+		array(),
+		"token=$token"
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
+	$code = $response->getResponseHttpCode();
+	if ($code == 200) {
+	  $this->token = null;
+	  return true;
+	}
+
+	return false;
   }
 
   /**
@@ -406,15 +406,15 @@ 
    */
   public function isAccessTokenExpired()
   {
-    if (!$this->token || !isset($this->token['created'])) {
-      return true;
-    }
+	if (!$this->token || !isset($this->token['created'])) {
+	  return true;
+	}
 
-    // If the token is set to expire in the next 30 seconds.
-    $expired = ($this->token['created']
-        + ($this->token['expires_in'] - 30)) < time();
+	// If the token is set to expire in the next 30 seconds.
+	$expired = ($this->token['created']
+		+ ($this->token['expires_in'] - 30)) < time();
 
-    return $expired;
+	return $expired;
   }
 
   // Gets federated sign-on certificates to use for verifying identity tokens.
@@ -422,9 +422,9 @@ 
   // are PEM encoded certificates.
   private function getFederatedSignOnCerts()
   {
-    return $this->retrieveCertsFromLocation(
-        $this->client->getClassConfig($this, 'federated_signon_certs_url')
-    );
+	return $this->retrieveCertsFromLocation(
+		$this->client->getClassConfig($this, 'federated_signon_certs_url')
+	);
   }
 
   /**
@@ -436,36 +436,36 @@ 
    */
   public function retrieveCertsFromLocation($url)
   {
-    // If we're retrieving a local file, just grab it.
-    if ("http" != substr($url, 0, 4)) {
-      $file = file_get_contents($url);
-      if ($file) {
-        return json_decode($file, true);
-      } else {
-        throw new Google_Auth_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
-        );
-      }
-    }
-
-    // This relies on makeRequest caching certificate responses.
-    $request = $this->client->getIo()->makeRequest(
-        new Google_Http_Request(
-            $url
-        )
-    );
-    if ($request->getResponseHttpCode() == 200) {
-      $certs = json_decode($request->getResponseBody(), true);
-      if ($certs) {
-        return $certs;
-      }
-    }
-    throw new Google_Auth_Exception(
-        "Failed to retrieve verification certificates: '" .
-        $request->getResponseBody() . "'.",
-        $request->getResponseHttpCode()
-    );
+	// If we're retrieving a local file, just grab it.
+	if ("http" != substr($url, 0, 4)) {
+	  $file = file_get_contents($url);
+	  if ($file) {
+		return json_decode($file, true);
+	  } else {
+		throw new Google_Auth_Exception(
+			"Failed to retrieve verification certificates: '" .
+			$url . "'."
+		);
+	  }
+	}
+
+	// This relies on makeRequest caching certificate responses.
+	$request = $this->client->getIo()->makeRequest(
+		new Google_Http_Request(
+			$url
+		)
+	);
+	if ($request->getResponseHttpCode() == 200) {
+	  $certs = json_decode($request->getResponseBody(), true);
+	  if ($certs) {
+		return $certs;
+	  }
+	}
+	throw new Google_Auth_Exception(
+		"Failed to retrieve verification certificates: '" .
+		$request->getResponseBody() . "'.",
+		$request->getResponseHttpCode()
+	);
   }
 
   /**
@@ -480,15 +480,15 @@ 
    */
   public function verifyIdToken($id_token = null, $audience = null)
   {
-    if (!$id_token) {
-      $id_token = $this->token['id_token'];
-    }
-    $certs = $this->getFederatedSignonCerts();
-    if (!$audience) {
-      $audience = $this->client->getClassConfig($this, 'client_id');
-    }
-
-    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
+	if (!$id_token) {
+	  $id_token = $this->token['id_token'];
+	}
+	$certs = $this->getFederatedSignonCerts();
+	if (!$audience) {
+	  $audience = $this->client->getClassConfig($this, 'client_id');
+	}
+
+	return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
   }
 
   /**
@@ -503,125 +503,125 @@ 
    * @return mixed token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
-      $jwt,
-      $certs,
-      $required_audience,
-      $issuer = null,
-      $max_expiry = null
+	  $jwt,
+	  $certs,
+	  $required_audience,
+	  $issuer = null,
+	  $max_expiry = null
   ) {
-    if (!$max_expiry) {
-      // Set the maximum time we will accept a token for.
-      $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
-    }
-
-    $segments = explode(".", $jwt);
-    if (count($segments) != 3) {
-      throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
-    }
-    $signed = $segments[0] . "." . $segments[1];
-    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
-
-    // Parse envelope.
-    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
-    if (!$envelope) {
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
-    }
-
-    // Parse token
-    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
-    $payload = json_decode($json_body, true);
-    if (!$payload) {
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
-    }
-
-    // Check signature
-    $verified = false;
-    foreach ($certs as $keyName => $pem) {
-      $public_key = new Google_Verifier_Pem($pem);
-      if ($public_key->verify($signed, $signature)) {
-        $verified = true;
-        break;
-      }
-    }
-
-    if (!$verified) {
-      throw new Google_Auth_Exception("Invalid token signature: $jwt");
-    }
-
-    // Check issued-at timestamp
-    $iat = 0;
-    if (array_key_exists("iat", $payload)) {
-      $iat = $payload["iat"];
-    }
-    if (!$iat) {
-      throw new Google_Auth_Exception("No issue time in token: $json_body");
-    }
-    $earliest = $iat - self::CLOCK_SKEW_SECS;
-
-    // Check expiration timestamp
-    $now = time();
-    $exp = 0;
-    if (array_key_exists("exp", $payload)) {
-      $exp = $payload["exp"];
-    }
-    if (!$exp) {
-      throw new Google_Auth_Exception("No expiration time in token: $json_body");
-    }
-    if ($exp >= $now + $max_expiry) {
-      throw new Google_Auth_Exception(
-          sprintf("Expiration time too far in future: %s", $json_body)
-      );
-    }
-
-    $latest = $exp + self::CLOCK_SKEW_SECS;
-    if ($now < $earliest) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Token used too early, %s < %s: %s",
-              $now,
-              $earliest,
-              $json_body
-          )
-      );
-    }
-    if ($now > $latest) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Token used too late, %s > %s: %s",
-              $now,
-              $latest,
-              $json_body
-          )
-      );
-    }
-
-    $iss = $payload['iss'];
-    if ($issuer && $iss != $issuer) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Invalid issuer, %s != %s: %s",
-              $iss,
-              $issuer,
-              $json_body
-          )
-      );
-    }
-
-    // Check audience
-    $aud = $payload["aud"];
-    if ($aud != $required_audience) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Wrong recipient, %s != %s:",
-              $aud,
-              $required_audience,
-              $json_body
-          )
-      );
-    }
-
-    // All good.
-    return new Google_Auth_LoginTicket($envelope, $payload);
+	if (!$max_expiry) {
+	  // Set the maximum time we will accept a token for.
+	  $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
+	}
+
+	$segments = explode(".", $jwt);
+	if (count($segments) != 3) {
+	  throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
+	}
+	$signed = $segments[0] . "." . $segments[1];
+	$signature = Google_Utils::urlSafeB64Decode($segments[2]);
+
+	// Parse envelope.
+	$envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
+	if (!$envelope) {
+	  throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+	}
+
+	// Parse token
+	$json_body = Google_Utils::urlSafeB64Decode($segments[1]);
+	$payload = json_decode($json_body, true);
+	if (!$payload) {
+	  throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+	}
+
+	// Check signature
+	$verified = false;
+	foreach ($certs as $keyName => $pem) {
+	  $public_key = new Google_Verifier_Pem($pem);
+	  if ($public_key->verify($signed, $signature)) {
+		$verified = true;
+		break;
+	  }
+	}
+
+	if (!$verified) {
+	  throw new Google_Auth_Exception("Invalid token signature: $jwt");
+	}
+
+	// Check issued-at timestamp
+	$iat = 0;
+	if (array_key_exists("iat", $payload)) {
+	  $iat = $payload["iat"];
+	}
+	if (!$iat) {
+	  throw new Google_Auth_Exception("No issue time in token: $json_body");
+	}
+	$earliest = $iat - self::CLOCK_SKEW_SECS;
+
+	// Check expiration timestamp
+	$now = time();
+	$exp = 0;
+	if (array_key_exists("exp", $payload)) {
+	  $exp = $payload["exp"];
+	}
+	if (!$exp) {
+	  throw new Google_Auth_Exception("No expiration time in token: $json_body");
+	}
+	if ($exp >= $now + $max_expiry) {
+	  throw new Google_Auth_Exception(
+		  sprintf("Expiration time too far in future: %s", $json_body)
+	  );
+	}
+
+	$latest = $exp + self::CLOCK_SKEW_SECS;
+	if ($now < $earliest) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Token used too early, %s < %s: %s",
+			  $now,
+			  $earliest,
+			  $json_body
+		  )
+	  );
+	}
+	if ($now > $latest) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Token used too late, %s > %s: %s",
+			  $now,
+			  $latest,
+			  $json_body
+		  )
+	  );
+	}
+
+	$iss = $payload['iss'];
+	if ($issuer && $iss != $issuer) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Invalid issuer, %s != %s: %s",
+			  $iss,
+			  $issuer,
+			  $json_body
+		  )
+	  );
+	}
+
+	// Check audience
+	$aud = $payload["aud"];
+	if ($aud != $required_audience) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Wrong recipient, %s != %s:",
+			  $aud,
+			  $required_audience,
+			  $json_body
+		  )
+	  );
+	}
+
+	// All good.
+	return new Google_Auth_LoginTicket($envelope, $payload);
   }
 
   /**
@@ -629,10 +629,10 @@ 
    */
   private function maybeAddParam($params, $name)
   {
-    $param = $this->client->getClassConfig($this, $name);
-    if ($param != '') {
-      $params[$name] = $param;
-    }
-    return $params;
+	$param = $this->client->getClassConfig($this, $name);
+	if ($param != '') {
+	  $params[$name] = $param;
+	}
+	return $params;
   }
 }

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -119,7 +119,7 @@ 
       if ($decodedResponse != null && $decodedResponse['error']) {
         $errorText = $decodedResponse['error'];
         if (isset($decodedResponse['error_description'])) {
-          $errorText .= ": " . $decodedResponse['error_description'];
+          $errorText .= ": ".$decodedResponse['error_description'];
         }
       }
       throw new Google_Auth_Exception(
@@ -171,7 +171,7 @@ 
       $params['state'] = $this->state;
     }
 
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
+    return self::OAUTH2_AUTH_URL."?".http_build_query($params, '', '&');
   }
 
   /**
@@ -184,7 +184,7 @@ 
     if ($token == null) {
       throw new Google_Auth_Exception('Could not json decode the token');
     }
-    if (! isset($token['access_token'])) {
+    if (!isset($token['access_token'])) {
       throw new Google_Auth_Exception("Invalid token format");
     }
     $this->token = $token;
@@ -239,7 +239,7 @@ 
         $this->refreshTokenWithAssertion();
       } else {
         $this->client->getLogger()->debug('OAuth2 access token expired');
-        if (! array_key_exists('refresh_token', $this->token)) {
+        if (!array_key_exists('refresh_token', $this->token)) {
           $error = "The OAuth 2.0 access token has expired,"
                   ." and a refresh token is not available. Refresh tokens"
                   ." are not returned for responses that were auto-approved.";
@@ -255,7 +255,7 @@ 
 
     // Add the OAuth2 header to the request
     $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+        array('Authorization' => 'Bearer '.$this->token['access_token'])
     );
 
     return $request;
@@ -349,7 +349,7 @@ 
         throw new Google_Auth_Exception("Could not json decode the access token");
       }
 
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+      if (!isset($token['access_token']) || !isset($token['expires_in'])) {
         throw new Google_Auth_Exception("Invalid token format");
       }
 
@@ -443,8 +443,8 @@ 
         return json_decode($file, true);
       } else {
         throw new Google_Auth_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
+            "Failed to retrieve verification certificates: '".
+            $url."'."
         );
       }
     }
@@ -462,8 +462,8 @@ 
       }
     }
     throw new Google_Auth_Exception(
-        "Failed to retrieve verification certificates: '" .
-        $request->getResponseBody() . "'.",
+        "Failed to retrieve verification certificates: '".
+        $request->getResponseBody()."'.",
         $request->getResponseHttpCode()
     );
   }
@@ -518,20 +518,20 @@ 
     if (count($segments) != 3) {
       throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
     }
-    $signed = $segments[0] . "." . $segments[1];
+    $signed = $segments[0].".".$segments[1];
     $signature = Google_Utils::urlSafeB64Decode($segments[2]);
 
     // Parse envelope.
     $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
     if (!$envelope) {
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+      throw new Google_Auth_Exception("Can't parse token envelope: ".$segments[0]);
     }
 
     // Parse token
     $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
     $payload = json_decode($json_body, true);
     if (!$payload) {
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+      throw new Google_Auth_Exception("Can't parse token payload: ".$segments[1]);
     }
 
     // Check signature

geodirectory-admin/google-api-php-client/src/Google/Cache/File.php

Doc Comments +18 added lines

@@ -129,6 +129,9 @@ 
     );
   }
 
+  /**
+   * @param string $file
+   */
   private function getWriteableCacheFile($file)
   {
     return $this->getCacheFile($file, true);
@@ -139,6 +142,9 @@ 
     return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
 
+  /**
+   * @param boolean $forWrite
+   */
   private function getCacheDir($file, $forWrite)
   {
     // use the first 2 characters of the hash as a directory prefix
@@ -157,11 +163,17 @@ 
     return $storageDir;
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function acquireReadLock($storageFile)
   {
     return $this->acquireLock(LOCK_SH, $storageFile);
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function acquireWriteLock($storageFile)
   {
     $rc = $this->acquireLock(LOCK_EX, $storageFile);
@@ -175,6 +187,9 @@ 
     return $rc;
   }
 
+  /**
+   * @param integer $type
+   */
   private function acquireLock($type, $storageFile)
   {
     $mode = $type == LOCK_EX ? "w" : "r";
@@ -197,6 +212,9 @@ 
     return true;
   }
 
+  /**
+   * @param string $storageFile
+   */
   public function unlock($storageFile)
   {
     if ($this->fh) {

Indentation +122 added lines, -122 removed lines

@@ -40,167 +40,167 @@
 
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
-    $this->path = $this->client->getClassConfig($this, 'directory');
+	$this->client = $client;
+	$this->path = $this->client->getClassConfig($this, 'directory');
   }
 
   public function get($key, $expiration = false)
   {
-    $storageFile = $this->getCacheFile($key);
-    $data = false;
-
-    if (!file_exists($storageFile)) {
-      $this->client->getLogger()->debug(
-          'File cache miss',
-          array('key' => $key, 'file' => $storageFile)
-      );
-      return false;
-    }
-
-    if ($expiration) {
-      $mtime = filemtime($storageFile);
-      if ((time() - $mtime) >= $expiration) {
-        $this->client->getLogger()->debug(
-            'File cache miss (expired)',
-            array('key' => $key, 'file' => $storageFile)
-        );
-        $this->delete($key);
-        return false;
-      }
-    }
-
-    if ($this->acquireReadLock($storageFile)) {
-      if (filesize($storageFile) > 0) {
-        $data = fread($this->fh, filesize($storageFile));
-        $data =  unserialize($data);
-      } else {
-        $this->client->getLogger()->debug(
-            'Cache file was empty',
-            array('file' => $storageFile)
-        );
-      }
-      $this->unlock($storageFile);
-    }
-
-    $this->client->getLogger()->debug(
-        'File cache hit',
-        array('key' => $key, 'file' => $storageFile, 'var' => $data)
-    );
-
-    return $data;
+	$storageFile = $this->getCacheFile($key);
+	$data = false;
+
+	if (!file_exists($storageFile)) {
+	  $this->client->getLogger()->debug(
+		  'File cache miss',
+		  array('key' => $key, 'file' => $storageFile)
+	  );
+	  return false;
+	}
+
+	if ($expiration) {
+	  $mtime = filemtime($storageFile);
+	  if ((time() - $mtime) >= $expiration) {
+		$this->client->getLogger()->debug(
+			'File cache miss (expired)',
+			array('key' => $key, 'file' => $storageFile)
+		);
+		$this->delete($key);
+		return false;
+	  }
+	}
+
+	if ($this->acquireReadLock($storageFile)) {
+	  if (filesize($storageFile) > 0) {
+		$data = fread($this->fh, filesize($storageFile));
+		$data =  unserialize($data);
+	  } else {
+		$this->client->getLogger()->debug(
+			'Cache file was empty',
+			array('file' => $storageFile)
+		);
+	  }
+	  $this->unlock($storageFile);
+	}
+
+	$this->client->getLogger()->debug(
+		'File cache hit',
+		array('key' => $key, 'file' => $storageFile, 'var' => $data)
+	);
+
+	return $data;
   }
 
   public function set($key, $value)
   {
-    $storageFile = $this->getWriteableCacheFile($key);
-    if ($this->acquireWriteLock($storageFile)) {
-      // We serialize the whole request object, since we don't only want the
-      // responseContent but also the postBody used, headers, size, etc.
-      $data = serialize($value);
-      $result = fwrite($this->fh, $data);
-      $this->unlock($storageFile);
-
-      $this->client->getLogger()->debug(
-          'File cache set',
-          array('key' => $key, 'file' => $storageFile, 'var' => $value)
-      );
-    } else {
-      $this->client->getLogger()->notice(
-          'File cache set failed',
-          array('key' => $key, 'file' => $storageFile)
-      );
-    }
+	$storageFile = $this->getWriteableCacheFile($key);
+	if ($this->acquireWriteLock($storageFile)) {
+	  // We serialize the whole request object, since we don't only want the
+	  // responseContent but also the postBody used, headers, size, etc.
+	  $data = serialize($value);
+	  $result = fwrite($this->fh, $data);
+	  $this->unlock($storageFile);
+
+	  $this->client->getLogger()->debug(
+		  'File cache set',
+		  array('key' => $key, 'file' => $storageFile, 'var' => $value)
+	  );
+	} else {
+	  $this->client->getLogger()->notice(
+		  'File cache set failed',
+		  array('key' => $key, 'file' => $storageFile)
+	  );
+	}
   }
 
   public function delete($key)
   {
-    $file = $this->getCacheFile($key);
-    if (file_exists($file) && !unlink($file)) {
-      $this->client->getLogger()->error(
-          'File cache delete failed',
-          array('key' => $key, 'file' => $file)
-      );
-      throw new Google_Cache_Exception("Cache file could not be deleted");
-    }
-
-    $this->client->getLogger()->debug(
-        'File cache delete',
-        array('key' => $key, 'file' => $file)
-    );
+	$file = $this->getCacheFile($key);
+	if (file_exists($file) && !unlink($file)) {
+	  $this->client->getLogger()->error(
+		  'File cache delete failed',
+		  array('key' => $key, 'file' => $file)
+	  );
+	  throw new Google_Cache_Exception("Cache file could not be deleted");
+	}
+
+	$this->client->getLogger()->debug(
+		'File cache delete',
+		array('key' => $key, 'file' => $file)
+	);
   }
 
   private function getWriteableCacheFile($file)
   {
-    return $this->getCacheFile($file, true);
+	return $this->getCacheFile($file, true);
   }
 
   private function getCacheFile($file, $forWrite = false)
   {
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+	return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
 
   private function getCacheDir($file, $forWrite)
   {
-    // use the first 2 characters of the hash as a directory prefix
-    // this should prevent slowdowns due to huge directory listings
-    // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
-    if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0755, true)) {
-        $this->client->getLogger()->error(
-            'File cache creation failed',
-            array('dir' => $storageDir)
-        );
-        throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
-      }
-    }
-    return $storageDir;
+	// use the first 2 characters of the hash as a directory prefix
+	// this should prevent slowdowns due to huge directory listings
+	// and thus give some basic amount of scalability
+	$storageDir = $this->path . '/' . substr(md5($file), 0, 2);
+	if ($forWrite && ! is_dir($storageDir)) {
+	  if (! mkdir($storageDir, 0755, true)) {
+		$this->client->getLogger()->error(
+			'File cache creation failed',
+			array('dir' => $storageDir)
+		);
+		throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
+	  }
+	}
+	return $storageDir;
   }
 
   private function acquireReadLock($storageFile)
   {
-    return $this->acquireLock(LOCK_SH, $storageFile);
+	return $this->acquireLock(LOCK_SH, $storageFile);
   }
 
   private function acquireWriteLock($storageFile)
   {
-    $rc = $this->acquireLock(LOCK_EX, $storageFile);
-    if (!$rc) {
-      $this->client->getLogger()->notice(
-          'File cache write lock failed',
-          array('file' => $storageFile)
-      );
-      $this->delete($storageFile);
-    }
-    return $rc;
+	$rc = $this->acquireLock(LOCK_EX, $storageFile);
+	if (!$rc) {
+	  $this->client->getLogger()->notice(
+		  'File cache write lock failed',
+		  array('file' => $storageFile)
+	  );
+	  $this->delete($storageFile);
+	}
+	return $rc;
   }
 
   private function acquireLock($type, $storageFile)
   {
-    $mode = $type == LOCK_EX ? "w" : "r";
-    $this->fh = fopen($storageFile, $mode);
-    if (!$this->fh) {
-      $this->client->getLogger()->error(
-          'Failed to open file during lock acquisition',
-          array('file' => $storageFile)
-      );
-      return false;
-    }
-    $count = 0;
-    while (!flock($this->fh, $type | LOCK_NB)) {
-      // Sleep for 10ms.
-      usleep(10000);
-      if (++$count < self::MAX_LOCK_RETRIES) {
-        return false;
-      }
-    }
-    return true;
+	$mode = $type == LOCK_EX ? "w" : "r";
+	$this->fh = fopen($storageFile, $mode);
+	if (!$this->fh) {
+	  $this->client->getLogger()->error(
+		  'Failed to open file during lock acquisition',
+		  array('file' => $storageFile)
+	  );
+	  return false;
+	}
+	$count = 0;
+	while (!flock($this->fh, $type | LOCK_NB)) {
+	  // Sleep for 10ms.
+	  usleep(10000);
+	  if (++$count < self::MAX_LOCK_RETRIES) {
+		return false;
+	  }
+	}
+	return true;
   }
 
   public function unlock($storageFile)
   {
-    if ($this->fh) {
-      flock($this->fh, LOCK_UN);
-    }
+	if ($this->fh) {
+	  flock($this->fh, LOCK_UN);
+	}
   }
 }

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /*
@@ -72,7 +72,7 @@ 
     if ($this->acquireReadLock($storageFile)) {
       if (filesize($storageFile) > 0) {
         $data = fread($this->fh, filesize($storageFile));
-        $data =  unserialize($data);
+        $data = unserialize($data);
       } else {
         $this->client->getLogger()->debug(
             'Cache file was empty',
@@ -136,7 +136,7 @@ 
 
   private function getCacheFile($file, $forWrite = false)
   {
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+    return $this->getCacheDir($file, $forWrite).'/'.md5($file);
   }
 
   private function getCacheDir($file, $forWrite)
@@ -144,9 +144,9 @@ 
     // use the first 2 characters of the hash as a directory prefix
     // this should prevent slowdowns due to huge directory listings
     // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
-    if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0755, true)) {
+    $storageDir = $this->path.'/'.substr(md5($file), 0, 2);
+    if ($forWrite && !is_dir($storageDir)) {
+      if (!mkdir($storageDir, 0755, true)) {
         $this->client->getLogger()->error(
             'File cache creation failed',
             array('dir' => $storageDir)

geodirectory-admin/google-api-php-client/src/Google/Client.php

Doc Comments +3 added lines, -2 removed lines

@@ -191,7 +191,7 @@ 
 
   /**
    * @throws Google_Auth_Exception
-   * @return array
+   * @return string
    * @visible For Testing
    */
   public function prepareScopes()
@@ -490,7 +490,7 @@ 
    * @param $audience string the expected consumer of the token
    * @param $issuer string the expected issuer, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
-   * @return mixed token information if valid, false if not
+   * @return Google_Auth_LoginTicket token information if valid, false if not
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
@@ -512,6 +512,7 @@ 
    * Will remove any previously configured scopes.
    * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login',
    * 'https://www.googleapis.com/auth/moderator')
+   * @param string[] $scopes
    */
   public function setScopes($scopes)
   {

Indentation +160 added lines, -160 removed lines

@@ -74,32 +74,32 @@ 
    */
   public function __construct($config = null)
   {
-    if (is_string($config) && strlen($config)) {
-      $config = new Google_Config($config);
-    } else if ( !($config instanceof Google_Config)) {
-      $config = new Google_Config();
+	if (is_string($config) && strlen($config)) {
+	  $config = new Google_Config($config);
+	} else if ( !($config instanceof Google_Config)) {
+	  $config = new Google_Config();
 
-      if ($this->isAppEngine()) {
-        // Automatically use Memcache if we're in AppEngine.
-        $config->setCacheClass('Google_Cache_Memcache');
-      }
+	  if ($this->isAppEngine()) {
+		// Automatically use Memcache if we're in AppEngine.
+		$config->setCacheClass('Google_Cache_Memcache');
+	  }
 
-      if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
-        // Automatically disable compress.zlib, as currently unsupported.
-        $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
-      }
-    }
+	  if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
+		// Automatically disable compress.zlib, as currently unsupported.
+		$config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
+	  }
+	}
 
-    if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
-      if (function_exists('curl_version') && function_exists('curl_exec')
-          && !$this->isAppEngine()) {
-        $config->setIoClass("Google_IO_Curl");
-      } else {
-        $config->setIoClass("Google_IO_Stream");
-      }
-    }
+	if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
+	  if (function_exists('curl_version') && function_exists('curl_exec')
+		  && !$this->isAppEngine()) {
+		$config->setIoClass("Google_IO_Curl");
+	  } else {
+		$config->setIoClass("Google_IO_Stream");
+	  }
+	}
 
-    $this->config = $config;
+	$this->config = $config;
   }
 
   /**
@@ -109,7 +109,7 @@ 
    */
   public function getLibraryVersion()
   {
-    return self::LIBVER;
+	return self::LIBVER;
   }
 
   /**
@@ -124,8 +124,8 @@ 
    */
   public function authenticate($code, $crossClient = false)
   {
-    $this->authenticated = true;
-    return $this->getAuth()->authenticate($code, $crossClient);
+	$this->authenticated = true;
+	return $this->getAuth()->authenticate($code, $crossClient);
   }
   
   /**
@@ -141,18 +141,18 @@ 
    */
   public function loadServiceAccountJson($jsonLocation, $scopes)
   {
-    $data = json_decode(file_get_contents($jsonLocation));
-    if (isset($data->type) && $data->type == 'service_account') {
-      // Service Account format.
-      $cred = new Google_Auth_AssertionCredentials(
-          $data->client_email,
-          $scopes,
-          $data->private_key
-      );
-      return $cred;
-    } else {
-      throw new Google_Exception("Invalid service account JSON file.");
-    }
+	$data = json_decode(file_get_contents($jsonLocation));
+	if (isset($data->type) && $data->type == 'service_account') {
+	  // Service Account format.
+	  $cred = new Google_Auth_AssertionCredentials(
+		  $data->client_email,
+		  $scopes,
+		  $data->private_key
+	  );
+	  return $cred;
+	} else {
+	  throw new Google_Exception("Invalid service account JSON file.");
+	}
   }
 
   /**
@@ -165,16 +165,16 @@ 
    */
   public function setAuthConfig($json)
   {
-    $data = json_decode($json);
-    $key = isset($data->installed) ? 'installed' : 'web';
-    if (!isset($data->$key)) {
-      throw new Google_Exception("Invalid client secret JSON file.");
-    }
-    $this->setClientId($data->$key->client_id);
-    $this->setClientSecret($data->$key->client_secret);
-    if (isset($data->$key->redirect_uris)) {
-      $this->setRedirectUri($data->$key->redirect_uris[0]);
-    }
+	$data = json_decode($json);
+	$key = isset($data->installed) ? 'installed' : 'web';
+	if (!isset($data->$key)) {
+	  throw new Google_Exception("Invalid client secret JSON file.");
+	}
+	$this->setClientId($data->$key->client_id);
+	$this->setClientSecret($data->$key->client_secret);
+	if (isset($data->$key->redirect_uris)) {
+	  $this->setRedirectUri($data->$key->redirect_uris[0]);
+	}
   }
 
   /**
@@ -186,7 +186,7 @@ 
    */
   public function setAuthConfigFile($file)
   {
-    $this->setAuthConfig(file_get_contents($file));
+	$this->setAuthConfig(file_get_contents($file));
   }
 
   /**
@@ -196,11 +196,11 @@ 
    */
   public function prepareScopes()
   {
-    if (empty($this->requestedScopes)) {
-      throw new Google_Auth_Exception("No scopes specified");
-    }
-    $scopes = implode(' ', $this->requestedScopes);
-    return $scopes;
+	if (empty($this->requestedScopes)) {
+	  throw new Google_Auth_Exception("No scopes specified");
+	}
+	$scopes = implode(' ', $this->requestedScopes);
+	return $scopes;
   }
 
   /**
@@ -212,10 +212,10 @@ 
    */
   public function setAccessToken($accessToken)
   {
-    if ($accessToken == 'null') {
-      $accessToken = null;
-    }
-    $this->getAuth()->setAccessToken($accessToken);
+	if ($accessToken == 'null') {
+	  $accessToken = null;
+	}
+	$this->getAuth()->setAccessToken($accessToken);
   }
 
 
@@ -226,8 +226,8 @@ 
    */
   public function setAuth(Google_Auth_Abstract $auth)
   {
-    $this->config->setAuthClass(get_class($auth));
-    $this->auth = $auth;
+	$this->config->setAuthClass(get_class($auth));
+	$this->auth = $auth;
   }
 
   /**
@@ -236,8 +236,8 @@ 
    */
   public function setIo(Google_IO_Abstract $io)
   {
-    $this->config->setIoClass(get_class($io));
-    $this->io = $io;
+	$this->config->setIoClass(get_class($io));
+	$this->io = $io;
   }
 
   /**
@@ -246,8 +246,8 @@ 
    */
   public function setCache(Google_Cache_Abstract $cache)
   {
-    $this->config->setCacheClass(get_class($cache));
-    $this->cache = $cache;
+	$this->config->setCacheClass(get_class($cache));
+	$this->cache = $cache;
   }
 
   /**
@@ -256,8 +256,8 @@ 
    */
   public function setLogger(Google_Logger_Abstract $logger)
   {
-    $this->config->setLoggerClass(get_class($logger));
-    $this->logger = $logger;
+	$this->config->setLoggerClass(get_class($logger));
+	$this->logger = $logger;
   }
 
   /**
@@ -266,8 +266,8 @@ 
    */
   public function createAuthUrl()
   {
-    $scopes = $this->prepareScopes();
-    return $this->getAuth()->createAuthUrl($scopes);
+	$scopes = $this->prepareScopes();
+	return $this->getAuth()->createAuthUrl($scopes);
   }
 
   /**
@@ -278,11 +278,11 @@ 
    */
   public function getAccessToken()
   {
-    $token = $this->getAuth()->getAccessToken();
-    // The response is json encoded, so could be the string null.
-    // It is arguable whether this check should be here or lower
-    // in the library.
-    return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
+	$token = $this->getAuth()->getAccessToken();
+	// The response is json encoded, so could be the string null.
+	// It is arguable whether this check should be here or lower
+	// in the library.
+	return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
   }
 
   /**
@@ -291,7 +291,7 @@ 
    */
   public function getRefreshToken()
   {
-    return $this->getAuth()->getRefreshToken();
+	return $this->getAuth()->getRefreshToken();
   }
 
   /**
@@ -300,7 +300,7 @@ 
    */
   public function isAccessTokenExpired()
   {
-    return $this->getAuth()->isAccessTokenExpired();
+	return $this->getAuth()->isAccessTokenExpired();
   }
 
   /**
@@ -310,7 +310,7 @@ 
    */
   public function setState($state)
   {
-    $this->getAuth()->setState($state);
+	$this->getAuth()->setState($state);
   }
 
   /**
@@ -320,7 +320,7 @@ 
    */
   public function setAccessType($accessType)
   {
-    $this->config->setAccessType($accessType);
+	$this->config->setAccessType($accessType);
   }
 
   /**
@@ -330,7 +330,7 @@ 
    */
   public function setApprovalPrompt($approvalPrompt)
   {
-    $this->config->setApprovalPrompt($approvalPrompt);
+	$this->config->setApprovalPrompt($approvalPrompt);
   }
 
   /**
@@ -339,7 +339,7 @@ 
    */
   public function setLoginHint($loginHint)
   {
-      $this->config->setLoginHint($loginHint);
+	  $this->config->setLoginHint($loginHint);
   }
 
   /**
@@ -348,7 +348,7 @@ 
    */
   public function setApplicationName($applicationName)
   {
-    $this->config->setApplicationName($applicationName);
+	$this->config->setApplicationName($applicationName);
   }
 
   /**
@@ -357,7 +357,7 @@ 
    */
   public function setClientId($clientId)
   {
-    $this->config->setClientId($clientId);
+	$this->config->setClientId($clientId);
   }
 
   /**
@@ -366,7 +366,7 @@ 
    */
   public function setClientSecret($clientSecret)
   {
-    $this->config->setClientSecret($clientSecret);
+	$this->config->setClientSecret($clientSecret);
   }
 
   /**
@@ -375,7 +375,7 @@ 
    */
   public function setRedirectUri($redirectUri)
   {
-    $this->config->setRedirectUri($redirectUri);
+	$this->config->setRedirectUri($redirectUri);
   }
 
   /**
@@ -388,10 +388,10 @@ 
    */
   public function setRequestVisibleActions($requestVisibleActions)
   {
-    if (is_array($requestVisibleActions)) {
-      $requestVisibleActions = join(" ", $requestVisibleActions);
-    }
-    $this->config->setRequestVisibleActions($requestVisibleActions);
+	if (is_array($requestVisibleActions)) {
+	  $requestVisibleActions = join(" ", $requestVisibleActions);
+	}
+	$this->config->setRequestVisibleActions($requestVisibleActions);
   }
 
   /**
@@ -401,7 +401,7 @@ 
    */
   public function setDeveloperKey($developerKey)
   {
-    $this->config->setDeveloperKey($developerKey);
+	$this->config->setDeveloperKey($developerKey);
   }
 
   /**
@@ -412,7 +412,7 @@ 
    */
   public function setHostedDomain($hd)
   {
-    $this->config->setHostedDomain($hd);
+	$this->config->setHostedDomain($hd);
   }
 
   /**
@@ -423,7 +423,7 @@ 
    */
   public function setPrompt($prompt)
   {
-    $this->config->setPrompt($prompt);
+	$this->config->setPrompt($prompt);
   }
 
   /**
@@ -434,7 +434,7 @@ 
    */
   public function setOpenidRealm($realm)
   {
-    $this->config->setOpenidRealm($realm);
+	$this->config->setOpenidRealm($realm);
   }
 
   /**
@@ -445,7 +445,7 @@ 
    */
   public function setIncludeGrantedScopes($include)
   {
-    $this->config->setIncludeGrantedScopes($include);
+	$this->config->setIncludeGrantedScopes($include);
   }
 
   /**
@@ -454,7 +454,7 @@ 
    */
   public function refreshToken($refreshToken)
   {
-    $this->getAuth()->refreshToken($refreshToken);
+	$this->getAuth()->refreshToken($refreshToken);
   }
 
   /**
@@ -466,7 +466,7 @@ 
    */
   public function revokeToken($token = null)
   {
-    return $this->getAuth()->revokeToken($token);
+	return $this->getAuth()->revokeToken($token);
   }
 
   /**
@@ -479,7 +479,7 @@ 
    */
   public function verifyIdToken($token = null)
   {
-    return $this->getAuth()->verifyIdToken($token);
+	return $this->getAuth()->verifyIdToken($token);
   }
 
   /**
@@ -494,9 +494,9 @@ 
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
-    $auth = new Google_Auth_OAuth2($this);
-    $certs = $auth->retrieveCertsFromLocation($cert_location);
-    return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
+	$auth = new Google_Auth_OAuth2($this);
+	$certs = $auth->retrieveCertsFromLocation($cert_location);
+	return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
   }
 
   /**
@@ -504,7 +504,7 @@ 
    */
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
-    $this->getAuth()->setAssertionCredentials($creds);
+	$this->getAuth()->setAssertionCredentials($creds);
   }
 
   /**
@@ -515,8 +515,8 @@ 
    */
   public function setScopes($scopes)
   {
-    $this->requestedScopes = array();
-    $this->addScope($scopes);
+	$this->requestedScopes = array();
+	$this->addScope($scopes);
   }
 
   /**
@@ -528,13 +528,13 @@ 
    */
   public function addScope($scope_or_scopes)
   {
-    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
-      $this->requestedScopes[] = $scope_or_scopes;
-    } else if (is_array($scope_or_scopes)) {
-      foreach ($scope_or_scopes as $scope) {
-        $this->addScope($scope);
-      }
-    }
+	if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
+	  $this->requestedScopes[] = $scope_or_scopes;
+	} else if (is_array($scope_or_scopes)) {
+	  foreach ($scope_or_scopes as $scope) {
+		$this->addScope($scope);
+	  }
+	}
   }
 
   /**
@@ -544,7 +544,7 @@ 
    */
   public function getScopes()
   {
-     return $this->requestedScopes;
+	 return $this->requestedScopes;
   }
 
   /**
@@ -556,8 +556,8 @@ 
    */
   public function setUseBatch($useBatch)
   {
-    // This is actually an alias for setDefer.
-    $this->setDefer($useBatch);
+	// This is actually an alias for setDefer.
+	$this->setDefer($useBatch);
   }
 
   /**
@@ -568,7 +568,7 @@ 
    */
   public function setDefer($defer)
   {
-    $this->deferExecution = $defer;
+	$this->deferExecution = $defer;
   }
 
   /**
@@ -580,22 +580,22 @@ 
    */
   public function execute($request)
   {
-    if ($request instanceof Google_Http_Request) {
-      $request->setUserAgent(
-          $this->getApplicationName()
-          . " " . self::USER_AGENT_SUFFIX
-          . $this->getLibraryVersion()
-      );
-      if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
-        $request->enableGzip();
-      }
-      $request->maybeMoveParametersToBody();
-      return Google_Http_REST::execute($this, $request);
-    } else if ($request instanceof Google_Http_Batch) {
-      return $request->execute();
-    } else {
-      throw new Google_Exception("Do not know how to execute this type of object.");
-    }
+	if ($request instanceof Google_Http_Request) {
+	  $request->setUserAgent(
+		  $this->getApplicationName()
+		  . " " . self::USER_AGENT_SUFFIX
+		  . $this->getLibraryVersion()
+	  );
+	  if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
+		$request->enableGzip();
+	  }
+	  $request->maybeMoveParametersToBody();
+	  return Google_Http_REST::execute($this, $request);
+	} else if ($request instanceof Google_Http_Batch) {
+	  return $request->execute();
+	} else {
+	  throw new Google_Exception("Do not know how to execute this type of object.");
+	}
   }
 
   /**
@@ -604,7 +604,7 @@ 
    */
   public function shouldDefer()
   {
-    return $this->deferExecution;
+	return $this->deferExecution;
   }
 
   /**
@@ -612,11 +612,11 @@ 
    */
   public function getAuth()
   {
-    if (!isset($this->auth)) {
-      $class = $this->config->getAuthClass();
-      $this->auth = new $class($this);
-    }
-    return $this->auth;
+	if (!isset($this->auth)) {
+	  $class = $this->config->getAuthClass();
+	  $this->auth = new $class($this);
+	}
+	return $this->auth;
   }
 
   /**
@@ -624,11 +624,11 @@ 
    */
   public function getIo()
   {
-    if (!isset($this->io)) {
-      $class = $this->config->getIoClass();
-      $this->io = new $class($this);
-    }
-    return $this->io;
+	if (!isset($this->io)) {
+	  $class = $this->config->getIoClass();
+	  $this->io = new $class($this);
+	}
+	return $this->io;
   }
 
   /**
@@ -636,11 +636,11 @@ 
    */
   public function getCache()
   {
-    if (!isset($this->cache)) {
-      $class = $this->config->getCacheClass();
-      $this->cache = new $class($this);
-    }
-    return $this->cache;
+	if (!isset($this->cache)) {
+	  $class = $this->config->getCacheClass();
+	  $this->cache = new $class($this);
+	}
+	return $this->cache;
   }
 
   /**
@@ -648,11 +648,11 @@ 
    */
   public function getLogger()
   {
-    if (!isset($this->logger)) {
-      $class = $this->config->getLoggerClass();
-      $this->logger = new $class($this);
-    }
-    return $this->logger;
+	if (!isset($this->logger)) {
+	  $class = $this->config->getLoggerClass();
+	  $this->logger = new $class($this);
+	}
+	return $this->logger;
   }
 
   /**
@@ -663,10 +663,10 @@ 
    */
   public function getClassConfig($class, $key = null)
   {
-    if (!is_string($class)) {
-      $class = get_class($class);
-    }
-    return $this->config->getClassConfig($class, $key);
+	if (!is_string($class)) {
+	  $class = get_class($class);
+	}
+	return $this->config->getClassConfig($class, $key);
   }
 
   /**
@@ -680,10 +680,10 @@ 
    */
   public function setClassConfig($class, $config, $value = null)
   {
-    if (!is_string($class)) {
-      $class = get_class($class);
-    }
-    $this->config->setClassConfig($class, $config, $value);
+	if (!is_string($class)) {
+	  $class = get_class($class);
+	}
+	$this->config->setClassConfig($class, $config, $value);
 
   }
 
@@ -692,7 +692,7 @@ 
    */
   public function getBasePath()
   {
-    return $this->config->getBasePath();
+	return $this->config->getBasePath();
   }
 
   /**
@@ -700,7 +700,7 @@ 
    */
   public function getApplicationName()
   {
-    return $this->config->getApplicationName();
+	return $this->config->getApplicationName();
   }
 
   /**
@@ -709,7 +709,7 @@ 
    */
   public function isAppEngine()
   {
-    return (isset($_SERVER['SERVER_SOFTWARE']) &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
+	return (isset($_SERVER['SERVER_SOFTWARE']) &&
+		strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
   }
 }

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/autoload.php';
+  require_once dirname(__FILE__).'/autoload.php';
 }
 
 /**
@@ -76,7 +76,7 @@ 
   {
     if (is_string($config) && strlen($config)) {
       $config = new Google_Config($config);
-    } else if ( !($config instanceof Google_Config)) {
+    } else if (!($config instanceof Google_Config)) {
       $config = new Google_Config();
 
       if ($this->isAppEngine()) {
@@ -583,7 +583,7 @@ 
     if ($request instanceof Google_Http_Request) {
       $request->setUserAgent(
           $this->getApplicationName()
-          . " " . self::USER_AGENT_SUFFIX
+          . " ".self::USER_AGENT_SUFFIX
           . $this->getLibraryVersion()
       );
       if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {

geodirectory-admin/google-api-php-client/src/Google/Http/Request.php

Doc Comments +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
   
   /**
    * Set the base URL that path and query parameters will be added to.
-   * @param $baseComponent string
+   * @param string $baseComponent string
    */
   public function setBaseComponent($baseComponent)
   {
@@ -132,7 +132,7 @@ 
 
   /**
    * Set a new query parameter.
-   * @param $key - string to set, does not need to be URL encoded
+   * @param string $key - string to set, does not need to be URL encoded
    * @param $value - string to set, does not need to be URL encoded
    */
   public function setQueryParam($key, $value)
@@ -141,7 +141,7 @@ 
   }
 
   /**
-   * @return string HTTP Response Code.
+   * @return integer HTTP Response Code.
    */
   public function getResponseHttpCode()
   {

Indentation +156 added lines, -156 removed lines

@@ -32,9 +32,9 @@ 
   const GZIP_UA = " (gzip)";
 
   private $batchHeaders = array(
-    'Content-Type' => 'application/http',
-    'Content-Transfer-Encoding' => 'binary',
-    'MIME-Version' => '1.0',
+	'Content-Type' => 'application/http',
+	'Content-Transfer-Encoding' => 'binary',
+	'MIME-Version' => '1.0',
   );
 
   protected $queryParams;
@@ -56,15 +56,15 @@ 
   public $accessKey;
 
   public function __construct(
-      $url,
-      $method = 'GET',
-      $headers = array(),
-      $postBody = null
+	  $url,
+	  $method = 'GET',
+	  $headers = array(),
+	  $postBody = null
   ) {
-    $this->setUrl($url);
-    $this->setRequestMethod($method);
-    $this->setRequestHeaders($headers);
-    $this->setPostBody($postBody);
+	$this->setUrl($url);
+	$this->setRequestMethod($method);
+	$this->setRequestHeaders($headers);
+	$this->setPostBody($postBody);
   }
 
   /**
@@ -74,7 +74,7 @@ 
    */
   public function getBaseComponent()
   {
-    return $this->baseComponent;
+	return $this->baseComponent;
   }
   
   /**
@@ -83,7 +83,7 @@ 
    */
   public function setBaseComponent($baseComponent)
   {
-    $this->baseComponent = rtrim($baseComponent, '/');
+	$this->baseComponent = rtrim($baseComponent, '/');
   }
   
   /**
@@ -91,9 +91,9 @@ 
    */
   public function enableGzip()
   {
-    $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
-    $this->canGzip = true;
-    $this->setUserAgent($this->userAgent);
+	$this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
+	$this->canGzip = true;
+	$this->setUserAgent($this->userAgent);
   }
   
   /**
@@ -101,14 +101,14 @@ 
    */
   public function disableGzip()
   {
-    if (
-        isset($this->requestHeaders['accept-encoding']) &&
-        $this->requestHeaders['accept-encoding'] == "gzip"
-    ) {
-      unset($this->requestHeaders['accept-encoding']);
-    }
-    $this->canGzip = false;
-    $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
+	if (
+		isset($this->requestHeaders['accept-encoding']) &&
+		$this->requestHeaders['accept-encoding'] == "gzip"
+	) {
+	  unset($this->requestHeaders['accept-encoding']);
+	}
+	$this->canGzip = false;
+	$this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
   }
   
   /**
@@ -117,7 +117,7 @@ 
    */
   public function canGzip()
   {
-    return $this->canGzip;
+	return $this->canGzip;
   }
 
   /**
@@ -127,7 +127,7 @@ 
    */
   public function getQueryParams()
   {
-    return $this->queryParams;
+	return $this->queryParams;
   }
 
   /**
@@ -137,7 +137,7 @@ 
    */
   public function setQueryParam($key, $value)
   {
-    $this->queryParams[$key] = $value;
+	$this->queryParams[$key] = $value;
   }
 
   /**
@@ -145,7 +145,7 @@ 
    */
   public function getResponseHttpCode()
   {
-    return (int) $this->responseHttpCode;
+	return (int) $this->responseHttpCode;
   }
 
   /**
@@ -153,7 +153,7 @@ 
    */
   public function setResponseHttpCode($responseHttpCode)
   {
-    $this->responseHttpCode = $responseHttpCode;
+	$this->responseHttpCode = $responseHttpCode;
   }
 
   /**
@@ -161,7 +161,7 @@ 
    */
   public function getResponseHeaders()
   {
-    return $this->responseHeaders;
+	return $this->responseHeaders;
   }
 
   /**
@@ -169,7 +169,7 @@ 
    */
   public function getResponseBody()
   {
-    return $this->responseBody;
+	return $this->responseBody;
   }
   
   /**
@@ -179,7 +179,7 @@ 
    */
   public function setExpectedClass($class)
   {
-    $this->expectedClass = $class;
+	$this->expectedClass = $class;
   }
   
   /**
@@ -188,7 +188,7 @@ 
    */
   public function getExpectedClass()
   {
-    return $this->expectedClass;
+	return $this->expectedClass;
   }
 
   /**
@@ -196,7 +196,7 @@ 
    */
   public function enableExpectedRaw()
   {
-    $this->expectedRaw = true;
+	$this->expectedRaw = true;
   }
 
   /**
@@ -204,7 +204,7 @@ 
    */
   public function disableExpectedRaw()
   {
-    $this->expectedRaw = false;
+	$this->expectedRaw = false;
   }
 
   /**
@@ -213,7 +213,7 @@ 
    */
   public function getExpectedRaw()
   {
-    return $this->expectedRaw;
+	return $this->expectedRaw;
   }
 
   /**
@@ -222,12 +222,12 @@ 
    */
   public function setResponseHeaders($headers)
   {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->responseHeaders) {
-      $headers = array_merge($this->responseHeaders, $headers);
-    }
+	$headers = Google_Utils::normalize($headers);
+	if ($this->responseHeaders) {
+	  $headers = array_merge($this->responseHeaders, $headers);
+	}
 
-    $this->responseHeaders = $headers;
+	$this->responseHeaders = $headers;
   }
 
   /**
@@ -237,9 +237,9 @@ 
    */
   public function getResponseHeader($key)
   {
-    return isset($this->responseHeaders[$key])
-        ? $this->responseHeaders[$key]
-        : false;
+	return isset($this->responseHeaders[$key])
+		? $this->responseHeaders[$key]
+		: false;
   }
 
   /**
@@ -247,7 +247,7 @@ 
    */
   public function setResponseBody($responseBody)
   {
-    $this->responseBody = $responseBody;
+	$this->responseBody = $responseBody;
   }
 
   /**
@@ -255,10 +255,10 @@ 
    */
   public function getUrl()
   {
-    return $this->baseComponent . $this->path .
-        (count($this->queryParams) ?
-            "?" . $this->buildQuery($this->queryParams) :
-            '');
+	return $this->baseComponent . $this->path .
+		(count($this->queryParams) ?
+			"?" . $this->buildQuery($this->queryParams) :
+			'');
   }
 
   /**
@@ -266,7 +266,7 @@ 
    */
   public function getRequestMethod()
   {
-    return $this->requestMethod;
+	return $this->requestMethod;
   }
 
   /**
@@ -274,7 +274,7 @@ 
    */
   public function getRequestHeaders()
   {
-    return $this->requestHeaders;
+	return $this->requestHeaders;
   }
 
   /**
@@ -284,9 +284,9 @@ 
    */
   public function getRequestHeader($key)
   {
-    return isset($this->requestHeaders[$key])
-        ? $this->requestHeaders[$key]
-        : false;
+	return isset($this->requestHeaders[$key])
+		? $this->requestHeaders[$key]
+		: false;
   }
 
   /**
@@ -294,7 +294,7 @@ 
    */
   public function getPostBody()
   {
-    return $this->postBody;
+	return $this->postBody;
   }
 
   /**
@@ -302,26 +302,26 @@ 
    */
   public function setUrl($url)
   {
-    if (substr($url, 0, 4) != 'http') {
-      // Force the path become relative.
-      if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
-      }
-    }
-    $parts = parse_url($url);
-    if (isset($parts['host'])) {
-      $this->baseComponent = sprintf(
-          "%s%s%s",
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
-          isset($parts['host']) ? $parts['host'] : '',
-          isset($parts['port']) ? ":" . $parts['port'] : ''
-      );
-    }
-    $this->path = isset($parts['path']) ? $parts['path'] : '';
-    $this->queryParams = array();
-    if (isset($parts['query'])) {
-      $this->queryParams = $this->parseQuery($parts['query']);
-    }
+	if (substr($url, 0, 4) != 'http') {
+	  // Force the path become relative.
+	  if (substr($url, 0, 1) !== '/') {
+		$url = '/' . $url;
+	  }
+	}
+	$parts = parse_url($url);
+	if (isset($parts['host'])) {
+	  $this->baseComponent = sprintf(
+		  "%s%s%s",
+		  isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+		  isset($parts['host']) ? $parts['host'] : '',
+		  isset($parts['port']) ? ":" . $parts['port'] : ''
+	  );
+	}
+	$this->path = isset($parts['path']) ? $parts['path'] : '';
+	$this->queryParams = array();
+	if (isset($parts['query'])) {
+	  $this->queryParams = $this->parseQuery($parts['query']);
+	}
   }
 
   /**
@@ -331,7 +331,7 @@ 
    */
   public function setRequestMethod($method)
   {
-    $this->requestMethod = strtoupper($method);
+	$this->requestMethod = strtoupper($method);
   }
 
   /**
@@ -340,11 +340,11 @@ 
    */
   public function setRequestHeaders($headers)
   {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->requestHeaders) {
-      $headers = array_merge($this->requestHeaders, $headers);
-    }
-    $this->requestHeaders = $headers;
+	$headers = Google_Utils::normalize($headers);
+	if ($this->requestHeaders) {
+	  $headers = array_merge($this->requestHeaders, $headers);
+	}
+	$this->requestHeaders = $headers;
   }
 
   /**
@@ -352,7 +352,7 @@ 
    */
   public function setPostBody($postBody)
   {
-    $this->postBody = $postBody;
+	$this->postBody = $postBody;
   }
 
   /**
@@ -361,10 +361,10 @@ 
    */
   public function setUserAgent($userAgent)
   {
-    $this->userAgent = $userAgent;
-    if ($this->canGzip) {
-      $this->userAgent = $userAgent . self::GZIP_UA;
-    }
+	$this->userAgent = $userAgent;
+	if ($this->canGzip) {
+	  $this->userAgent = $userAgent . self::GZIP_UA;
+	}
   }
 
   /**
@@ -372,7 +372,7 @@ 
    */
   public function getUserAgent()
   {
-    return $this->userAgent;
+	return $this->userAgent;
   }
 
   /**
@@ -383,29 +383,29 @@ 
    */
   public function getCacheKey()
   {
-    $key = $this->getUrl();
+	$key = $this->getUrl();
 
-    if (isset($this->accessKey)) {
-      $key .= $this->accessKey;
-    }
+	if (isset($this->accessKey)) {
+	  $key .= $this->accessKey;
+	}
 
-    if (isset($this->requestHeaders['authorization'])) {
-      $key .= $this->requestHeaders['authorization'];
-    }
+	if (isset($this->requestHeaders['authorization'])) {
+	  $key .= $this->requestHeaders['authorization'];
+	}
 
-    return md5($key);
+	return md5($key);
   }
 
   public function getParsedCacheControl()
   {
-    $parsed = array();
-    $rawCacheControl = $this->getResponseHeader('cache-control');
-    if ($rawCacheControl) {
-      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
-      parse_str($rawCacheControl, $parsed);
-    }
+	$parsed = array();
+	$rawCacheControl = $this->getResponseHeader('cache-control');
+	if ($rawCacheControl) {
+	  $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
+	  parse_str($rawCacheControl, $parsed);
+	}
 
-    return $parsed;
+	return $parsed;
   }
 
   /**
@@ -414,29 +414,29 @@ 
    */
   public function toBatchString($id)
   {
-    $str = '';
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
-        http_build_query($this->queryParams);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+	$str = '';
+	$path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+		http_build_query($this->queryParams);
+	$str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
 
-    foreach ($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
+	foreach ($this->getRequestHeaders() as $key => $val) {
+	  $str .= $key . ': ' . $val . "\n";
+	}
 
-    if ($this->getPostBody()) {
-      $str .= "\n";
-      $str .= $this->getPostBody();
-    }
+	if ($this->getPostBody()) {
+	  $str .= "\n";
+	  $str .= $this->getPostBody();
+	}
     
-    $headers = '';
-    foreach ($this->batchHeaders as $key => $val) {
-      $headers .= $key . ': ' . $val . "\n";
-    }
+	$headers = '';
+	foreach ($this->batchHeaders as $key => $val) {
+	  $headers .= $key . ': ' . $val . "\n";
+	}
 
-    $headers .= "Content-ID: $id\n";
-    $str = $headers . "\n" . $str;
+	$headers .= "Content-ID: $id\n";
+	$str = $headers . "\n" . $str;
 
-    return $str;
+	return $str;
   }
   
   /**
@@ -446,21 +446,21 @@ 
    */
   private function parseQuery($string)
   {
-    $return = array();
-    $parts = explode("&", $string);
-    foreach ($parts as $part) {
-      list($key, $value) = explode('=', $part, 2);
-      $value = urldecode($value);
-      if (isset($return[$key])) {
-        if (!is_array($return[$key])) {
-          $return[$key] = array($return[$key]);
-        }
-        $return[$key][] = $value;
-      } else {
-        $return[$key] = $value;
-      }
-    }
-    return $return;
+	$return = array();
+	$parts = explode("&", $string);
+	foreach ($parts as $part) {
+	  list($key, $value) = explode('=', $part, 2);
+	  $value = urldecode($value);
+	  if (isset($return[$key])) {
+		if (!is_array($return[$key])) {
+		  $return[$key] = array($return[$key]);
+		}
+		$return[$key][] = $value;
+	  } else {
+		$return[$key] = $value;
+	  }
+	}
+	return $return;
   }
   
   /**
@@ -470,17 +470,17 @@ 
    */
   private function buildQuery($parts)
   {
-    $return = array();
-    foreach ($parts as $key => $value) {
-      if (is_array($value)) {
-        foreach ($value as $v) {
-          $return[] = urlencode($key) . "=" . urlencode($v);
-        }
-      } else {
-        $return[] = urlencode($key) . "=" . urlencode($value);
-      }
-    }
-    return implode('&', $return);
+	$return = array();
+	foreach ($parts as $key => $value) {
+	  if (is_array($value)) {
+		foreach ($value as $v) {
+		  $return[] = urlencode($key) . "=" . urlencode($v);
+		}
+	  } else {
+		$return[] = urlencode($key) . "=" . urlencode($value);
+	  }
+	}
+	return implode('&', $return);
   }
   
   /**
@@ -490,15 +490,15 @@ 
    */
   public function maybeMoveParametersToBody()
   {
-    if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
-      $this->setRequestHeaders(
-          array(
-            "content-type" =>
-                "application/x-www-form-urlencoded; charset=UTF-8"
-          )
-      );
-      $this->setPostBody($this->buildQuery($this->queryParams));
-      $this->queryParams = array();
-    }
+	if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
+	  $this->setRequestHeaders(
+		  array(
+			"content-type" =>
+				"application/x-www-form-urlencoded; charset=UTF-8"
+		  )
+	  );
+	  $this->setPostBody($this->buildQuery($this->queryParams));
+	  $this->queryParams = array();
+	}
   }
 }

Spacing +14 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -255,10 +255,9 @@ 
    */
   public function getUrl()
   {
-    return $this->baseComponent . $this->path .
+    return $this->baseComponent.$this->path.
         (count($this->queryParams) ?
-            "?" . $this->buildQuery($this->queryParams) :
-            '');
+            "?".$this->buildQuery($this->queryParams) : '');
   }
 
   /**
@@ -305,16 +304,16 @@ 
     if (substr($url, 0, 4) != 'http') {
       // Force the path become relative.
       if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
+        $url = '/'.$url;
       }
     }
     $parts = parse_url($url);
     if (isset($parts['host'])) {
       $this->baseComponent = sprintf(
           "%s%s%s",
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+          isset($parts['scheme']) ? $parts['scheme']."://" : '',
           isset($parts['host']) ? $parts['host'] : '',
-          isset($parts['port']) ? ":" . $parts['port'] : ''
+          isset($parts['port']) ? ":".$parts['port'] : ''
       );
     }
     $this->path = isset($parts['path']) ? $parts['path'] : '';
@@ -363,7 +362,7 @@ 
   {
     $this->userAgent = $userAgent;
     if ($this->canGzip) {
-      $this->userAgent = $userAgent . self::GZIP_UA;
+      $this->userAgent = $userAgent.self::GZIP_UA;
     }
   }
 
@@ -415,12 +414,12 @@ 
   public function toBatchString($id)
   {
     $str = '';
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+    $path = parse_url($this->getUrl(), PHP_URL_PATH)."?".
         http_build_query($this->queryParams);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+    $str .= $this->getRequestMethod().' '.$path." HTTP/1.1\n";
 
     foreach ($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
+      $str .= $key.': '.$val."\n";
     }
 
     if ($this->getPostBody()) {
@@ -430,11 +429,11 @@ 
     
     $headers = '';
     foreach ($this->batchHeaders as $key => $val) {
-      $headers .= $key . ': ' . $val . "\n";
+      $headers .= $key.': '.$val."\n";
     }
 
     $headers .= "Content-ID: $id\n";
-    $str = $headers . "\n" . $str;
+    $str = $headers."\n".$str;
 
     return $str;
   }
@@ -474,10 +473,10 @@ 
     foreach ($parts as $key => $value) {
       if (is_array($value)) {
         foreach ($value as $v) {
-          $return[] = urlencode($key) . "=" . urlencode($v);
+          $return[] = urlencode($key)."=".urlencode($v);
         }
       } else {
-        $return[] = urlencode($key) . "=" . urlencode($value);
+        $return[] = urlencode($key)."=".urlencode($value);
       }
     }
     return implode('&', $return);

geodirectory-admin/google-api-php-client/src/Google/Logger/Abstract.php

Doc Comments +2 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
   /**
    * Logs with an arbitrary level.
    *
-   * @param mixed $level    The log level
+   * @param string $level    The log level
    * @param string $message The log message
    * @param array $context  The log context
    */
@@ -380,7 +380,7 @@ 
   /**
    * Converts a given log level to the integer form.
    *
-   * @param  mixed $level   The logging level
+   * @param  integer $level   The logging level
    * @return integer $level The normalized level
    * @throws Google_Logger_Exception If $level is invalid
    */

Indentation +111 added lines, -111 removed lines

@@ -88,14 +88,14 @@ 
    * @var array $levels Logging levels
    */
   protected static $levels = array(
-      self::EMERGENCY  => 600,
-      self::ALERT => 550,
-      self::CRITICAL => 500,
-      self::ERROR => 400,
-      self::WARNING => 300,
-      self::NOTICE => 250,
-      self::INFO => 200,
-      self::DEBUG => 100,
+	  self::EMERGENCY  => 600,
+	  self::ALERT => 550,
+	  self::CRITICAL => 500,
+	  self::ERROR => 400,
+	  self::WARNING => 300,
+	  self::NOTICE => 250,
+	  self::INFO => 200,
+	  self::DEBUG => 100,
   );
 
   /**
@@ -122,20 +122,20 @@ 
    */
   public function __construct(Google_Client $client)
   {
-    $this->setLevel(
-        $client->getClassConfig('Google_Logger_Abstract', 'level')
-    );
+	$this->setLevel(
+		$client->getClassConfig('Google_Logger_Abstract', 'level')
+	);
 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
-    $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
+	$this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
-    $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
+	$this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
 
-    $this->allowNewLines = (bool) $client->getClassConfig(
-        'Google_Logger_Abstract',
-        'allow_newlines'
-    );
+	$this->allowNewLines = (bool) $client->getClassConfig(
+		'Google_Logger_Abstract',
+		'allow_newlines'
+	);
   }
 
   /**
@@ -145,7 +145,7 @@ 
    */
   public function setLevel($level)
   {
-    $this->level = $this->normalizeLevel($level);
+	$this->level = $this->normalizeLevel($level);
   }
 
   /**
@@ -156,7 +156,7 @@ 
    */
   public function shouldHandle($level)
   {
-    return $this->normalizeLevel($level) >= $this->level;
+	return $this->normalizeLevel($level) >= $this->level;
   }
 
   /**
@@ -167,7 +167,7 @@ 
    */
   public function emergency($message, array $context = array())
   {
-    $this->log(self::EMERGENCY, $message, $context);
+	$this->log(self::EMERGENCY, $message, $context);
   }
 
   /**
@@ -181,7 +181,7 @@ 
    */
   public function alert($message, array $context = array())
   {
-    $this->log(self::ALERT, $message, $context);
+	$this->log(self::ALERT, $message, $context);
   }
 
   /**
@@ -194,7 +194,7 @@ 
    */
   public function critical($message, array $context = array())
   {
-    $this->log(self::CRITICAL, $message, $context);
+	$this->log(self::CRITICAL, $message, $context);
   }
 
   /**
@@ -206,7 +206,7 @@ 
    */
   public function error($message, array $context = array())
   {
-    $this->log(self::ERROR, $message, $context);
+	$this->log(self::ERROR, $message, $context);
   }
 
   /**
@@ -220,7 +220,7 @@ 
    */
   public function warning($message, array $context = array())
   {
-    $this->log(self::WARNING, $message, $context);
+	$this->log(self::WARNING, $message, $context);
   }
 
   /**
@@ -231,7 +231,7 @@ 
    */
   public function notice($message, array $context = array())
   {
-    $this->log(self::NOTICE, $message, $context);
+	$this->log(self::NOTICE, $message, $context);
   }
 
   /**
@@ -244,7 +244,7 @@ 
    */
   public function info($message, array $context = array())
   {
-    $this->log(self::INFO, $message, $context);
+	$this->log(self::INFO, $message, $context);
   }
 
   /**
@@ -255,7 +255,7 @@ 
    */
   public function debug($message, array $context = array())
   {
-    $this->log(self::DEBUG, $message, $context);
+	$this->log(self::DEBUG, $message, $context);
   }
 
   /**
@@ -267,21 +267,21 @@ 
    */
   public function log($level, $message, array $context = array())
   {
-    if (!$this->shouldHandle($level)) {
-      return false;
-    }
-
-    $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
-    $message = $this->interpolate(
-        array(
-            'message' => $message,
-            'context' => $context,
-            'level' => strtoupper($levelName),
-            'datetime' => new DateTime(),
-        )
-    );
-
-    $this->write($message);
+	if (!$this->shouldHandle($level)) {
+	  return false;
+	}
+
+	$levelName = is_int($level) ? array_search($level, self::$levels) : $level;
+	$message = $this->interpolate(
+		array(
+			'message' => $message,
+			'context' => $context,
+			'level' => strtoupper($levelName),
+			'datetime' => new DateTime(),
+		)
+	);
+
+	$this->write($message);
   }
 
   /**
@@ -292,26 +292,26 @@ 
    */
   protected function interpolate(array $variables = array())
   {
-    $template = $this->logFormat;
-
-    if (!$variables['context']) {
-      $template = str_replace('%context%', '', $template);
-      unset($variables['context']);
-    } else {
-      $this->reverseJsonInContext($variables['context']);
-    }
-
-    foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
-        $template = str_replace(
-            '%' . $key . '%',
-            $this->export($value),
-            $template
-        );
-      }
-    }
-
-    return $template;
+	$template = $this->logFormat;
+
+	if (!$variables['context']) {
+	  $template = str_replace('%context%', '', $template);
+	  unset($variables['context']);
+	} else {
+	  $this->reverseJsonInContext($variables['context']);
+	}
+
+	foreach ($variables as $key => $value) {
+	  if (strpos($template, '%'. $key .'%') !== false) {
+		$template = str_replace(
+			'%' . $key . '%',
+			$this->export($value),
+			$template
+		);
+	  }
+	}
+
+	return $template;
   }
 
   /**
@@ -321,20 +321,20 @@ 
    */
   protected function reverseJsonInContext(array &$context)
   {
-    if (!$context) {
-      return;
-    }
-
-    foreach ($context as $key => $val) {
-      if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
-        continue;
-      }
-
-      $json = @json_decode($val);
-      if (is_object($json) || is_array($json)) {
-        $context[$key] = $json;
-      }
-    }
+	if (!$context) {
+	  return;
+	}
+
+	foreach ($context as $key => $val) {
+	  if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
+		continue;
+	  }
+
+	  $json = @json_decode($val);
+	  if (is_object($json) || is_array($json)) {
+		$context[$key] = $json;
+	  }
+	}
   }
 
   /**
@@ -344,37 +344,37 @@ 
    */
   protected function export($value)
   {
-    if (is_string($value)) {
-      if ($this->allowNewLines) {
-        return $value;
-      }
+	if (is_string($value)) {
+	  if ($this->allowNewLines) {
+		return $value;
+	  }
 
-      return preg_replace('/[\r\n]+/', ' ', $value);
-    }
+	  return preg_replace('/[\r\n]+/', ' ', $value);
+	}
 
-    if (is_resource($value)) {
-      return sprintf(
-          'resource(%d) of type (%s)',
-          $value,
-          get_resource_type($value)
-      );
-    }
+	if (is_resource($value)) {
+	  return sprintf(
+		  'resource(%d) of type (%s)',
+		  $value,
+		  get_resource_type($value)
+	  );
+	}
 
-    if ($value instanceof DateTime) {
-      return $value->format($this->dateFormat);
-    }
+	if ($value instanceof DateTime) {
+	  return $value->format($this->dateFormat);
+	}
 
-    if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-      $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+	if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+	  $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
 
-      if ($this->allowNewLines) {
-        $options |= JSON_PRETTY_PRINT;
-      }
+	  if ($this->allowNewLines) {
+		$options |= JSON_PRETTY_PRINT;
+	  }
 
-      return @json_encode($value, $options);
-    }
+	  return @json_encode($value, $options);
+	}
 
-    return str_replace('\\/', '/', @json_encode($value));
+	return str_replace('\\/', '/', @json_encode($value));
   }
 
   /**
@@ -386,17 +386,17 @@ 
    */
   protected function normalizeLevel($level)
   {
-    if (is_int($level) && array_search($level, self::$levels) !== false) {
-      return $level;
-    }
+	if (is_int($level) && array_search($level, self::$levels) !== false) {
+	  return $level;
+	}
 
-    if (is_string($level) && isset(self::$levels[$level])) {
-      return self::$levels[$level];
-    }
+	if (is_string($level) && isset(self::$levels[$level])) {
+	  return self::$levels[$level];
+	}
 
-    throw new Google_Logger_Exception(
-        sprintf("Unknown LogLevel: '%s'", $level)
-    );
+	throw new Google_Logger_Exception(
+		sprintf("Unknown LogLevel: '%s'", $level)
+	);
   }
 
   /**

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -302,9 +302,9 @@ 
     }
 
     foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
+      if (strpos($template, '%'.$key.'%') !== false) {
         $template = str_replace(
-            '%' . $key . '%',
+            '%'.$key.'%',
             $this->export($value),
             $template
         );

geodirectory-admin/google-api-php-client/src/Google/Model.php

Doc Comments +4 added lines, -1 removed lines

@@ -221,7 +221,7 @@ 
   /**
    * Given a variable name, discover its type.
    *
-   * @param $name
+   * @param string $name
    * @param $item
    * @return object The object from the item.
    */
@@ -278,6 +278,9 @@ 
     return $key . "Type";
   }
 
+  /**
+   * @param string $key
+   */
   protected function dataType($key)
   {
     return $key . "DataType";

Indentation +126 added lines, -126 removed lines

@@ -38,12 +38,12 @@ 
    */
   final public function __construct()
   {
-    if (func_num_args() == 1 && is_array(func_get_arg(0))) {
-      // Initialize the model with the array's contents.
-      $array = func_get_arg(0);
-      $this->mapTypes($array);
-    }
-    $this->gapiInit();
+	if (func_num_args() == 1 && is_array(func_get_arg(0))) {
+	  // Initialize the model with the array's contents.
+	  $array = func_get_arg(0);
+	  $this->mapTypes($array);
+	}
+	$this->gapiInit();
   }
 
   /**
@@ -53,39 +53,39 @@ 
    */
   public function __get($key)
   {
-    $keyTypeName = $this->keyType($key);
-    $keyDataType = $this->dataType($key);
-    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
-      if (isset($this->modelData[$key])) {
-        $val = $this->modelData[$key];
-      } else if (isset($this->$keyDataType) &&
-          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
-        $val = array();
-      } else {
-        $val = null;
-      }
+	$keyTypeName = $this->keyType($key);
+	$keyDataType = $this->dataType($key);
+	if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
+	  if (isset($this->modelData[$key])) {
+		$val = $this->modelData[$key];
+	  } else if (isset($this->$keyDataType) &&
+		  ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
+		$val = array();
+	  } else {
+		$val = null;
+	  }
 
-      if ($this->isAssociativeArray($val)) {
-        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-          foreach ($val as $arrayKey => $arrayItem) {
-              $this->modelData[$key][$arrayKey] =
-                $this->createObjectFromName($keyTypeName, $arrayItem);
-          }
-        } else {
-          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
-        }
-      } else if (is_array($val)) {
-        $arrayObject = array();
-        foreach ($val as $arrayIndex => $arrayItem) {
-          $arrayObject[$arrayIndex] =
-            $this->createObjectFromName($keyTypeName, $arrayItem);
-        }
-        $this->modelData[$key] = $arrayObject;
-      }
-      $this->processed[$key] = true;
-    }
+	  if ($this->isAssociativeArray($val)) {
+		if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+		  foreach ($val as $arrayKey => $arrayItem) {
+			  $this->modelData[$key][$arrayKey] =
+				$this->createObjectFromName($keyTypeName, $arrayItem);
+		  }
+		} else {
+		  $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
+		}
+	  } else if (is_array($val)) {
+		$arrayObject = array();
+		foreach ($val as $arrayIndex => $arrayItem) {
+		  $arrayObject[$arrayIndex] =
+			$this->createObjectFromName($keyTypeName, $arrayItem);
+		}
+		$this->modelData[$key] = $arrayObject;
+	  }
+	  $this->processed[$key] = true;
+	}
 
-    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
+	return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
   }
 
   /**
@@ -96,19 +96,19 @@ 
    */
   protected function mapTypes($array)
   {
-    // Hard initialise simple types, lazy load more complex ones.
-    foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
-        property_exists($this, $key)) {
-          $this->$key = $val;
-          unset($array[$key]);
-      } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
-          // This checks if property exists as camelCase, leaving it in array as snake_case
-          // in case of backwards compatibility issues.
-          $this->$camelKey = $val;
-      }
-    }
-    $this->modelData = $array;
+	// Hard initialise simple types, lazy load more complex ones.
+	foreach ($array as $key => $val) {
+	  if ( !property_exists($this, $this->keyType($key)) &&
+		property_exists($this, $key)) {
+		  $this->$key = $val;
+		  unset($array[$key]);
+	  } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
+		  // This checks if property exists as camelCase, leaving it in array as snake_case
+		  // in case of backwards compatibility issues.
+		  $this->$camelKey = $val;
+	  }
+	}
+	$this->modelData = $array;
   }
 
   /**
@@ -118,7 +118,7 @@ 
    */
   protected function gapiInit()
   {
-    return;
+	return;
   }
 
   /**
@@ -129,29 +129,29 @@ 
    */
   public function toSimpleObject()
   {
-    $object = new stdClass();
+	$object = new stdClass();
 
-    // Process all other data.
-    foreach ($this->modelData as $key => $val) {
-      $result = $this->getSimpleValue($val);
-      if ($result !== null) {
-        $object->$key = $this->nullPlaceholderCheck($result);
-      }
-    }
+	// Process all other data.
+	foreach ($this->modelData as $key => $val) {
+	  $result = $this->getSimpleValue($val);
+	  if ($result !== null) {
+		$object->$key = $this->nullPlaceholderCheck($result);
+	  }
+	}
 
-    // Process all public properties.
-    $reflect = new ReflectionObject($this);
-    $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
-    foreach ($props as $member) {
-      $name = $member->getName();
-      $result = $this->getSimpleValue($this->$name);
-      if ($result !== null) {
-        $name = $this->getMappedName($name);
-        $object->$name = $this->nullPlaceholderCheck($result);
-      }
-    }
+	// Process all public properties.
+	$reflect = new ReflectionObject($this);
+	$props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
+	foreach ($props as $member) {
+	  $name = $member->getName();
+	  $result = $this->getSimpleValue($this->$name);
+	  if ($result !== null) {
+		$name = $this->getMappedName($name);
+		$object->$name = $this->nullPlaceholderCheck($result);
+	  }
+	}
 
-    return $object;
+	return $object;
   }
 
   /**
@@ -160,20 +160,20 @@ 
    */
   private function getSimpleValue($value)
   {
-    if ($value instanceof Google_Model) {
-      return $value->toSimpleObject();
-    } else if (is_array($value)) {
-      $return = array();
-      foreach ($value as $key => $a_value) {
-        $a_value = $this->getSimpleValue($a_value);
-        if ($a_value !== null) {
-          $key = $this->getMappedName($key);
-          $return[$key] = $this->nullPlaceholderCheck($a_value);
-        }
-      }
-      return $return;
-    }
-    return $value;
+	if ($value instanceof Google_Model) {
+	  return $value->toSimpleObject();
+	} else if (is_array($value)) {
+	  $return = array();
+	  foreach ($value as $key => $a_value) {
+		$a_value = $this->getSimpleValue($a_value);
+		if ($a_value !== null) {
+		  $key = $this->getMappedName($key);
+		  $return[$key] = $this->nullPlaceholderCheck($a_value);
+		}
+	  }
+	  return $return;
+	}
+	return $value;
   }
   
   /**
@@ -181,10 +181,10 @@ 
    */
   private function nullPlaceholderCheck($value)
   {
-    if ($value === self::NULL_VALUE) {
-      return null;
-    }
-    return $value;
+	if ($value === self::NULL_VALUE) {
+	  return null;
+	}
+	return $value;
   }
 
   /**
@@ -192,11 +192,11 @@ 
    */
   private function getMappedName($key)
   {
-    if (isset($this->internal_gapi_mappings) &&
-        isset($this->internal_gapi_mappings[$key])) {
-      $key = $this->internal_gapi_mappings[$key];
-    }
-    return $key;
+	if (isset($this->internal_gapi_mappings) &&
+		isset($this->internal_gapi_mappings[$key])) {
+	  $key = $this->internal_gapi_mappings[$key];
+	}
+	return $key;
   }
 
   /**
@@ -206,16 +206,16 @@ 
    */
   protected function isAssociativeArray($array)
   {
-    if (!is_array($array)) {
-      return false;
-    }
-    $keys = array_keys($array);
-    foreach ($keys as $key) {
-      if (is_string($key)) {
-        return true;
-      }
-    }
-    return false;
+	if (!is_array($array)) {
+	  return false;
+	}
+	$keys = array_keys($array);
+	foreach ($keys as $key) {
+	  if (is_string($key)) {
+		return true;
+	  }
+	}
+	return false;
   }
 
   /**
@@ -227,8 +227,8 @@ 
    */
   private function createObjectFromName($name, $item)
   {
-    $type = $this->$name;
-    return new $type($item);
+	$type = $this->$name;
+	return new $type($item);
   }
 
   /**
@@ -239,57 +239,57 @@ 
    */
   public function assertIsArray($obj, $method)
   {
-    if ($obj && !is_array($obj)) {
-      throw new Google_Exception(
-          "Incorrect parameter type passed to $method(). Expected an array."
-      );
-    }
+	if ($obj && !is_array($obj)) {
+	  throw new Google_Exception(
+		  "Incorrect parameter type passed to $method(). Expected an array."
+	  );
+	}
   }
 
   public function offsetExists($offset)
   {
-    return isset($this->$offset) || isset($this->modelData[$offset]);
+	return isset($this->$offset) || isset($this->modelData[$offset]);
   }
 
   public function offsetGet($offset)
   {
-    return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
+	return isset($this->$offset) ?
+		$this->$offset :
+		$this->__get($offset);
   }
 
   public function offsetSet($offset, $value)
   {
-    if (property_exists($this, $offset)) {
-      $this->$offset = $value;
-    } else {
-      $this->modelData[$offset] = $value;
-      $this->processed[$offset] = true;
-    }
+	if (property_exists($this, $offset)) {
+	  $this->$offset = $value;
+	} else {
+	  $this->modelData[$offset] = $value;
+	  $this->processed[$offset] = true;
+	}
   }
 
   public function offsetUnset($offset)
   {
-    unset($this->modelData[$offset]);
+	unset($this->modelData[$offset]);
   }
 
   protected function keyType($key)
   {
-    return $key . "Type";
+	return $key . "Type";
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+	return $key . "DataType";
   }
 
   public function __isset($key)
   {
-    return isset($this->modelData[$key]);
+	return isset($this->modelData[$key]);
   }
 
   public function __unset($key)
   {
-    unset($this->modelData[$key]);
+	unset($this->modelData[$key]);
   }
 }

Spacing +4 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
   {
     // Hard initialise simple types, lazy load more complex ones.
     foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
+      if (!property_exists($this, $this->keyType($key)) &&
         property_exists($this, $key)) {
           $this->$key = $val;
           unset($array[$key]);
@@ -254,8 +254,7 @@ 
   public function offsetGet($offset)
   {
     return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
+        $this->$offset : $this->__get($offset);
   }
 
   public function offsetSet($offset, $value)
@@ -275,12 +274,12 @@ 
 
   protected function keyType($key)
   {
-    return $key . "Type";
+    return $key."Type";
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+    return $key."DataType";
   }
 
   public function __isset($key)