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 05:53 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.

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