Inspection of "Sometime click on pinpoint doesn't opens the map i..." - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — master (#411)

by Kiran

created 2017-06-22 11:32 UTC

Status

Indentation +173 added lines, -173 removed lines patch added patch discarded remove patch

@@ -11,142 +11,142 @@  discard block
 block discarded – undo
 //include the main class file
 require_once("Tax-meta-class.php");
 if (is_admin()) {
-    /*
+	/*
      * prefix of meta keys, optional
      * use underscore (_) at the beginning to make keys hidden, for example $prefix = '_ba_';
      *  you also can make prefix empty to disable it
      *
      */
 
-    $prefix = 'ct_';
-    /*
+	$prefix = 'ct_';
+	/*
      * configure your meta box
      */
 
-    $config = array(
-        'id' => 'demo_meta_box',                    // meta box id, unique per meta box
-        'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
-        'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
-        'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
-        'fields' => array(),                        // list of meta fields (can be added by field arrays)
-        'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
-        'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
-    );
+	$config = array(
+		'id' => 'demo_meta_box',                    // meta box id, unique per meta box
+		'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
+		'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
+		'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
+		'fields' => array(),                        // list of meta fields (can be added by field arrays)
+		'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
+		'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
+	);
 
 
-    /*
+	/*
      * Initiate your meta box
      */
-    $my_meta = new Geodir_Tax_Meta_Class($config);
-    $my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
-    /*$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));*/// hidden setting to trick WPML
-
-    $my_meta->addSelect($prefix . 'cat_schema',
-    /*
+	$my_meta = new Geodir_Tax_Meta_Class($config);
+	$my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
+	$my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
+	$my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
+	/*$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));*/// hidden setting to trick WPML
+
+	$my_meta->addSelect($prefix . 'cat_schema',
+	/*
      * Allows you to add/filter the cat schema types.
      *
      * @since 1.5.7
      */
-        apply_filters('geodir_cat_schemas',array(
-            '' => __('Default (LocalBusiness)', 'geodirectory'),
-            'AccountingService' => 'AccountingService',
-            'Attorney' => 'Attorney',
-            'AutoBodyShop' => 'AutoBodyShop',
-            'AutoDealer' => 'AutoDealer',
-            'AutoPartsStore' => 'AutoPartsStore',
-            'AutoRental' => 'AutoRental',
-            'AutoRepair' => 'AutoRepair',
-            'AutoWash' => 'AutoWash',
-            'Bakery' => 'Bakery',
-            'BarOrPub' => 'BarOrPub',
-            'BeautySalon' => 'BeautySalon',
-            'BedAndBreakfast' => 'BedAndBreakfast',
-            'BikeStore' => 'BikeStore',
-            'BookStore' => 'BookStore',
-            'CafeOrCoffeeShop' => 'CafeOrCoffeeShop',
-            'Campground' => 'Campground',
-            'ChildCare' => 'ChildCare',
-            'ClothingStore' => 'ClothingStore',
-            'ComputerStore' => 'ComputerStore',
-            'DaySpa' => 'DaySpa',
-            'Dentist' => 'Dentist',
-            'DryCleaningOrLaundry' => 'DryCleaningOrLaundry',
-            'Electrician' => 'Electrician',
-            'ElectronicsStore' => 'ElectronicsStore',
-            'EmergencyService' => 'EmergencyService',
-            'EntertainmentBusiness' => 'EntertainmentBusiness',
-            'Event' => 'Event',
-            'EventVenue' => 'EventVenue',
-            'ExerciseGym' => 'ExerciseGym',
-            'FinancialService' => 'FinancialService',
-            'Florist' => 'Florist',
-            'FoodEstablishment' => 'FoodEstablishment',
-            'FurnitureStore' => 'FurnitureStore',
-            'GardenStore' => 'GardenStore',
-            'GeneralContractor' => 'GeneralContractor',
-            'GolfCourse' => 'GolfCourse',
-            'HairSalon' => 'HairSalon',
-            'HardwareStore' => 'HardwareStore',
-            'HealthAndBeautyBusiness' => 'HealthAndBeautyBusiness',
-            'HobbyShop' => 'HobbyShop',
-            'HomeAndConstructionBusiness' => 'HomeAndConstructionBusiness',
-            'HomeGoodsStore' => 'HomeGoodsStore',
-            'Hospital' => 'Hospital',
-            'Hostel' => 'Hostel',
-            'Hotel' => 'Hotel',
-            'HousePainter' => 'HousePainter',
-            'HVACBusiness' => 'HVACBusiness',
-            'InsuranceAgency' => 'InsuranceAgency',
-            'JewelryStore' => 'JewelryStore',
-            'LiquorStore' => 'LiquorStore',
-            'Locksmith' => 'Locksmith',
-            'LodgingBusiness' => 'LodgingBusiness',
-            'MedicalClinic' => 'MedicalClinic',
-            'MensClothingStore' => 'MensClothingStore',
-            'MobilePhoneStore' => 'MobilePhoneStore',
-            'Motel' => 'Motel',
-            'MotorcycleDealer' => 'MotorcycleDealer',
-            'MotorcycleRepair' => 'MotorcycleRepair',
-            'MovingCompany' => 'MovingCompany',
-            'MusicStore' => 'MusicStore',
-            'NailSalon' => 'NailSalon',
-            'NightClub' => 'NightClub',
-            'Notary' => 'Notary',
-            'OfficeEquipmentStore' => 'OfficeEquipmentStore',
-            'Optician' => 'Optician',
-            'PetStore' => 'PetStore',
-            'Physician' => 'Physician',
-            'Plumber' => 'Plumber',
-            'ProfessionalService' => 'ProfessionalService',
-            'RealEstateAgent' => 'RealEstateAgent',
-            'Residence' => 'Residence',
-            'Restaurant' => 'Restaurant',
-            'RoofingContractor' => 'RoofingContractor',
-            'RVPark' => 'RVPark',
-            'School' => 'School',
-            'SelfStorage' => 'SelfStorage',
-            'ShoeStore' => 'ShoeStore',
-            'SkiResort' => 'SkiResort',
-            'SportingGoodsStore' => 'SportingGoodsStore',
-            'SportsClub' => 'SportsClub',
-            'Store' => 'Store',
-            'TattooParlor' => 'TattooParlor',
-            'Taxi' => 'Taxi',
-            'TennisComplex' => 'TennisComplex',
-            'TireShop' => 'TireShop',
-            'TouristAttraction' => 'TouristAttraction',
-            'ToyStore' => 'ToyStore',
-            'TravelAgency' => 'TravelAgency',
-            //'VacationRentals' => 'VacationRentals', // Not recognised by google yet
-            'VeterinaryCare' => 'VeterinaryCare',
-            'WholesaleStore' => 'WholesaleStore',
-            'Winery' => 'Winery'
-        )),
-        array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
-
-    /*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
+		apply_filters('geodir_cat_schemas',array(
+			'' => __('Default (LocalBusiness)', 'geodirectory'),
+			'AccountingService' => 'AccountingService',
+			'Attorney' => 'Attorney',
+			'AutoBodyShop' => 'AutoBodyShop',
+			'AutoDealer' => 'AutoDealer',
+			'AutoPartsStore' => 'AutoPartsStore',
+			'AutoRental' => 'AutoRental',
+			'AutoRepair' => 'AutoRepair',
+			'AutoWash' => 'AutoWash',
+			'Bakery' => 'Bakery',
+			'BarOrPub' => 'BarOrPub',
+			'BeautySalon' => 'BeautySalon',
+			'BedAndBreakfast' => 'BedAndBreakfast',
+			'BikeStore' => 'BikeStore',
+			'BookStore' => 'BookStore',
+			'CafeOrCoffeeShop' => 'CafeOrCoffeeShop',
+			'Campground' => 'Campground',
+			'ChildCare' => 'ChildCare',
+			'ClothingStore' => 'ClothingStore',
+			'ComputerStore' => 'ComputerStore',
+			'DaySpa' => 'DaySpa',
+			'Dentist' => 'Dentist',
+			'DryCleaningOrLaundry' => 'DryCleaningOrLaundry',
+			'Electrician' => 'Electrician',
+			'ElectronicsStore' => 'ElectronicsStore',
+			'EmergencyService' => 'EmergencyService',
+			'EntertainmentBusiness' => 'EntertainmentBusiness',
+			'Event' => 'Event',
+			'EventVenue' => 'EventVenue',
+			'ExerciseGym' => 'ExerciseGym',
+			'FinancialService' => 'FinancialService',
+			'Florist' => 'Florist',
+			'FoodEstablishment' => 'FoodEstablishment',
+			'FurnitureStore' => 'FurnitureStore',
+			'GardenStore' => 'GardenStore',
+			'GeneralContractor' => 'GeneralContractor',
+			'GolfCourse' => 'GolfCourse',
+			'HairSalon' => 'HairSalon',
+			'HardwareStore' => 'HardwareStore',
+			'HealthAndBeautyBusiness' => 'HealthAndBeautyBusiness',
+			'HobbyShop' => 'HobbyShop',
+			'HomeAndConstructionBusiness' => 'HomeAndConstructionBusiness',
+			'HomeGoodsStore' => 'HomeGoodsStore',
+			'Hospital' => 'Hospital',
+			'Hostel' => 'Hostel',
+			'Hotel' => 'Hotel',
+			'HousePainter' => 'HousePainter',
+			'HVACBusiness' => 'HVACBusiness',
+			'InsuranceAgency' => 'InsuranceAgency',
+			'JewelryStore' => 'JewelryStore',
+			'LiquorStore' => 'LiquorStore',
+			'Locksmith' => 'Locksmith',
+			'LodgingBusiness' => 'LodgingBusiness',
+			'MedicalClinic' => 'MedicalClinic',
+			'MensClothingStore' => 'MensClothingStore',
+			'MobilePhoneStore' => 'MobilePhoneStore',
+			'Motel' => 'Motel',
+			'MotorcycleDealer' => 'MotorcycleDealer',
+			'MotorcycleRepair' => 'MotorcycleRepair',
+			'MovingCompany' => 'MovingCompany',
+			'MusicStore' => 'MusicStore',
+			'NailSalon' => 'NailSalon',
+			'NightClub' => 'NightClub',
+			'Notary' => 'Notary',
+			'OfficeEquipmentStore' => 'OfficeEquipmentStore',
+			'Optician' => 'Optician',
+			'PetStore' => 'PetStore',
+			'Physician' => 'Physician',
+			'Plumber' => 'Plumber',
+			'ProfessionalService' => 'ProfessionalService',
+			'RealEstateAgent' => 'RealEstateAgent',
+			'Residence' => 'Residence',
+			'Restaurant' => 'Restaurant',
+			'RoofingContractor' => 'RoofingContractor',
+			'RVPark' => 'RVPark',
+			'School' => 'School',
+			'SelfStorage' => 'SelfStorage',
+			'ShoeStore' => 'ShoeStore',
+			'SkiResort' => 'SkiResort',
+			'SportingGoodsStore' => 'SportingGoodsStore',
+			'SportsClub' => 'SportsClub',
+			'Store' => 'Store',
+			'TattooParlor' => 'TattooParlor',
+			'Taxi' => 'Taxi',
+			'TennisComplex' => 'TennisComplex',
+			'TireShop' => 'TireShop',
+			'TouristAttraction' => 'TouristAttraction',
+			'ToyStore' => 'ToyStore',
+			'TravelAgency' => 'TravelAgency',
+			//'VacationRentals' => 'VacationRentals', // Not recognised by google yet
+			'VeterinaryCare' => 'VeterinaryCare',
+			'WholesaleStore' => 'WholesaleStore',
+			'Winery' => 'Winery'
+		)),
+		array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
+
+	/*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
     'random'=>__('Random','geodirectory'),
     'az'=>__('Alphabetical' , 'geodirectory'),
     'newest'=>__('Newest','geodirectory'),
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
     'low_review'=>__('Lowest Reviews','geodirectory')),
     array('name'=> __('Sort By','geodirectory'),'desc' => __('Select the default sort option.' ,'geodirectory'), 'std'=> array('selectkey2')));*/
 
-    // Show options for placecategories only
-    /*	if(isset($_REQUEST['taxonomy']) && in_array($_REQUEST['taxonomy'],$config['pages']) ){
+	// Show options for placecategories only
+	/*	if(isset($_REQUEST['taxonomy']) && in_array($_REQUEST['taxonomy'],$config['pages']) ){
         // Exclude sort options
         $my_meta->addCheckbox($prefix.'cat_exclude_rating',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory')));
         $my_meta->addCheckbox($prefix.'cat_exclude_reviews',array('name'=> __('<b>Exclude</b> Reviews sort option','geodirectory')));
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
 
         }*/
 
-    //Finish Meta Box Declaration
-    $my_meta->Finish();
+	//Finish Meta Box Declaration
+	$my_meta->Finish();
 }
 
 
@@ -180,86 +180,86 @@  discard block
 block discarded – undo
 ##############################################################
 $gd_taxonomies = geodir_get_taxonomies();
 if (!empty($gd_taxonomies)) {
-    foreach ($gd_taxonomies as $gd_taxonomy) {
+	foreach ($gd_taxonomies as $gd_taxonomy) {
 
-        add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
-        add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
+		add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
+		add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
 
-    }
+	}
 }
 
 function addCat_column($columns)
 {
-    if (isset($columns['description']) && $posts = $columns['description']) {
-        unset($columns['description']);
-    }
-
-    $columns['cat_icon'] = 'Icon';
-    $columns['cat_default_img'] = __('Default Image', 'geodirectory');
-    $columns['cat_ID_num'] = __('Cat ID', 'geodirectory');
-    return $columns;
+	if (isset($columns['description']) && $posts = $columns['description']) {
+		unset($columns['description']);
+	}
+
+	$columns['cat_icon'] = 'Icon';
+	$columns['cat_default_img'] = __('Default Image', 'geodirectory');
+	$columns['cat_ID_num'] = __('Cat ID', 'geodirectory');
+	return $columns;
 }
 
 #############################################################
 function manage_category_custom_fields($deprecated, $column_name, $term_id)
 {
-    if ($column_name == 'cat_ID_num')
-        echo $term_id;
+	if ($column_name == 'cat_ID_num')
+		echo $term_id;
 
-    if ($column_name == 'cat_icon') {
-        $term_icon_url = geodir_get_tax_meta($term_id, 'ct_cat_icon');
+	if ($column_name == 'cat_icon') {
+		$term_icon_url = geodir_get_tax_meta($term_id, 'ct_cat_icon');
 
-        if ($term_icon_url != '') {
-            $file_info = pathinfo($term_icon_url['src']);
+		if ($term_icon_url != '') {
+			$file_info = pathinfo($term_icon_url['src']);
 
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
-                $sub_dir = $file_info['dirname'];
-            } else {
-                $sub_dir = '';
-            }
+			if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+				$sub_dir = $file_info['dirname'];
+			} else {
+				$sub_dir = '';
+			}
 
-            $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
-            $uploads_baseurl = $uploads['baseurl'];
-            $uploads_path = $uploads['path'];
+			$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
+			$uploads_baseurl = $uploads['baseurl'];
+			$uploads_path = $uploads['path'];
 
-            $file_name = $file_info['basename'];
+			$file_name = $file_info['basename'];
 
-            if (strpos($sub_dir, 'https://') !== false) {
-                $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
-            } else {
-                $uploads['baseurl'] = str_replace('https://', 'http://', $uploads['baseurl']);
-            }
-            $sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
+			if (strpos($sub_dir, 'https://') !== false) {
+				$uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+			} else {
+				$uploads['baseurl'] = str_replace('https://', 'http://', $uploads['baseurl']);
+			}
+			$sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
 
-            $uploads_url = $uploads_baseurl . $sub_dir;
+			$uploads_url = $uploads_baseurl . $sub_dir;
 
-            $term_icon_url['src'] = $uploads_url . '/' . $file_name;
-            echo '<img src="' . $term_icon_url['src'] . '" />';
-        }
-    }
+			$term_icon_url['src'] = $uploads_url . '/' . $file_name;
+			echo '<img src="' . $term_icon_url['src'] . '" />';
+		}
+	}
 
-    if ($column_name == 'cat_default_img') {
-        $cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img');
-        if ($cat_default_img != '')
-            echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
+	if ($column_name == 'cat_default_img') {
+		$cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img');
+		if ($cat_default_img != '')
+			echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
 
-    }
+	}
 }
 
 function geodir_get_default_catimage($term_id, $post_type = 'gd_place')
 {
 
-    if ($cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
-        return $cat_default_img;
-    else
-        return false;
+	if ($cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
+		return $cat_default_img;
+	else
+		return false;
 }
 
 //Clear custom fields
 add_action('in_admin_footer', 'geodir_tax_meta_clear_custom_field');
 function geodir_tax_meta_clear_custom_field() {
-    if (isset($_REQUEST['taxonomy']) && !empty($_REQUEST['taxonomy'])):
-        ?>
+	if (isset($_REQUEST['taxonomy']) && !empty($_REQUEST['taxonomy'])):
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 jQuery('#addtag #submit').click(function () {
@@ -288,5 +288,5 @@  discard block
 block discarded – undo
             });
         </script>
     <?php
-    endif;
+	endif;
 }

Please login to merge, or discard this patch.

geodirectory_template_tags.php 1 patch

Indentation +344 added lines, -344 removed lines patch added patch discarded remove patch

@@ -36,175 +36,175 @@  discard block
 block discarded – undo
  */
 function geodir_templates_scripts()
 {
-    $is_detail_page = false;
-    $geodir_map_name = geodir_map_name();
+	$is_detail_page = false;
+	$geodir_map_name = geodir_map_name();
 
-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
-        $is_detail_page = true;
-    }
-
-    wp_enqueue_script('jquery');
-
-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('geodirectory-script');
-
-    $geodir_vars_data = array(
-        'siteurl' => get_option('siteurl'),
-        'geodir_plugin_url' => geodir_plugin_url(),
-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),
-        'geodir_ajax_url' => geodir_get_ajax_url(),
-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
-        'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
-    );
-
-    /**
-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
-     *
-     * This is used by addons to add JS translatable variables.
-     *
-     * @since 1.4.4
-     * @param array $geodir_vars_data {
-     *    geodir var data used by addons to add JS translatable variables.
-     *
-     *    @type string $siteurl Site url.
-     *    @type string $geodir_plugin_url Geodirectory core plugin url.
-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
-     *    @type int $is_rtl Checks if current locale is RTL.
-     *
-     * }
-     */
-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
-
-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
-
-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
-
-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
-    wp_enqueue_script('geodirectory-lightbox-jquery');
+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
+		$is_detail_page = true;
+	}
 
-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
-    if ($is_detail_page) {
-        wp_enqueue_script('geodirectory-jquery-simplemodal');
-    }
+	wp_enqueue_script('jquery');
+
+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('geodirectory-script');
+
+	$geodir_vars_data = array(
+		'siteurl' => get_option('siteurl'),
+		'geodir_plugin_url' => geodir_plugin_url(),
+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),
+		'geodir_ajax_url' => geodir_get_ajax_url(),
+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
+		'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
+	);
+
+	/**
+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
+	 *
+	 * This is used by addons to add JS translatable variables.
+	 *
+	 * @since 1.4.4
+	 * @param array $geodir_vars_data {
+	 *    geodir var data used by addons to add JS translatable variables.
+	 *
+	 *    @type string $siteurl Site url.
+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.
+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
+	 *    @type int $is_rtl Checks if current locale is RTL.
+	 *
+	 * }
+	 */
+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
+
+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
+
+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
+
+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
+	wp_enqueue_script('geodirectory-lightbox-jquery');
+
+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
+	if ($is_detail_page) {
+		wp_enqueue_script('geodirectory-jquery-simplemodal');
+	}
 
-    if (in_array($geodir_map_name, array('auto', 'google'))) {
-        $map_lang = "&language=" . geodir_get_map_default_language();
-        $map_key = "&key=" . geodir_get_map_api_key();
-        /**
-         * Filter the variables that are added to the end of the google maps script call.
-         *
-         * This i used to change things like google maps language etc.
-         *
-         * @since 1.0.0
-         * @param string $var The string to filter, default is empty string.
-         */
-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');
-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
+	if (in_array($geodir_map_name, array('auto', 'google'))) {
+		$map_lang = "&language=" . geodir_get_map_default_language();
+		$map_key = "&key=" . geodir_get_map_api_key();
+		/**
+		 * Filter the variables that are added to the end of the google maps script call.
+		 *
+		 * This i used to change things like google maps language etc.
+		 *
+		 * @since 1.0.0
+		 * @param string $var The string to filter, default is empty string.
+		 */
+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');
+		wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
         
-        // Overlapping Marker Spiderfier
-        wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-g-overlappingmarker-script');
-    }
+		// Overlapping Marker Spiderfier
+		wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-g-overlappingmarker-script');
+	}
     
-    if ($geodir_map_name == 'osm') {
-        // Leaflet OpenStreetMap
-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_style('geodirectory-leaflet-style');
+	if ($geodir_map_name == 'osm') {
+		// Leaflet OpenStreetMap
+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_style('geodirectory-leaflet-style');
             
-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-leaflet-script');
+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-leaflet-script');
         
-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-leaflet-geo-script');
+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-leaflet-geo-script');
         
-        if ($is_detail_page) {
-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
-            wp_enqueue_style('geodirectory-leaflet-routing-style');
+		if ($is_detail_page) {
+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
+			wp_enqueue_style('geodirectory-leaflet-routing-style');
                 
-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
-            wp_enqueue_script('geodirectory-leaflet-routing-script');
-        }
+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
+			wp_enqueue_script('geodirectory-leaflet-routing-script');
+		}
         
-        // Overlapping Marker Spiderfier Leaflet
-        wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
-        wp_enqueue_script('geodirectory-o-overlappingmarker-script');
-    }
-    wp_enqueue_script( 'jquery-ui-autocomplete' );
+		// Overlapping Marker Spiderfier Leaflet
+		wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
+		wp_enqueue_script('geodirectory-o-overlappingmarker-script');
+	}
+	wp_enqueue_script( 'jquery-ui-autocomplete' );
     
-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
-    wp_enqueue_script('geodirectory-goMap-script');
-
-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('chosen');
-
-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_script('geodirectory-choose-ajax');
-
-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
-
-    if (is_page() && geodir_is_page('add-listing')) {
-        // SCRIPT FOR UPLOAD
-        wp_enqueue_script('plupload-all');
-        wp_enqueue_script('jquery-ui-sortable');
-
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
-        wp_enqueue_script('geodirectory-plupload-script');
-        // SCRIPT FOR UPLOAD END
-
-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
-            $ajax_url = admin_url('admin-ajax.php');
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
-            $ajax_url = admin_url('admin-ajax.php');
-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
-        } else {
-            $ajax_url = admin_url('admin-ajax.php');
-        }
+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
+	wp_enqueue_script('geodirectory-goMap-script');
+
+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('chosen');
+
+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_script('geodirectory-choose-ajax');
+
+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
+
+	if (is_page() && geodir_is_page('add-listing')) {
+		// SCRIPT FOR UPLOAD
+		wp_enqueue_script('plupload-all');
+		wp_enqueue_script('jquery-ui-sortable');
+
+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
+		wp_enqueue_script('geodirectory-plupload-script');
+		// SCRIPT FOR UPLOAD END
+
+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
+			$ajax_url = admin_url('admin-ajax.php');
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
+			$ajax_url = admin_url('admin-ajax.php');
+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
+		} else {
+			$ajax_url = admin_url('admin-ajax.php');
+		}
 
-        // place js config array for plupload
-        $plupload_init = array(
-            'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',
-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
-            'container' => 'plupload-upload-ui', // will be adjusted per uploader
-            'drop_element' => 'dropbox', // will be adjusted per uploader
-            'file_data_name' => 'async-upload', // will be adjusted per uploader
-            'multiple_queues' => true,
-            'max_file_size' => geodir_max_upload_size(),
-            'url' => $ajax_url,
-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
-            'multipart' => true,
-            'urlstream_upload' => true,
-            'multi_selection' => false, // will be added per uploader
-            // additional post data to send to our ajax hook
-            'multipart_params' => array(
-                '_ajax_nonce' => "", // will be added per uploader
-                'action' => 'plupload_action', // the ajax action name
-                'imgid' => 0 // will be added per uploader
-            )
-        );
-        $base_plupload_config = json_encode($plupload_init);
-
-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
-            'upload_img_size' => geodir_max_upload_size());
-
-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
-
-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
-    } // End if for add place page
-
-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
-    if ($is_detail_page) {
+		// place js config array for plupload
+		$plupload_init = array(
+			'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',
+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
+			'container' => 'plupload-upload-ui', // will be adjusted per uploader
+			'drop_element' => 'dropbox', // will be adjusted per uploader
+			'file_data_name' => 'async-upload', // will be adjusted per uploader
+			'multiple_queues' => true,
+			'max_file_size' => geodir_max_upload_size(),
+			'url' => $ajax_url,
+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
+			'multipart' => true,
+			'urlstream_upload' => true,
+			'multi_selection' => false, // will be added per uploader
+			// additional post data to send to our ajax hook
+			'multipart_params' => array(
+				'_ajax_nonce' => "", // will be added per uploader
+				'action' => 'plupload_action', // the ajax action name
+				'imgid' => 0 // will be added per uploader
+			)
+		);
+		$base_plupload_config = json_encode($plupload_init);
+
+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
+			'upload_img_size' => geodir_max_upload_size());
+
+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
+
+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
+	} // End if for add place page
+
+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
+	if ($is_detail_page) {
 		wp_enqueue_script('geodirectory-post-custom-js');
 	}
 
-    // font awesome rating script
+	// font awesome rating script
 	if (get_option('geodir_reviewrating_enable_font_awesome')) {
 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
 		wp_enqueue_script('geodir-barrating-js');
@@ -213,11 +213,11 @@  discard block
 block discarded – undo
 		wp_enqueue_script('geodir-jRating-js');
 	}
 
-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
-    wp_enqueue_script('geodir-on-document-load');
+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
+	wp_enqueue_script('geodir-on-document-load');
 
-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
-    wp_enqueue_script('google-geometa');
+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
+	wp_enqueue_script('google-geometa');
 }
 
 /**
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
  */
 function geodir_header_scripts()
 {
-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
-    echo stripslashes(get_option('geodir_header_scripts'));
+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
+	echo stripslashes(get_option('geodir_header_scripts'));
 }
 
 /**
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
  */
 function geodir_google_analytics_tracking_code()
 {
-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
 
         <script>
             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
         </script>
 
         <?php
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
-        echo stripslashes(get_option('geodir_ga_tracking_code'));
-    }
+	}elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
+		echo stripslashes(get_option('geodir_ga_tracking_code'));
+	}
 }
 
 /**
@@ -276,16 +276,16 @@  discard block
 block discarded – undo
 function geodir_footer_scripts()
 {
 
-    echo stripslashes(get_option('geodir_footer_scripts'));
+	echo stripslashes(get_option('geodir_footer_scripts'));
 
-    /*
+	/*
      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041
      *
      * Flexbox wont wrap on ios for search form items
      */
-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
-    }
+	if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
+	}
 }
 
 
@@ -299,12 +299,12 @@  discard block
 block discarded – undo
  */
 function geodir_add_async_forscript($url)
 {
-    if (strpos($url, '#asyncload')===false)
-        return $url;
-    else if (is_admin())
-        return str_replace('#asyncload', '', $url);
-    else
-        return str_replace('#asyncload', '', $url)."' async='async";
+	if (strpos($url, '#asyncload')===false)
+		return $url;
+	else if (is_admin())
+		return str_replace('#asyncload', '', $url);
+	else
+		return str_replace('#asyncload', '', $url)."' async='async";
 }
 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
 
@@ -317,17 +317,17 @@  discard block
 block discarded – undo
 function geodir_templates_styles()
 {
 
-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_style('geodir-core-scss');
-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_style('geodir-core-scss');
+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
 
-    if(is_rtl()){
-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_style('geodirectory-frontend-rtl-style');
-    }
+	if(is_rtl()){
+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_style('geodirectory-frontend-rtl-style');
+	}
 
-    wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
-    wp_enqueue_style('font-awesome');
+	wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
+	wp_enqueue_style('font-awesome');
 
 
 }
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
  */
 function geodir_get_sidebar()
 {
-    get_sidebar('geodirectory');
+	get_sidebar('geodirectory');
 }
 
 /**
@@ -360,122 +360,122 @@  discard block
 block discarded – undo
  * @param bool $always_show Do you want to show the pagination always? Default: false.
  */
 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;
+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;
 
-    if (empty($prelabel)) {
-        $prelabel = '<strong>&lt;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&lt;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&gt;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&gt;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
-        return;
+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
+		return;
 
-    if (!is_single()) {
-        if (function_exists('geodir_location_geo_home_link')) {
-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-        }
-        $numposts = $wp_query->found_posts;
+	if (!is_single()) {
+		if (function_exists('geodir_location_geo_home_link')) {
+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+		}
+		$numposts = $wp_query->found_posts;
 
-        $max_page = ceil($numposts / $posts_per_page);
+		$max_page = ceil($numposts / $posts_per_page);
 
-        if (empty($paged)) {
-            $paged = 1;
-        }
+		if (empty($paged)) {
+			$paged = 1;
+		}
         
-        $post_type = geodir_get_current_posttype();
-        $listing_type_name = get_post_type_plural_label($post_type);
-        if (geodir_is_page('listing') || geodir_is_page('search')) {            
-            $term = array();
+		$post_type = geodir_get_current_posttype();
+		$listing_type_name = get_post_type_plural_label($post_type);
+		if (geodir_is_page('listing') || geodir_is_page('search')) {            
+			$term = array();
             
-            if (is_tax()) {
-                $term_id = get_queried_object_id();
-                $taxonomy = get_query_var('taxonomy');
+			if (is_tax()) {
+				$term_id = get_queried_object_id();
+				$taxonomy = get_query_var('taxonomy');
 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
-                    $term = get_term($term_id, $post_type . 'category');
-                }
-            }
+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
+					$term = get_term($term_id, $post_type . 'category');
+				}
+			}
             
-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
                 
-                if (!is_array($taxonomy_search)) {
-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');
-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
-                }
-            }
+				if (!is_array($taxonomy_search)) {
+					$term = get_term((int)$taxonomy_search, $post_type . 'category');
+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');
+				}
+			}
             
-            if (!empty($term) && !is_wp_error($term)) {
-                $listing_type_name = $term->name;
-            }
-        }
+			if (!empty($term) && !is_wp_error($term)) {
+				$listing_type_name = $term->name;
+			}
+		}
 
-        if ($max_page > 1 || $always_show) {            
-            // Extra pagination info
-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;
-            $end_no = min($paged * $posts_per_page, $numposts);
+		if ($max_page > 1 || $always_show) {            
+			// Extra pagination info
+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;
+			$end_no = min($paged * $posts_per_page, $numposts);
 
-            if ($geodir_pagination_more_info != '') {
-                if ($listing_type_name) {
-                    $listing_type_name = __($listing_type_name, 'geodirectory');
-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
-                } else {
-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
-                }
-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
-                /**
-                 * Adds an extra pagination info above/under pagination.
-                 *
-                 * @since 1.5.9
-                 *
-                 * @param string $pagination_info Extra pagination info content.
-                 * @param string $listing_type_name Listing results type.
-                 * @param string $start_no First result number.
-                 * @param string $end_no Last result number.
-                 * @param string $numposts Total number of listings.
-                 * @param string $post_type The post type.
-                 */
-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
+			if ($geodir_pagination_more_info != '') {
+				if ($listing_type_name) {
+					$listing_type_name = __($listing_type_name, 'geodirectory');
+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
+				} else {
+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
+				}
+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
+				/**
+				 * Adds an extra pagination info above/under pagination.
+				 *
+				 * @since 1.5.9
+				 *
+				 * @param string $pagination_info Extra pagination info content.
+				 * @param string $listing_type_name Listing results type.
+				 * @param string $start_no First result number.
+				 * @param string $end_no Last result number.
+				 * @param string $numposts Total number of listings.
+				 * @param string $post_type The post type.
+				 */
+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
                 
-                if ($geodir_pagination_more_info == 'before') {
-                    $before = $before . $pagination_info;
-                } else if ($geodir_pagination_more_info == 'after') {
-                    $after = $pagination_info . $after;
-                }
-            }
+				if ($geodir_pagination_more_info == 'before') {
+					$before = $before . $pagination_info;
+				} else if ($geodir_pagination_more_info == 'after') {
+					$after = $pagination_info . $after;
+				}
+			}
             
-            echo "$before <div class='Navi gd-navi'>";
-            if ($paged >= ($pages_to_show - 1)) {
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
-            }
-            previous_posts_link($prelabel);
-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
-                if ($i >= 1 && $i <= $max_page) {
-                    if ($i == $paged) {
-                        echo "<strong class='on'>$i</strong>";
-                    } else {
-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
-                    }
-                }
-            }
-            next_posts_link($nxtlabel, $max_page);
-            if (($paged + $half_pages_to_show) < ($max_page)) {
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
-            }
-            echo "</div> $after";
-        }
+			echo "$before <div class='Navi gd-navi'>";
+			if ($paged >= ($pages_to_show - 1)) {
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
+			}
+			previous_posts_link($prelabel);
+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
+				if ($i >= 1 && $i <= $max_page) {
+					if ($i == $paged) {
+						echo "<strong class='on'>$i</strong>";
+					} else {
+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
+					}
+				}
+			}
+			next_posts_link($nxtlabel, $max_page);
+			if (($paged + $half_pages_to_show) < ($max_page)) {
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
+			}
+			echo "</div> $after";
+		}
         
-        if (function_exists('geodir_location_geo_home_link')) {
-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-        }
-    }
+		if (function_exists('geodir_location_geo_home_link')) {
+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+		}
+	}
 }
 
 /**
@@ -486,20 +486,20 @@  discard block
 block discarded – undo
  */
 function geodir_listingsearch_scripts()
 {
-    if (get_option('gd_search_dist') != '') {
-        $dist = get_option('gd_search_dist');
-    } else {
-        $dist = 500;
-    }
-    $dist_dif = 1000;
-
-    if ($dist <= 5000) $dist_dif = 500;
-    if ($dist <= 1000) $dist_dif = 100;
-    if ($dist <= 500) $dist_dif = 50;
-    if ($dist <= 100) $dist_dif = 10;
-    if ($dist <= 50) $dist_dif = 5;
-
-    ?>
+	if (get_option('gd_search_dist') != '') {
+		$dist = get_option('gd_search_dist');
+	} else {
+		$dist = 500;
+	}
+	$dist_dif = 1000;
+
+	if ($dist <= 5000) $dist_dif = 500;
+	if ($dist <= 1000) $dist_dif = 100;
+	if ($dist <= 500) $dist_dif = 50;
+	if ($dist <= 100) $dist_dif = 10;
+	if ($dist <= 50) $dist_dif = 5;
+
+	?>
     <script type="text/javascript">
 
         jQuery(function ($) {
@@ -557,20 +557,20 @@  discard block
 block discarded – undo
  * @package GeoDirectory
  */
 function geodir_add_sharelocation_scripts() {
-    $default_search_for_text = SEARCH_FOR_TEXT;
-    if (get_option('geodir_search_field_default_text'))
-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+	$default_search_for_text = SEARCH_FOR_TEXT;
+	if (get_option('geodir_search_field_default_text'))
+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
 
-    $default_near_text = NEAR_TEXT;
-    if (get_option('geodir_near_field_default_text'))
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+	$default_near_text = NEAR_TEXT;
+	if (get_option('geodir_near_field_default_text'))
+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
     
-    $search_location = geodir_get_default_location();
+	$search_location = geodir_get_default_location();
     
-    $default_search_for_text = addslashes(stripslashes($default_search_for_text));
-    $default_near_text = addslashes(stripslashes($default_near_text));
-    $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
-    ?>
+	$default_search_for_text = addslashes(stripslashes($default_search_for_text));
+	$default_near_text = addslashes(stripslashes($default_near_text));
+	$city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
+	?>
     <script type="text/javascript">
         var default_location = '<?php echo $city ;?>';
         var latlng;
@@ -651,14 +651,14 @@  discard block
 block discarded – undo
                     initialise2();
                 } else {
                     <?php
-                    $near_add = get_option('geodir_search_near_addition');
-                    /**
-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.
-                     *
-                     * @since 1.0.0
-                     */
-                    $near_add2 = apply_filters('geodir_search_near_addition', '');
-                    ?>
+					$near_add = get_option('geodir_search_near_addition');
+					/**
+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.
+					 *
+					 * @since 1.0.0
+					 */
+					$near_add2 = apply_filters('geodir_search_near_addition', '');
+					?>
                     if (window.gdMaps === 'google') {
                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
                             function (results, status) {
@@ -772,32 +772,32 @@  discard block
 block discarded – undo
  */
 function geodir_show_badges_on_image($which, $post, $link)
 {
-    $return = '';
-    switch ($which) {
-        case 'featured':
-            /**
-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.
-             *
-             * @since 1.0.0
-             * @param object $post The post object.
-             * @param string $link The link to the post.
-             */
-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
-            break;
-        case 'new' :
-            /**
-             * Filter the new image badge html that appears in the listings pages over the thumbnail.
-             *
-             * @since 1.0.0
-             * @param object $post The post object.
-             * @param string $link The link to the post.
-             */
-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
-            break;
-
-    }
+	$return = '';
+	switch ($which) {
+		case 'featured':
+			/**
+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.
+			 *
+			 * @since 1.0.0
+			 * @param object $post The post object.
+			 * @param string $link The link to the post.
+			 */
+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
+			break;
+		case 'new' :
+			/**
+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.
+			 *
+			 * @since 1.0.0
+			 * @param object $post The post object.
+			 * @param string $link The link to the post.
+			 */
+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
+			break;
+
+	}
     
-    return $return;
+	return $return;
 }
 
 /**
@@ -806,8 +806,8 @@  discard block
 block discarded – undo
  * @since 1.6.22
  */
 function geodir_fix_script_conflict() {
-    if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
-        wp_dequeue_script( 'flexslider' );
-    }
+	if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
+		wp_dequeue_script( 'flexslider' );
+	}
 }
 add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 );
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -11,142 +11,142 @@ discard block
		block discarded – undo
11	11	//include the main class file
12	12	require_once("Tax-meta-class.php");
13	13	if (is_admin()) {
14		- /*
	14	+ /*
15	15	* prefix of meta keys, optional
16	16	* use underscore (_) at the beginning to make keys hidden, for example $prefix = '_ba_';
17	17	* you also can make prefix empty to disable it
18	18	*
19	19	*/
20	20
21		- $prefix = 'ct_';
22		- /*
	21	+ $prefix = 'ct_';
	22	+ /*
23	23	* configure your meta box
24	24	*/
25	25
26		- $config = array(
27		- 'id' => 'demo_meta_box', // meta box id, unique per meta box
28		- 'title' => __('Demo Meta Box', 'geodirectory'), // meta box title
29		- 'pages' => geodir_get_taxonomies(), // taxonomy name, accept categories, post_tag and custom taxonomies
30		- 'context' => 'normal', // where the meta box appear: normal (default), advanced, side; optional
31		- 'fields' => array(), // list of meta fields (can be added by field arrays)
32		- 'local_images' => false, // Use local or hosted images (meta box images for add/remove)
33		- 'use_with_theme' => true //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
34		- );
	26	+ $config = array(
	27	+ 'id' => 'demo_meta_box', // meta box id, unique per meta box
	28	+ 'title' => __('Demo Meta Box', 'geodirectory'), // meta box title
	29	+ 'pages' => geodir_get_taxonomies(), // taxonomy name, accept categories, post_tag and custom taxonomies
	30	+ 'context' => 'normal', // where the meta box appear: normal (default), advanced, side; optional
	31	+ 'fields' => array(), // list of meta fields (can be added by field arrays)
	32	+ 'local_images' => false, // Use local or hosted images (meta box images for add/remove)
	33	+ 'use_with_theme' => true //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
	34	+ );
35	35
36	36
37		- /*
	37	+ /*
38	38	* Initiate your meta box
39	39	*/
40		- $my_meta = new Geodir_Tax_Meta_Class($config);
41		- $my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
42		- $my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
43		- $my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
44		- /$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));/// hidden setting to trick WPML
45		-
46		- $my_meta->addSelect($prefix . 'cat_schema',
47		- /*
	40	+ $my_meta = new Geodir_Tax_Meta_Class($config);
	41	+ $my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
	42	+ $my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
	43	+ $my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
	44	+ /$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));/// hidden setting to trick WPML
	45	+
	46	+ $my_meta->addSelect($prefix . 'cat_schema',
	47	+ /*
48	48	* Allows you to add/filter the cat schema types.
49	49	*
50	50	* @since 1.5.7
51	51	*/
52		- apply_filters('geodir_cat_schemas',array(
53		- '' => __('Default (LocalBusiness)', 'geodirectory'),
54		- 'AccountingService' => 'AccountingService',
55		- 'Attorney' => 'Attorney',
56		- 'AutoBodyShop' => 'AutoBodyShop',
57		- 'AutoDealer' => 'AutoDealer',
58		- 'AutoPartsStore' => 'AutoPartsStore',
59		- 'AutoRental' => 'AutoRental',
60		- 'AutoRepair' => 'AutoRepair',
61		- 'AutoWash' => 'AutoWash',
62		- 'Bakery' => 'Bakery',
63		- 'BarOrPub' => 'BarOrPub',
64		- 'BeautySalon' => 'BeautySalon',
65		- 'BedAndBreakfast' => 'BedAndBreakfast',
66		- 'BikeStore' => 'BikeStore',
67		- 'BookStore' => 'BookStore',
68		- 'CafeOrCoffeeShop' => 'CafeOrCoffeeShop',
69		- 'Campground' => 'Campground',
70		- 'ChildCare' => 'ChildCare',
71		- 'ClothingStore' => 'ClothingStore',
72		- 'ComputerStore' => 'ComputerStore',
73		- 'DaySpa' => 'DaySpa',
74		- 'Dentist' => 'Dentist',
75		- 'DryCleaningOrLaundry' => 'DryCleaningOrLaundry',
76		- 'Electrician' => 'Electrician',
77		- 'ElectronicsStore' => 'ElectronicsStore',
78		- 'EmergencyService' => 'EmergencyService',
79		- 'EntertainmentBusiness' => 'EntertainmentBusiness',
80		- 'Event' => 'Event',
81		- 'EventVenue' => 'EventVenue',
82		- 'ExerciseGym' => 'ExerciseGym',
83		- 'FinancialService' => 'FinancialService',
84		- 'Florist' => 'Florist',
85		- 'FoodEstablishment' => 'FoodEstablishment',
86		- 'FurnitureStore' => 'FurnitureStore',
87		- 'GardenStore' => 'GardenStore',
88		- 'GeneralContractor' => 'GeneralContractor',
89		- 'GolfCourse' => 'GolfCourse',
90		- 'HairSalon' => 'HairSalon',
91		- 'HardwareStore' => 'HardwareStore',
92		- 'HealthAndBeautyBusiness' => 'HealthAndBeautyBusiness',
93		- 'HobbyShop' => 'HobbyShop',
94		- 'HomeAndConstructionBusiness' => 'HomeAndConstructionBusiness',
95		- 'HomeGoodsStore' => 'HomeGoodsStore',
96		- 'Hospital' => 'Hospital',
97		- 'Hostel' => 'Hostel',
98		- 'Hotel' => 'Hotel',
99		- 'HousePainter' => 'HousePainter',
100		- 'HVACBusiness' => 'HVACBusiness',
101		- 'InsuranceAgency' => 'InsuranceAgency',
102		- 'JewelryStore' => 'JewelryStore',
103		- 'LiquorStore' => 'LiquorStore',
104		- 'Locksmith' => 'Locksmith',
105		- 'LodgingBusiness' => 'LodgingBusiness',
106		- 'MedicalClinic' => 'MedicalClinic',
107		- 'MensClothingStore' => 'MensClothingStore',
108		- 'MobilePhoneStore' => 'MobilePhoneStore',
109		- 'Motel' => 'Motel',
110		- 'MotorcycleDealer' => 'MotorcycleDealer',
111		- 'MotorcycleRepair' => 'MotorcycleRepair',
112		- 'MovingCompany' => 'MovingCompany',
113		- 'MusicStore' => 'MusicStore',
114		- 'NailSalon' => 'NailSalon',
115		- 'NightClub' => 'NightClub',
116		- 'Notary' => 'Notary',
117		- 'OfficeEquipmentStore' => 'OfficeEquipmentStore',
118		- 'Optician' => 'Optician',
119		- 'PetStore' => 'PetStore',
120		- 'Physician' => 'Physician',
121		- 'Plumber' => 'Plumber',
122		- 'ProfessionalService' => 'ProfessionalService',
123		- 'RealEstateAgent' => 'RealEstateAgent',
124		- 'Residence' => 'Residence',
125		- 'Restaurant' => 'Restaurant',
126		- 'RoofingContractor' => 'RoofingContractor',
127		- 'RVPark' => 'RVPark',
128		- 'School' => 'School',
129		- 'SelfStorage' => 'SelfStorage',
130		- 'ShoeStore' => 'ShoeStore',
131		- 'SkiResort' => 'SkiResort',
132		- 'SportingGoodsStore' => 'SportingGoodsStore',
133		- 'SportsClub' => 'SportsClub',
134		- 'Store' => 'Store',
135		- 'TattooParlor' => 'TattooParlor',
136		- 'Taxi' => 'Taxi',
137		- 'TennisComplex' => 'TennisComplex',
138		- 'TireShop' => 'TireShop',
139		- 'TouristAttraction' => 'TouristAttraction',
140		- 'ToyStore' => 'ToyStore',
141		- 'TravelAgency' => 'TravelAgency',
142		- //'VacationRentals' => 'VacationRentals', // Not recognised by google yet
143		- 'VeterinaryCare' => 'VeterinaryCare',
144		- 'WholesaleStore' => 'WholesaleStore',
145		- 'Winery' => 'Winery'
146		- )),
147		- array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
148		-
149		- /*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
	52	+ apply_filters('geodir_cat_schemas',array(
	53	+ '' => __('Default (LocalBusiness)', 'geodirectory'),
	54	+ 'AccountingService' => 'AccountingService',
	55	+ 'Attorney' => 'Attorney',
	56	+ 'AutoBodyShop' => 'AutoBodyShop',
	57	+ 'AutoDealer' => 'AutoDealer',
	58	+ 'AutoPartsStore' => 'AutoPartsStore',
	59	+ 'AutoRental' => 'AutoRental',
	60	+ 'AutoRepair' => 'AutoRepair',
	61	+ 'AutoWash' => 'AutoWash',
	62	+ 'Bakery' => 'Bakery',
	63	+ 'BarOrPub' => 'BarOrPub',
	64	+ 'BeautySalon' => 'BeautySalon',
	65	+ 'BedAndBreakfast' => 'BedAndBreakfast',
	66	+ 'BikeStore' => 'BikeStore',
	67	+ 'BookStore' => 'BookStore',
	68	+ 'CafeOrCoffeeShop' => 'CafeOrCoffeeShop',
	69	+ 'Campground' => 'Campground',
	70	+ 'ChildCare' => 'ChildCare',
	71	+ 'ClothingStore' => 'ClothingStore',
	72	+ 'ComputerStore' => 'ComputerStore',
	73	+ 'DaySpa' => 'DaySpa',
	74	+ 'Dentist' => 'Dentist',
	75	+ 'DryCleaningOrLaundry' => 'DryCleaningOrLaundry',
	76	+ 'Electrician' => 'Electrician',
	77	+ 'ElectronicsStore' => 'ElectronicsStore',
	78	+ 'EmergencyService' => 'EmergencyService',
	79	+ 'EntertainmentBusiness' => 'EntertainmentBusiness',
	80	+ 'Event' => 'Event',
	81	+ 'EventVenue' => 'EventVenue',
	82	+ 'ExerciseGym' => 'ExerciseGym',
	83	+ 'FinancialService' => 'FinancialService',
	84	+ 'Florist' => 'Florist',
	85	+ 'FoodEstablishment' => 'FoodEstablishment',
	86	+ 'FurnitureStore' => 'FurnitureStore',
	87	+ 'GardenStore' => 'GardenStore',
	88	+ 'GeneralContractor' => 'GeneralContractor',
	89	+ 'GolfCourse' => 'GolfCourse',
	90	+ 'HairSalon' => 'HairSalon',
	91	+ 'HardwareStore' => 'HardwareStore',
	92	+ 'HealthAndBeautyBusiness' => 'HealthAndBeautyBusiness',
	93	+ 'HobbyShop' => 'HobbyShop',
	94	+ 'HomeAndConstructionBusiness' => 'HomeAndConstructionBusiness',
	95	+ 'HomeGoodsStore' => 'HomeGoodsStore',
	96	+ 'Hospital' => 'Hospital',
	97	+ 'Hostel' => 'Hostel',
	98	+ 'Hotel' => 'Hotel',
	99	+ 'HousePainter' => 'HousePainter',
	100	+ 'HVACBusiness' => 'HVACBusiness',
	101	+ 'InsuranceAgency' => 'InsuranceAgency',
	102	+ 'JewelryStore' => 'JewelryStore',
	103	+ 'LiquorStore' => 'LiquorStore',
	104	+ 'Locksmith' => 'Locksmith',
	105	+ 'LodgingBusiness' => 'LodgingBusiness',
	106	+ 'MedicalClinic' => 'MedicalClinic',
	107	+ 'MensClothingStore' => 'MensClothingStore',
	108	+ 'MobilePhoneStore' => 'MobilePhoneStore',
	109	+ 'Motel' => 'Motel',
	110	+ 'MotorcycleDealer' => 'MotorcycleDealer',
	111	+ 'MotorcycleRepair' => 'MotorcycleRepair',
	112	+ 'MovingCompany' => 'MovingCompany',
	113	+ 'MusicStore' => 'MusicStore',
	114	+ 'NailSalon' => 'NailSalon',
	115	+ 'NightClub' => 'NightClub',
	116	+ 'Notary' => 'Notary',
	117	+ 'OfficeEquipmentStore' => 'OfficeEquipmentStore',
	118	+ 'Optician' => 'Optician',
	119	+ 'PetStore' => 'PetStore',
	120	+ 'Physician' => 'Physician',
	121	+ 'Plumber' => 'Plumber',
	122	+ 'ProfessionalService' => 'ProfessionalService',
	123	+ 'RealEstateAgent' => 'RealEstateAgent',
	124	+ 'Residence' => 'Residence',
	125	+ 'Restaurant' => 'Restaurant',
	126	+ 'RoofingContractor' => 'RoofingContractor',
	127	+ 'RVPark' => 'RVPark',
	128	+ 'School' => 'School',
	129	+ 'SelfStorage' => 'SelfStorage',
	130	+ 'ShoeStore' => 'ShoeStore',
	131	+ 'SkiResort' => 'SkiResort',
	132	+ 'SportingGoodsStore' => 'SportingGoodsStore',
	133	+ 'SportsClub' => 'SportsClub',
	134	+ 'Store' => 'Store',
	135	+ 'TattooParlor' => 'TattooParlor',
	136	+ 'Taxi' => 'Taxi',
	137	+ 'TennisComplex' => 'TennisComplex',
	138	+ 'TireShop' => 'TireShop',
	139	+ 'TouristAttraction' => 'TouristAttraction',
	140	+ 'ToyStore' => 'ToyStore',
	141	+ 'TravelAgency' => 'TravelAgency',
	142	+ //'VacationRentals' => 'VacationRentals', // Not recognised by google yet
	143	+ 'VeterinaryCare' => 'VeterinaryCare',
	144	+ 'WholesaleStore' => 'WholesaleStore',
	145	+ 'Winery' => 'Winery'
	146	+ )),
	147	+ array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
	148	+
	149	+ /*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
150	150	'random'=>__('Random','geodirectory'),
151	151	'az'=>__('Alphabetical' , 'geodirectory'),
152	152	'newest'=>__('Newest','geodirectory'),
		@@ -157,8 +157,8 @@ discard block
		block discarded – undo
157	157	'low_review'=>__('Lowest Reviews','geodirectory')),
158	158	array('name'=> __('Sort By','geodirectory'),'desc' => __('Select the default sort option.' ,'geodirectory'), 'std'=> array('selectkey2')));*/
159	159
160		- // Show options for placecategories only
161		- /* if(isset($_REQUEST['taxonomy']) && in_array($_REQUEST['taxonomy'],$config['pages']) ){
	160	+ // Show options for placecategories only
	161	+ /* if(isset($_REQUEST['taxonomy']) && in_array($_REQUEST['taxonomy'],$config['pages']) ){
162	162	// Exclude sort options
163	163	$my_meta->addCheckbox($prefix.'cat_exclude_rating',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory')));
164	164	$my_meta->addCheckbox($prefix.'cat_exclude_reviews',array('name'=> __('<b>Exclude</b> Reviews sort option','geodirectory')));
		@@ -170,8 +170,8 @@ discard block
		block discarded – undo
170	170
171	171	}*/
172	172
173		- //Finish Meta Box Declaration
174		- $my_meta->Finish();
	173	+ //Finish Meta Box Declaration
	174	+ $my_meta->Finish();
175	175	}
176	176
177	177
		@@ -180,86 +180,86 @@ discard block
		block discarded – undo
180	180	##############################################################
181	181	$gd_taxonomies = geodir_get_taxonomies();
182	182	if (!empty($gd_taxonomies)) {
183		- foreach ($gd_taxonomies as $gd_taxonomy) {
	183	+ foreach ($gd_taxonomies as $gd_taxonomy) {
184	184
185		- add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
186		- add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
	185	+ add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
	186	+ add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
187	187
188		- }
	188	+ }
189	189	}
190	190
191	191	function addCat_column($columns)
192	192	{
193		- if (isset($columns['description']) && $posts = $columns['description']) {
194		- unset($columns['description']);
195		- }
196		-
197		- $columns['cat_icon'] = 'Icon';
198		- $columns['cat_default_img'] = __('Default Image', 'geodirectory');
199		- $columns['cat_ID_num'] = __('Cat ID', 'geodirectory');
200		- return $columns;
	193	+ if (isset($columns['description']) && $posts = $columns['description']) {
	194	+ unset($columns['description']);
	195	+ }
	196	+
	197	+ $columns['cat_icon'] = 'Icon';
	198	+ $columns['cat_default_img'] = __('Default Image', 'geodirectory');
	199	+ $columns['cat_ID_num'] = __('Cat ID', 'geodirectory');
	200	+ return $columns;
201	201	}
202	202
203	203	#############################################################
204	204	function manage_category_custom_fields($deprecated, $column_name, $term_id)
205	205	{
206		- if ($column_name == 'cat_ID_num')
207		- echo $term_id;
	206	+ if ($column_name == 'cat_ID_num')
	207	+ echo $term_id;
208	208
209		- if ($column_name == 'cat_icon') {
210		- $term_icon_url = geodir_get_tax_meta($term_id, 'ct_cat_icon');
	209	+ if ($column_name == 'cat_icon') {
	210	+ $term_icon_url = geodir_get_tax_meta($term_id, 'ct_cat_icon');
211	211
212		- if ($term_icon_url != '') {
213		- $file_info = pathinfo($term_icon_url['src']);
	212	+ if ($term_icon_url != '') {
	213	+ $file_info = pathinfo($term_icon_url['src']);
214	214
215		- if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
216		- $sub_dir = $file_info['dirname'];
217		- } else {
218		- $sub_dir = '';
219		- }
	215	+ if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
	216	+ $sub_dir = $file_info['dirname'];
	217	+ } else {
	218	+ $sub_dir = '';
	219	+ }
220	220
221		- $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
222		- $uploads_baseurl = $uploads['baseurl'];
223		- $uploads_path = $uploads['path'];
	221	+ $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
	222	+ $uploads_baseurl = $uploads['baseurl'];
	223	+ $uploads_path = $uploads['path'];
224	224
225		- $file_name = $file_info['basename'];
	225	+ $file_name = $file_info['basename'];
226	226
227		- if (strpos($sub_dir, 'https://') !== false) {
228		- $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
229		- } else {
230		- $uploads['baseurl'] = str_replace('https://', 'http://', $uploads['baseurl']);
231		- }
232		- $sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
	227	+ if (strpos($sub_dir, 'https://') !== false) {
	228	+ $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
	229	+ } else {
	230	+ $uploads['baseurl'] = str_replace('https://', 'http://', $uploads['baseurl']);
	231	+ }
	232	+ $sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
233	233
234		- $uploads_url = $uploads_baseurl . $sub_dir;
	234	+ $uploads_url = $uploads_baseurl . $sub_dir;
235	235
236		- $term_icon_url['src'] = $uploads_url . '/' . $file_name;
237		- echo '<img src="' . $term_icon_url['src'] . '" />';
238		- }
239		- }
	236	+ $term_icon_url['src'] = $uploads_url . '/' . $file_name;
	237	+ echo '<img src="' . $term_icon_url['src'] . '" />';
	238	+ }
	239	+ }
240	240
241		- if ($column_name == 'cat_default_img') {
242		- $cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img');
243		- if ($cat_default_img != '')
244		- echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
	241	+ if ($column_name == 'cat_default_img') {
	242	+ $cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img');
	243	+ if ($cat_default_img != '')
	244	+ echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
245	245
246		- }
	246	+ }
247	247	}
248	248
249	249	function geodir_get_default_catimage($term_id, $post_type = 'gd_place')
250	250	{
251	251
252		- if ($cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
253		- return $cat_default_img;
254		- else
255		- return false;
	252	+ if ($cat_default_img = geodir_get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
	253	+ return $cat_default_img;
	254	+ else
	255	+ return false;
256	256	}
257	257
258	258	//Clear custom fields
259	259	add_action('in_admin_footer', 'geodir_tax_meta_clear_custom_field');
260	260	function geodir_tax_meta_clear_custom_field() {
261		- if (isset($_REQUEST['taxonomy']) && !empty($_REQUEST['taxonomy'])):
262		- ?>
	261	+ if (isset($_REQUEST['taxonomy']) && !empty($_REQUEST['taxonomy'])):
	262	+ ?>
263	263	<script type="text/javascript">
264	264	jQuery(document).ready(function () {
265	265	jQuery('#addtag #submit').click(function () {
		@@ -288,5 +288,5 @@ discard block
		block discarded – undo
288	288	});
289	289	</script>
290	290	<?php
291		- endif;
	291	+ endif;
292	292	}

GeoDirectory / geodirectory

Pull Request — master (#411)

Status

Category

Indentation +173 added lines, -173 removed lines patch added patch discarded remove patch

Indentation +344 added lines, -344 removed lines patch added patch discarded remove patch