GeoDirectory / geodirectory

geodirectory-admin/admin_db_install.php

Indentation +295 added lines, -295 removed lines

@@ -6,26 +6,26 @@ 
  * @package GeoDirectory

  */

 if (!function_exists('geodir_create_tables')) {

-    /**

-     * Creates custom db tables for storing GeoDirectory plugin data.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix GeoDirectory plugin table prefix.

-     */

-    function geodir_create_tables()

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $wpdb->hide_errors();

-

-        $collate = '';

-        if ($wpdb->has_cap('collation')) {

-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

-        }

+	/**

+	 * Creates custom db tables for storing GeoDirectory plugin data.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix GeoDirectory plugin table prefix.

+	 */

+	function geodir_create_tables()

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$wpdb->hide_errors();

+

+		$collate = '';

+		if ($wpdb->has_cap('collation')) {

+			if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

+			if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

+		}

 

 		/**

 		 * Include any functions needed for upgrades.

@@ -36,31 +36,31 @@ 
 

 

 // rename tables if we need to

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

-        }

-

-

-        // Table for storing Countries

-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

+		}

+

+

+		// Table for storing Countries

+		$GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

 						CountryId smallint AUTO_INCREMENT NOT NULL ,

 						Country varchar (50) NOT NULL ,

 						FIPS104 varchar (2) NOT NULL ,

@@ -79,21 +79,21 @@ 
 						Comment varchar (255) NULL ,

 						PRIMARY KEY  (CountryId)) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the country DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);

-        dbDelta($GEODIR_COUNTRIES_TABLE);

+		/**

+		 * Filter the SQL query that creates/updates the country DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);

+		dbDelta($GEODIR_COUNTRIES_TABLE);

 

 

-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

+		$country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

 

-        if ($country_table_empty == 0) {

+		if ($country_table_empty == 0) {

 

-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

+			$countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),

 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),

 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -367,21 +367,21 @@ 
 	(276, 'Curaçao', 'UC', 'CW', 'CUW', '531', 'CW', 'Willemstad ', 'Central America and the Caribbean', 'Curaçaoan', 'Curaçaoans', 'Netherlands Antillean guilder', 'ANG', 152760, 'Curaçao', ''),

 	(277, 'Caribbean Netherlands', '--', 'BQ', 'BES', '535', 'BQ', '--', 'Central America and the Caribbean', '--', '--', 'United States dollar', 'USD', 21133, 'Caribbean Netherlands', '')";

 

-            /**

-             * Filter the SQL query that inserts the country DB table data.

-             *

-             * @since 1.0.0

-             * @param string $sql The SQL insert query string.

-             */

-            $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);

-            $wpdb->query($countries_insert);

+			/**

+			 * Filter the SQL query that inserts the country DB table data.

+			 *

+			 * @since 1.0.0

+			 * @param string $sql The SQL insert query string.

+			 */

+			$countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);

+			$wpdb->query($countries_insert);

 

-        }

+		}

 

 

-        // Table for storing location attribute - these are user defined

+		// Table for storing location attribute - these are user defined

 

-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

+		$icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

 						id int NOT NULL AUTO_INCREMENT,

 						post_id int( 10 ) NOT NULL,

 						post_title varchar(254) NOT NULL,

@@ -390,19 +390,19 @@ 
 						PRIMARY KEY  (id)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the post_icon DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);

+		/**

+		 * Filter the SQL query that creates/updates the post_icon DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);

 

-        dbDelta($icon_table);

+		dbDelta($icon_table);

 

-        // Table for storing post custom fields - these are user defined

+		// Table for storing post custom fields - these are user defined

 

-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

+		$post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

 							  id int(11) NOT NULL AUTO_INCREMENT,

 							  post_type varchar(100) NULL,

 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -436,18 +436,18 @@ 
 							  PRIMARY KEY  (id)

 							  ) $collate";

 

-        /**

-         * Filter the SQL query that creates/updates the custom_fields DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);

+		/**

+		 * Filter the SQL query that creates/updates the custom_fields DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);

 

-        dbDelta($post_custom_fields);

+		dbDelta($post_custom_fields);

 

-        // Table for storing place attribute - these are user defined

-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

+		// Table for storing place attribute - these are user defined

+		$post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

 						post_id int(11) NOT NULL,

 						post_title text NULL DEFAULT NULL,

 						post_status varchar(20) NULL DEFAULT NULL,

@@ -473,22 +473,22 @@ 
 						PRIMARY KEY  (post_id)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the post_detail DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);

+		/**

+		 * Filter the SQL query that creates/updates the post_detail DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);

 

-        dbDelta($post_detail);

+		dbDelta($post_detail);

 

-        // alter post_title

-        //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");

+		// alter post_title

+		//$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");

 

-        // Table for storing place images - these are user defined

+		// Table for storing place images - these are user defined

 

-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

+		$attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

 						ID int(11) NOT NULL AUTO_INCREMENT,

 						post_id int(11) NOT NULL,

 						user_id int(11) DEFAULT NULL,

@@ -504,18 +504,18 @@ 
 						PRIMARY KEY  (ID)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the attachments DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);

+		/**

+		 * Filter the SQL query that creates/updates the attachments DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);

 

-        dbDelta($attechment_table);

+		dbDelta($attechment_table);

 

 

-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

+		$custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_type varchar(255) NOT NULL,

 			data_type varchar(255) NOT NULL,

@@ -533,18 +533,18 @@ 
 			PRIMARY KEY  (id)

 			) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);

+		/**

+		 * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);

 

-        dbDelta($custom_sort_fields_table);

+		dbDelta($custom_sort_fields_table);

 

 

-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

+			$review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_id int(11) DEFAULT NULL,

 			post_title varchar( 255 ) NULL DEFAULT NULL,

@@ -568,191 +568,191 @@ 
 			PRIMARY KEY  (id)

 			) $collate  ";

 

-            /**

-             * Filter the SQL query that creates the review DB table structure.

-             *

-             * @since 1.0.0

-             * @param string $sql The SQL insert query string.

-             */

-            $review_table = apply_filters('geodir_before_review_table_create', $review_table);

-            dbDelta($review_table);

+			/**

+			 * Filter the SQL query that creates the review DB table structure.

+			 *

+			 * @since 1.0.0

+			 * @param string $sql The SQL insert query string.

+			 */

+			$review_table = apply_filters('geodir_before_review_table_create', $review_table);

+			dbDelta($review_table);

 

 

 

-        // Alter terms table

-        $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");

-        if (!$term_icon_column) {

-            $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");

-        }

+		// Alter terms table

+		$term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");

+		if (!$term_icon_column) {

+			$wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");

+		}

 

-        //require_once(geodir_plugin_path() . '/upgrade.php');

+		//require_once(geodir_plugin_path() . '/upgrade.php');

 

 

-    }

+	}

 } // END MAIN FUNCTION geodir_tables_install

 

 if (!function_exists('geodir_create_default_fields')) {

-    /**

-     * Inserts default custom fields table data into database.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_create_default_fields()

-    {

-

-        $fields = array();

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'taxonomy',

-            'admin_title' => __('Category', 'geodirectory'),

-            'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),

-            'site_title' => __('Category', 'geodirectory'),

-            'htmlvar_name' => 'gd_placecategory',

-            'default_value' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'is_required' => '1',

-            'clabels' => __('Category', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'address',

-            'admin_title' => __('Address', 'geodirectory'),

-            'admin_desc' => ADDRESS_MSG,

-            'site_title' => __('Address', 'geodirectory'),

-            'htmlvar_name' => 'post',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'is_required' => '1',

-            'required_msg' => __('Address fields are required', 'geodirectory'),

-            'clabels' => __('Address', 'geodirectory'),

-            'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),

-                'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),

-                'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),

-                'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),

-                'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),

-                'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),

-                'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',

-                'show_latlng' => 1));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'text',

-            'admin_title' => __('Time', 'geodirectory'),

-            'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),

-            'site_title' => __('Time', 'geodirectory'),

-            'htmlvar_name' => 'timing',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'clabels' => __('Time', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'phone',

-            'admin_title' => __('Phone', 'geodirectory'),

-            'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),

-            'site_title' => __('Phone', 'geodirectory'),

-            'htmlvar_name' => 'contact',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'clabels' => __('Phone', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'email',

-            'admin_title' => __('Email', 'geodirectory'),

-            'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),

-            'site_title' => __('Email', 'geodirectory'),

-            'htmlvar_name' => 'email',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'clabels' => __('Email', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'url',

-            'admin_title' => __('Website', 'geodirectory'),

-            'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),

-            'site_title' => __('Website', 'geodirectory'),

-            'htmlvar_name' => 'website',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'clabels' => __('Website', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'url',

-            'admin_title' => __('Twitter', 'geodirectory'),

-            'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),

-            'site_title' => __('Twitter', 'geodirectory'),

-            'htmlvar_name' => 'twitter',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'clabels' => __('Twitter', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'VARCHAR',

-            'field_type' => 'url',

-            'admin_title' => __('Facebook', 'geodirectory'),

-            'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),

-            'site_title' => __('Facebook', 'geodirectory'),

-            'htmlvar_name' => 'facebook',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '1',

-            'is_admin' => '1',

-            'clabels' => __('Facebook', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'TEXT',

-            'field_type' => 'textarea',

-            'admin_title' => __('Video', 'geodirectory'),

-            'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),

-            'site_title' => __('Video', 'geodirectory'),

-            'htmlvar_name' => 'video',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '0',

-            'is_admin' => '1',

-            'clabels' => __('Video', 'geodirectory'));

-

-        $fields[] = array('listing_type' => 'gd_place',

-            'data_type' => 'TEXT',

-            'field_type' => 'textarea',

-            'admin_title' => __('Special Offers', 'geodirectory'),

-            'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),

-            'site_title' => __('Special Offers', 'geodirectory'),

-            'htmlvar_name' => 'special_offers',

-            'default_value' => '',

-            'option_values' => '',

-            'is_default' => '0',

-            'is_admin' => '1',

-            'clabels' => __('Special Offers', 'geodirectory'));

-

-        /**

-         * Filter the array of default custom fields DB table data.

-         *

-         * @since 1.0.0

-         * @param string $fields The default custom fields as an array.

-         */

-        $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);

-        foreach ($fields as $field_index => $field) {

-            geodir_custom_field_save($field);

-

-        }

-    }

+	/**

+	 * Inserts default custom fields table data into database.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_create_default_fields()

+	{

+

+		$fields = array();

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'taxonomy',

+			'admin_title' => __('Category', 'geodirectory'),

+			'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),

+			'site_title' => __('Category', 'geodirectory'),

+			'htmlvar_name' => 'gd_placecategory',

+			'default_value' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'is_required' => '1',

+			'clabels' => __('Category', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'address',

+			'admin_title' => __('Address', 'geodirectory'),

+			'admin_desc' => ADDRESS_MSG,

+			'site_title' => __('Address', 'geodirectory'),

+			'htmlvar_name' => 'post',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'is_required' => '1',

+			'required_msg' => __('Address fields are required', 'geodirectory'),

+			'clabels' => __('Address', 'geodirectory'),

+			'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),

+				'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),

+				'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),

+				'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),

+				'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),

+				'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),

+				'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',

+				'show_latlng' => 1));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'text',

+			'admin_title' => __('Time', 'geodirectory'),

+			'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),

+			'site_title' => __('Time', 'geodirectory'),

+			'htmlvar_name' => 'timing',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'clabels' => __('Time', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'phone',

+			'admin_title' => __('Phone', 'geodirectory'),

+			'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),

+			'site_title' => __('Phone', 'geodirectory'),

+			'htmlvar_name' => 'contact',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'clabels' => __('Phone', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'email',

+			'admin_title' => __('Email', 'geodirectory'),

+			'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),

+			'site_title' => __('Email', 'geodirectory'),

+			'htmlvar_name' => 'email',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'clabels' => __('Email', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'url',

+			'admin_title' => __('Website', 'geodirectory'),

+			'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),

+			'site_title' => __('Website', 'geodirectory'),

+			'htmlvar_name' => 'website',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'clabels' => __('Website', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'url',

+			'admin_title' => __('Twitter', 'geodirectory'),

+			'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),

+			'site_title' => __('Twitter', 'geodirectory'),

+			'htmlvar_name' => 'twitter',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'clabels' => __('Twitter', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'VARCHAR',

+			'field_type' => 'url',

+			'admin_title' => __('Facebook', 'geodirectory'),

+			'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),

+			'site_title' => __('Facebook', 'geodirectory'),

+			'htmlvar_name' => 'facebook',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '1',

+			'is_admin' => '1',

+			'clabels' => __('Facebook', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'TEXT',

+			'field_type' => 'textarea',

+			'admin_title' => __('Video', 'geodirectory'),

+			'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),

+			'site_title' => __('Video', 'geodirectory'),

+			'htmlvar_name' => 'video',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '0',

+			'is_admin' => '1',

+			'clabels' => __('Video', 'geodirectory'));

+

+		$fields[] = array('listing_type' => 'gd_place',

+			'data_type' => 'TEXT',

+			'field_type' => 'textarea',

+			'admin_title' => __('Special Offers', 'geodirectory'),

+			'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),

+			'site_title' => __('Special Offers', 'geodirectory'),

+			'htmlvar_name' => 'special_offers',

+			'default_value' => '',

+			'option_values' => '',

+			'is_default' => '0',

+			'is_admin' => '1',

+			'clabels' => __('Special Offers', 'geodirectory'));

+

+		/**

+		 * Filter the array of default custom fields DB table data.

+		 *

+		 * @since 1.0.0

+		 * @param string $fields The default custom fields as an array.

+		 */

+		$fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);

+		foreach ($fields as $field_index => $field) {

+			geodir_custom_field_save($field);

+

+		}

+	}

 }
\ No newline at end of file

geodirectory-admin/admin_functions.php

Indentation +2762 added lines, -2762 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Admin functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Admin functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /**

  * Updates option value when GeoDirectory get deactivated.

@@ -15,11 +15,11 @@ 
 function geodir_deactivation()

 {

 

-    // Update installed variable

-    update_option("geodir_installed", 0);

+	// Update installed variable

+	update_option("geodir_installed", 0);

 

-    // Remove rewrite rules and then recreate rewrite rules.

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	flush_rewrite_rules();

 }

 

 

@@ -32,105 +32,105 @@ 
 function geodir_uninstall()

 {

 

-    delete_option('geodir_default_data_installed');

+	delete_option('geodir_default_data_installed');

 

 }

 

 if (!function_exists('geodir_admin_styles')) {

-    /**

-     * Enqueue Admin Styles.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles()

-    {

+	/**

+	 * Enqueue Admin Styles.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles()

+	{

 

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-admin-css');

+		wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-frontend-style');

+		wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-chosen-style');

+		wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-css');

+		wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-custom-fields-css');

+		wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-pluplodar-css');

+		wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rating-style');

+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rtl-style');

+		wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rtl-style');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_styles_req')) {

-    /**

-     * Loads stylesheets from CDN.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles_req()

-    {

-

-        wp_register_style('geodirectory-font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-font-awesome');

-    }

+	/**

+	 * Loads stylesheets from CDN.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles_req()

+	{

+

+		wp_register_style('geodirectory-font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-font-awesome');

+	}

 }

 

 if (!function_exists('geodir_admin_scripts')) {

-    /**

-     * Enqueue Admin Scripts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_scripts()

-    {

-

-        wp_enqueue_script('jquery');

-        /*wp_enqueue_script( 'jquery-ui-core' );

+	/**

+	 * Enqueue Admin Scripts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_scripts()

+	{

+

+		wp_enqueue_script('jquery');

+		/*wp_enqueue_script( 'jquery-ui-core' );

         wp_enqueue_script( 'jquery-ui-datepicker' );

         wp_enqueue_script('jquery-ui-slider'); */

 

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+		wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

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

-        wp_enqueue_script('chosen');

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

+		wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-choose-ajax');

+		wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-choose-ajax');

 

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

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

-        }

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

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

+		}

 

-        wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+		wp_enqueue_script('geodirectory-custom-fields-script');

+		$plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+		wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

 

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

-        /** This filter is documented in geodirectory_template_tags.php */

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

-        wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_extra, '', NULL);

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

+		/** This filter is documented in geodirectory_template_tags.php */

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

+		wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_extra, '', NULL);

 

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

-        wp_enqueue_script('geodirectory-goMap-script');

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

+		wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -141,177 +141,177 @@ 
 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodir-on-document-load');

-

-

-        // 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.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-plupload-script');

-

-        // SCRIPT FOR UPLOAD END

-

-

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,flash,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' => admin_url('admin-ajax.php'),

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

-

-

-        $thumb_img_arr = array();

-

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

-

-        $totImg = '';

-        $image_limit = '';

-        if (!empty($thumb_img_arr)) {

-            foreach ($thumb_img_arr as $img) {

-                $curImages = $img->src . ",";

-            }

+		wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodir-on-document-load');

+

+

+		// 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.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-plupload-script');

+

+		// SCRIPT FOR UPLOAD END

+

+

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,flash,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' => admin_url('admin-ajax.php'),

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

+

+

+		$thumb_img_arr = array();

+

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

+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+

+		$totImg = '';

+		$image_limit = '';

+		if (!empty($thumb_img_arr)) {

+			foreach ($thumb_img_arr as $img) {

+				$curImages = $img->src . ",";

+			}

 

-            $totImg = count($thumb_img_arr);

-        }

+			$totImg = count($thumb_img_arr);

+		}

 

 

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'totalImg' => $totImg,

-            'image_limit' => $image_limit,

-            'upload_img_size' => geodir_max_upload_size());

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'totalImg' => $totImg,

+			'image_limit' => $image_limit,

+			'upload_img_size' => geodir_max_upload_size());

 

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

+		wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

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

-        wp_enqueue_script('geodirectory-admin-script');

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

+		wp_enqueue_script('geodirectory-admin-script');

 

-        wp_enqueue_style('farbtastic');

-        wp_enqueue_script('farbtastic');

+		wp_enqueue_style('farbtastic');

+		wp_enqueue_script('farbtastic');

 

-        $screen = get_current_screen();

-        if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

-        }

+		$screen = get_current_screen();

+		if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

+			wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+		}

 

-        $ajax_cons_data = array('url' => __(get_option('siteurl') . '?geodir_ajax=true'));

-        wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(get_option('siteurl') . '?geodir_ajax=true'));

+		wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu')) {

-    /**

-     * Admin Menus

-     *

-     * Sets up the admin menus in wordpress.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global array $menu Menu array.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_menu()

-    {

-        global $menu, $geodirectory;

+	/**

+	 * Admin Menus

+	 *

+	 * Sets up the admin menus in wordpress.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $menu Menu array.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_menu()

+	{

+		global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+		if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+		add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu_order')) {

-    /**

-     * Order admin menus.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $menu_order Menu order array.

-     * @return array Modified menu order array.

-     */

-    function geodir_admin_menu_order($menu_order)

-    {

-

-        // Initialize our custom order array

-        $geodir_menu_order = array();

-

-        // Get the index of our custom separator

-        $geodir_separator = array_search('separator-geodirectory', $menu_order);

-

-        // Get index of posttype menu

-        $post_types = geodir_get_posttypes();

-        if (!empty($post_types)) {

-            foreach ($post_types as $post_type) {

-                $geodir_posts = array_search("edit.php?post_type={$post_type}", $menu_order);

-            }

-        }

+	/**

+	 * Order admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $menu_order Menu order array.

+	 * @return array Modified menu order array.

+	 */

+	function geodir_admin_menu_order($menu_order)

+	{

 

-        // Loop through menu order and do some rearranging

-        foreach ($menu_order as $index => $item) :

+		// Initialize our custom order array

+		$geodir_menu_order = array();

 

-            if ((('geodirectory') == $item)) :

-                $geodir_menu_order[] = 'separator-geodirectory';

-                if (!empty($post_types)) {

-                    foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

-                    }

-                }

-                $geodir_menu_order[] = $item;

+		// Get the index of our custom separator

+		$geodir_separator = array_search('separator-geodirectory', $menu_order);

 

-                unset($menu_order[$geodir_separator]);

-            //unset( $menu_order[$geodir_places] );

-            elseif (!in_array($item, array('separator-geodirectory'))) :

-                $geodir_menu_order[] = $item;

-            endif;

+		// Get index of posttype menu

+		$post_types = geodir_get_posttypes();

+		if (!empty($post_types)) {

+			foreach ($post_types as $post_type) {

+				$geodir_posts = array_search("edit.php?post_type={$post_type}", $menu_order);

+			}

+		}

 

-        endforeach;

+		// Loop through menu order and do some rearranging

+		foreach ($menu_order as $index => $item) :

 

-        // Return order

-        return $geodir_menu_order;

-    }

+			if ((('geodirectory') == $item)) :

+				$geodir_menu_order[] = 'separator-geodirectory';

+				if (!empty($post_types)) {

+					foreach ($post_types as $post_type) {

+						$geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+					}

+				}

+				$geodir_menu_order[] = $item;

+

+				unset($menu_order[$geodir_separator]);

+			//unset( $menu_order[$geodir_places] );

+			elseif (!in_array($item, array('separator-geodirectory'))) :

+				$geodir_menu_order[] = $item;

+			endif;

+

+		endforeach;

+

+		// Return order

+		return $geodir_menu_order;

+	}

 }

 

 if (!function_exists('geodir_admin_custom_menu_order')) {

-    /**

-     * Enables custom menu order.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool

-     */

-    function geodir_admin_custom_menu_order()

-    {

-        if (!current_user_can('manage_options')) return false;

-        return true;

-    }

+	/**

+	 * Enables custom menu order.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool

+	 */

+	function geodir_admin_custom_menu_order()

+	{

+		if (!current_user_can('manage_options')) return false;

+		return true;

+	}

 }

 

 /**

@@ -322,41 +322,41 @@ 
  */

 function geodir_before_admin_panel()

 {

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

-        echo '<div id="message" class="updated fade">

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

+		echo '<div id="message" class="updated fade">

                         <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

                         <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

                 </div>';

 

-    }

+	}

 

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

-        switch ($_REQUEST['msg']) {

-            case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

-                flush_rewrite_rules(false);

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

+		switch ($_REQUEST['msg']) {

+			case 'success':

+				echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+				flush_rewrite_rules(false);

 

-                break;

+				break;

 			case 'fail':

 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

 				else

 					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

-                break;

-        }

-    }

+				break;

+		}

+	}

 

-    if (!geodir_is_default_location_set()) {

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

+	if (!geodir_is_default_location_set()) {

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

 

-    }

+	}

 

-    if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+	if (!function_exists('curl_init')) {

+		echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

 

-    }

+	}

 }

 

 /**

@@ -369,19 +369,19 @@ 
  */

 function geodir_handle_option_form_submit($current_tab)

 {

-    global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

-        /**

-         * Contains settings array for current tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('option-pages/' . $current_tab . '_array.php');

-    }

-    if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+	global $geodir_settings;

+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+		/**

+		 * Contains settings array for current tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('option-pages/' . $current_tab . '_array.php');

+	}

+	if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

+		if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+		if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -393,100 +393,100 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+		if (!empty($geodir_settings[$current_tab]))

+			geodir_update_options($geodir_settings[$current_tab]);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * @since 1.0.0

-         * @param array $geodir_settings The array of GeoDirectory settings.

-         * @see 'geodir_before_update_options'

-         */

-        do_action('geodir_update_options', $geodir_settings);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * @since 1.0.0

+		 * @param array $geodir_settings The array of GeoDirectory settings.

+		 * @see 'geodir_before_update_options'

+		 */

+		do_action('geodir_update_options', $geodir_settings);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * Provides tab specific settings.

-         *

-         * @since 1.0.0

-         * @param string $current_tab The current settings tab name.

-         * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

-         */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * Provides tab specific settings.

+		 *

+		 * @since 1.0.0

+		 * @param string $current_tab The current settings tab name.

+		 * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

+		 */

+		do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

+		$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+		$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

 

-        wp_redirect($redirect_url);

-        exit();

-    endif;

+		wp_redirect($redirect_url);

+		exit();

+	endif;

 

 

 }

 

 

 if (!function_exists('geodir_autoinstall_admin_header') && get_option('geodir_installed')) {

-    /**

-     * GeoDirectory dummy data installation.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $post_type The post type.

-     */

-    function geodir_autoinstall_admin_header($post_type = 'gd_place')

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        if (!geodir_is_default_location_set()) {

-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

-        } else {

-

-            $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

-

-            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

-

-            if ($post_counts > 0) {

-                $nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

-

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

-            } else {

-                $options_list = '';

-                for ($option = 1; $option <= 30; $option++) {

-                    $selected = '';

-                    if ($option == 10)

-                        $selected = 'selected="selected"';

-

-                    $options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

-                }

+	/**

+	 * GeoDirectory dummy data installation.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $post_type The post type.

+	 */

+	function geodir_autoinstall_admin_header($post_type = 'gd_place')

+	{

 

-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

+		global $wpdb, $plugin_prefix;

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+		if (!geodir_is_default_location_set()) {

+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+		} else {

 

-            }

-            echo $dummy_msg;

-            ?>

+			$geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

+

+			$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

+

+			if ($post_counts > 0) {

+				$nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

+

+				$dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

+				$dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

+			} else {

+				$options_list = '';

+				for ($option = 1; $option <= 30; $option++) {

+					$selected = '';

+					if ($option == 10)

+						$selected = 'selected="selected"';

+

+					$options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

+				}

+

+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

+

+				$dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

+				$dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+

+			}

+			echo $dummy_msg;

+			?>

             <script>

                 <?php

 

-                    $default_location = geodir_get_default_location();

-                  $city =  isset($default_location->city) ? $default_location->city : '';

-                  $region =isset($default_location->region) ? $default_location->region : '';

-                  $country =isset($default_location->country) ? $default_location->country : '';

-                  $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-                  $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+					$default_location = geodir_get_default_location();

+				  $city =  isset($default_location->city) ? $default_location->city : '';

+				  $region =isset($default_location->region) ? $default_location->region : '';

+				  $country =isset($default_location->country) ? $default_location->country : '';

+				  $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+				  $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 

-                ?>

+				?>

                 var geocoder = new google.maps.Geocoder();

                 var CITY_ADDRESS = '<?php echo $city.','.$region.','.$country;?>';

                 var bound_lat_lng;

@@ -571,8 +571,8 @@ 
                 }

             </script>

         <?php

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -585,19 +585,19 @@ 
  */

 function geodir_insert_dummy_posts()

 {

-    geodir_default_taxonomies();

+	geodir_default_taxonomies();

 

-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes

+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes

 

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    /**

-     * Contains dumy post content.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('place_dummy_post.php');

+	/**

+	 * Contains dumy post content.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('place_dummy_post.php');

 

 }

 

@@ -611,18 +611,18 @@ 
  */

 function geodir_delete_dummy_posts()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

 

-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

 

 

-    foreach ($post_ids as $post_ids_obj) {

-        wp_delete_post($post_ids_obj->post_id);

-    }

+	foreach ($post_ids as $post_ids_obj) {

+		wp_delete_post($post_ids_obj->post_id);

+	}

 

-    //double check posts are deleted

-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+	//double check posts are deleted

+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

 }

 

 /**

@@ -638,110 +638,110 @@ 
 function geodir_default_taxonomies()

 {

 

-    global $wpdb, $dummy_image_path;

+	global $wpdb, $dummy_image_path;

 

-    $category_array = array('Attractions', 'Hotels', 'Restaurants', 'Food Nightlife', 'Festival', 'Videos', 'Feature');

+	$category_array = array('Attractions', 'Hotels', 'Restaurants', 'Food Nightlife', 'Festival', 'Videos', 'Feature');

 

-    $last_catid = isset($last_catid) ? $last_catid : '';

+	$last_catid = isset($last_catid) ? $last_catid : '';

 

-    $last_term = get_term($last_catid, 'gd_placecategory');

+	$last_term = get_term($last_catid, 'gd_placecategory');

 

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

-    //print_r($uploads) ;

-    for ($i = 0; $i < count($category_array); $i++) {

-        $parent_catid = 0;

-        if (is_array($category_array[$i])) {

-            $cat_name_arr = $category_array[$i];

-            for ($j = 0; $j < count($cat_name_arr); $j++) {

-                $catname = $cat_name_arr[$j];

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

+	//print_r($uploads) ;

+	for ($i = 0; $i < count($category_array); $i++) {

+		$parent_catid = 0;

+		if (is_array($category_array[$i])) {

+			$cat_name_arr = $category_array[$i];

+			for ($j = 0; $j < count($cat_name_arr); $j++) {

+				$catname = $cat_name_arr[$j];

 

-                if (!term_exists($catname, 'gd_placecategory')) {

-                    $last_catid = wp_insert_term($catname, 'gd_placecategory', $args = array('parent' => $parent_catid));

+				if (!term_exists($catname, 'gd_placecategory')) {

+					$last_catid = wp_insert_term($catname, 'gd_placecategory', $args = array('parent' => $parent_catid));

 

-                    if ($j == 0) {

-                        $parent_catid = $last_catid;

-                    }

+					if ($j == 0) {

+						$parent_catid = $last_catid;

+					}

 

 

-                    if (geodir_dummy_folder_exists())

-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

-                    else

-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

-                    $catname = str_replace(' ', '_', $catname);

-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+					if (geodir_dummy_folder_exists())

+						$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+					else

+						$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

+					$catname = str_replace(' ', '_', $catname);

+					$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

 

-                    if (empty($uploaded['error'])) {

-                        $new_path = $uploaded['file'];

-                        $new_url = $uploaded['url'];

-                    }

+					if (empty($uploaded['error'])) {

+						$new_path = $uploaded['file'];

+						$new_url = $uploaded['url'];

+					}

 

-                    $wp_filetype = wp_check_filetype(basename($new_path), null);

-

-                    $attachment = array(

-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),

-                        'post_mime_type' => $wp_filetype['type'],

-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

-                        'post_content' => '',

-                        'post_status' => 'inherit'

-                    );

-                    $attach_id = wp_insert_attachment($attachment, $new_path);

-

-                    // you must first include the image.php file

-                    // for the function wp_generate_attachment_metadata() to work

-                    require_once(ABSPATH . 'wp-admin/includes/image.php');

-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

-                    wp_update_attachment_metadata($attach_id, $attach_data);

-

-                    if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

-                        update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), 'gd_place');

-                    }

-                }

-            }

+					$wp_filetype = wp_check_filetype(basename($new_path), null);

+

+					$attachment = array(

+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+						'post_mime_type' => $wp_filetype['type'],

+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

+						'post_content' => '',

+						'post_status' => 'inherit'

+					);

+					$attach_id = wp_insert_attachment($attachment, $new_path);

+

+					// you must first include the image.php file

+					// for the function wp_generate_attachment_metadata() to work

+					require_once(ABSPATH . 'wp-admin/includes/image.php');

+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

+					wp_update_attachment_metadata($attach_id, $attach_data);

+

+					if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

+						update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), 'gd_place');

+					}

+				}

+			}

 

-        } else {

-            $catname = $category_array[$i];

+		} else {

+			$catname = $category_array[$i];

 

-            if (!term_exists($catname, 'gd_placecategory')) {

-                $last_catid = wp_insert_term($catname, 'gd_placecategory');

+			if (!term_exists($catname, 'gd_placecategory')) {

+				$last_catid = wp_insert_term($catname, 'gd_placecategory');

 

-                if (geodir_dummy_folder_exists())

-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

-                else

-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

-                $catname = str_replace(' ', '_', $catname);

-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+				if (geodir_dummy_folder_exists())

+					$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+				else

+					$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

+				$catname = str_replace(' ', '_', $catname);

+				$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

 

-                if (empty($uploaded['error'])) {

-                    $new_path = $uploaded['file'];

-                    $new_url = $uploaded['url'];

-                }

+				if (empty($uploaded['error'])) {

+					$new_path = $uploaded['file'];

+					$new_url = $uploaded['url'];

+				}

 

-                $wp_filetype = wp_check_filetype(basename($new_path), null);

+				$wp_filetype = wp_check_filetype(basename($new_path), null);

 

-                $attachment = array(

-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),

-                    'post_mime_type' => $wp_filetype['type'],

-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

-                    'post_content' => '',

-                    'post_status' => 'inherit'

-                );

+				$attachment = array(

+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+					'post_mime_type' => $wp_filetype['type'],

+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

+					'post_content' => '',

+					'post_status' => 'inherit'

+				);

 

-                $attach_id = wp_insert_attachment($attachment, $new_path);

+				$attach_id = wp_insert_attachment($attachment, $new_path);

 

 

-                // you must first include the image.php file

-                // for the function wp_generate_attachment_metadata() to work

-                require_once(ABSPATH . 'wp-admin/includes/image.php');

-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

-                wp_update_attachment_metadata($attach_id, $attach_data);

+				// you must first include the image.php file

+				// for the function wp_generate_attachment_metadata() to work

+				require_once(ABSPATH . 'wp-admin/includes/image.php');

+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

+				wp_update_attachment_metadata($attach_id, $attach_data);

 

-                if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

-                    update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), 'gd_place');

-                }

-            }

-        }

+				if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

+					update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), 'gd_place');

+				}

+			}

+		}

 

-    }

+	}

 }

 

 /**

@@ -759,145 +759,145 @@ 
 {

    // print_r($_POST);    print_r($options);    exit;

 

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+	if ((!isset($_POST) || !$_POST) && !$dummy) return false;

 

-    foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+	foreach ($options as $value) {

+		if ($dummy && isset($value['std']))

+			$_POST[$value['id']] = $value['std'];

 

 

-        if (isset($value['type']) && $value['type'] == 'checkbox') :

+		if (isset($value['type']) && $value['type'] == 'checkbox') :

 

-            if (isset($value['id']) && isset($_POST[$value['id']])) {

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                update_option($value['id'], 0);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id']])) {

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				update_option($value['id'], 0);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

-

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

-                endif;

-            } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

-            }

+		elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-        elseif (isset($value['type']) && $value['type'] == 'map') :

-            $post_types = array();

-            $categories = array();

-            $i = 0;

+			if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

+				update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

+				update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

+				if (isset($_POST[$value['id'] . '_crop'])) :

+					update_option($value['id'] . '_crop', 1);

+				else :

+					update_option($value['id'] . '_crop', 0);

+				endif;

+			} else {

+				update_option($value['id'] . '_width', $value['std']);

+				update_option($value['id'] . '_height', $value['std']);

+				update_option($value['id'] . '_crop', 1);

+			}

 

-            if (!empty($_POST['home_map_post_types'])) :

-                foreach ($_POST['home_map_post_types'] as $post_type) :

-                    $post_types[] = $post_type;

-                endforeach;

-            endif;

+		elseif (isset($value['type']) && $value['type'] == 'map') :

+			$post_types = array();

+			$categories = array();

+			$i = 0;

 

-            update_option('geodir_exclude_post_type_on_map', $post_types);

+			if (!empty($_POST['home_map_post_types'])) :

+				foreach ($_POST['home_map_post_types'] as $post_type) :

+					$post_types[] = $post_type;

+				endforeach;

+			endif;

 

-            if (!empty($_POST['post_category'])) :

-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

-                    $categories[$texonomy] = array();

-                    foreach ($cat_arr as $category) :

-                        $categories[$texonomy][] = $category;

-                    endforeach;

-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

-                endforeach;

-            endif;

-            update_option('geodir_exclude_cat_on_map', $categories);

-            update_option('geodir_exclude_cat_on_map_upgrade', 1);

-        elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

+			update_option('geodir_exclude_post_type_on_map', $post_types);

 

+			if (!empty($_POST['post_category'])) :

+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

+					$categories[$texonomy] = array();

+					foreach ($cat_arr as $category) :

+						$categories[$texonomy][] = $category;

+					endforeach;

+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

+				endforeach;

+			endif;

+			update_option('geodir_exclude_cat_on_map', $categories);

+			update_option('geodir_exclude_cat_on_map_upgrade', 1);

+		elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

 

-            if (!empty($_POST['geodir_default_map_language'])):

-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

-            endif;

 

+			if (!empty($_POST['geodir_default_map_language'])):

+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

+			endif;

 

-            if (!empty($_POST['geodir_default_map_search_pt'])):

-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

-            endif;

 

+			if (!empty($_POST['geodir_default_map_search_pt'])):

+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

+			endif;

 

-        elseif (isset($value['type']) && $value['type'] == 'file') :

 

+		elseif (isset($value['type']) && $value['type'] == 'file') :

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

 

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+			if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

 

-                update_option($value['id'], '');

-            }

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

-

-            if (!empty($filename)):

-                $ext = pathinfo($filename, PATHINFO_EXTENSION);

-                $uplaods = array();

-

-                foreach ($uploadedfile as $key => $uplaod):

-                    if ($key == 'name'):

-                        $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

-                    endif;

-                endforeach;

-

-                $uploads = wp_upload_dir();

-

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+				update_option($value['id'], '');

+			}

+

+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

+

+			if (!empty($filename)):

+				$ext = pathinfo($filename, PATHINFO_EXTENSION);

+				$uplaods = array();

+

+				foreach ($uploadedfile as $key => $uplaod):

+					if ($key == 'name'):

+						$uplaods[$key] = $filename;

+					else :

+						$uplaods[$key] = $uplaod;

+					endif;

+				endforeach;

+

+				$uploads = wp_upload_dir();

+

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                $upload_overrides = array('test_form' => false);

-                $movefile = wp_handle_upload($uplaods, $upload_overrides);

+				$upload_overrides = array('test_form' => false);

+				$movefile = wp_handle_upload($uplaods, $upload_overrides);

 

-                update_option($value['id'], $movefile['url']);

+				update_option($value['id'], $movefile['url']);

 

-            endif;

+			endif;

 

-            if (!get_option($value['id']) && isset($value['value'])):

-                update_option($value['id'], $value['value']);

-            endif;

+			if (!get_option($value['id']) && isset($value['value'])):

+				update_option($value['id'], $value['value']);

+			endif;

 

 

-        else :

-            // same menu setting per theme.

-            if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

-            }

+		else :

+			// same menu setting per theme.

+			if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

+				$theme = wp_get_theme();

+				update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+			}

 

-            if (isset($value['id']) && isset($_POST[$value['id']])) {

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                delete_option($value['id']);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id']])) {

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				delete_option($value['id']);

+			}

 

-        endif;

-    }

-    if ($dummy)

-        unset($_POST);

-    return true;

+		endif;

+	}

+	if ($dummy)

+		unset($_POST);

+	return true;

 

 }

 

@@ -946,33 +946,33 @@ 
 function places_custom_fields_tab($tabs)

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

+	if (!empty($geodir_post_types)) {

 

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

 

-            $listing_slug = $geodir_posttype_info['labels']['singular_name'];

+			$listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

-                'subtabs' => array(

-                    array('subtab' => 'custom_fields',

-                        'label' => __('Custom Fields', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                    array('subtab' => 'sorting_options',

-                        'label' => __('Sorting Options', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                ),

-                'tab_index' => 9,

-                'request' => array('listing_type' => $geodir_post_type)

-            );

+			$tabs[$geodir_post_type . '_fields_settings'] = array(

+				'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+				'subtabs' => array(

+					array('subtab' => 'custom_fields',

+						'label' => __('Custom Fields', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+					array('subtab' => 'sorting_options',

+						'label' => __('Sorting Options', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+				),

+				'tab_index' => 9,

+				'request' => array('listing_type' => $geodir_post_type)

+			);

 

-        endforeach;

+		endforeach;

 

-    }

+	}

 

-    return $tabs;

+	return $tabs;

 }

 

 

@@ -988,8 +988,8 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

-    return $tabs;

+	$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

+	return $tabs;

 }

 

 /**

@@ -1004,8 +1004,8 @@ 
  */

 function geodir_compatibility_setting_tab($tabs)

 {

-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

-    return $tabs;

+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

+	return $tabs;

 }

 

 

@@ -1021,144 +1021,144 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

-    return $tabs;

+	$tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

+	return $tabs;

 }

 

 

 if (!function_exists('geodir_edit_post_columns')) {

-    /**

-     * Modify admin post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_edit_post_columns($columns)

-    {

-

-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

-            'categorys' => __('Categories', 'geodirectory'));

-

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

-        {

-            $offset = 0; // should we prepend $array with $data?

-            $offset = count($columns); // or should we append $array with $data? lets pick this one...

-        }

+	/**

+	 * Modify admin post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_edit_post_columns($columns)

+	{

 

-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),

+			'categorys' => __('Categories', 'geodirectory'));

 

-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+		if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+		{

+			$offset = 0; // should we prepend $array with $data?

+			$offset = count($columns); // or should we append $array with $data? lets pick this one...

+		}

 

-        return $columns;

-    }

+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

+

+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+

+		return $columns;

+	}

 }

 

 

 if (!function_exists('geodir_manage_post_columns')) {

-    /**

-     * Adds content to our custom post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post WordPress Post object.

-     * @param string $column The column name.

-     * @param int $post_id The post ID.

-     */

-    function geodir_manage_post_columns($column, $post_id)

-    {

-        global $post, $wpdb;

-

-        switch ($column):

-            /* If displaying the 'city' column. */

-            case 'location' :

-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

-                $location = geodir_get_location($location_id);

-                /* If no city is found, output a default message. */

-                if (empty($location)) {

-                    _e('Unknown', 'geodirectory');

-                } else {

-                    /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

-                }

-                break;

-

-            /* If displaying the 'expire' column. */

-            case 'expire' :

-                $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

-                $d1 = $expire_date; // get expire_date

-                $d2 = date('Y-m-d'); // get current date

-                $state = __('days left', 'geodirectory');

-                $date_diff_text = '';

-                $expire_class = 'expire_left';

-                if ($expire_date != 'Never') {

-                    if (strtotime($d1) < strtotime($d2)) {

-                        $state = __('days overdue', 'geodirectory');

-                        $expire_class = 'expire_over';

-                    }

-                    $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the differance in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

-                }

-                /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

-                /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

-                break;

-

-            /* If displaying the 'categorys' column. */

-            case 'categorys' :

-

-                /* Get the categorys for the post. */

-

-

-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

-

-                /* If terms were found. */

-                if (!empty($terms)) {

-                    $out = array();

-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */

-                    foreach ($terms as $term) {

-                        if (!strstr($term->taxonomy, 'tag')) {

-                            $out[] = sprintf('<a href="%s">%s</a>',

-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

-                            );

-                        }

-                    }

-                    /* Join the terms, separating them with a comma. */

-                    echo(join(', ', $out));

-                } /* If no terms were found, output a default message. */

-                else {

-                    _e('No Categories', 'geodirectory');

-                }

-                break;

+	/**

+	 * Adds content to our custom post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post WordPress Post object.

+	 * @param string $column The column name.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_manage_post_columns($column, $post_id)

+	{

+		global $post, $wpdb;

+

+		switch ($column):

+			/* If displaying the 'city' column. */

+			case 'location' :

+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

+				$location = geodir_get_location($location_id);

+				/* If no city is found, output a default message. */

+				if (empty($location)) {

+					_e('Unknown', 'geodirectory');

+				} else {

+					/* If there is a city id, append 'city name' to the text string. */

+					$add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

+					echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+				}

+				break;

+

+			/* If displaying the 'expire' column. */

+			case 'expire' :

+				$expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

+				$d1 = $expire_date; // get expire_date

+				$d2 = date('Y-m-d'); // get current date

+				$state = __('days left', 'geodirectory');

+				$date_diff_text = '';

+				$expire_class = 'expire_left';

+				if ($expire_date != 'Never') {

+					if (strtotime($d1) < strtotime($d2)) {

+						$state = __('days overdue', 'geodirectory');

+						$expire_class = 'expire_over';

+					}

+					$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the differance in days

+					$date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+				}

+				/* If no expire_date is found, output a default message. */

+				if (empty($expire_date))

+					echo __('Unknown', 'geodirectory');

+				/* If there is a expire_date, append 'days left' to the text string. */

+				else

+					echo $expire_date . $date_diff_text;

+				break;

 

-        endswitch;

-    }

+			/* If displaying the 'categorys' column. */

+			case 'categorys' :

+

+				/* Get the categorys for the post. */

+

+

+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

+

+				/* If terms were found. */

+				if (!empty($terms)) {

+					$out = array();

+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */

+					foreach ($terms as $term) {

+						if (!strstr($term->taxonomy, 'tag')) {

+							$out[] = sprintf('<a href="%s">%s</a>',

+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

+							);

+						}

+					}

+					/* Join the terms, separating them with a comma. */

+					echo(join(', ', $out));

+				} /* If no terms were found, output a default message. */

+				else {

+					_e('No Categories', 'geodirectory');

+				}

+				break;

+

+		endswitch;

+	}

 }

 

 

 if (!function_exists('geodir_post_sortable_columns')) {

-    /**

-     * Makes admin post listing page columns sortable.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_post_sortable_columns($columns)

-    {

-

-        $columns['expire'] = 'expire';

-

-        return $columns;

-    }

+	/**

+	 * Makes admin post listing page columns sortable.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_post_sortable_columns($columns)

+	{

+

+		$columns['expire'] = 'expire';

+

+		return $columns;

+	}

 }

 

 /**

@@ -1172,49 +1172,49 @@ 
  * @param int $post_id The post ID.

  */

 function geodir_post_information_save($post_id, $post) {

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

-        return;

-    }

+	if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+		return;

+	}

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

+		return;

 

-    if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

-        if (isset($_REQUEST['_status']))

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+	if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

+		if (isset($_REQUEST['_status']))

+			geodir_change_post_status($post_id, $_REQUEST['_status']);

 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+		if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

+			return;

 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        geodir_save_listing($_REQUEST);

-    }

+		geodir_save_listing($_REQUEST);

+	}

 }

 

 if (!function_exists('geodir_insert_csv_post_data') && get_option('geodir_installed')) {

-    /**

-     * Function to insert csv post data.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     */

-    function geodir_insert_csv_post_data()

-    {

-        global $wpdb, $plugin_prefix;

-

-        $svalue = '';

-        ?>

+	/**

+	 * Function to insert csv post data.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 */

+	function geodir_insert_csv_post_data()

+	{

+		global $wpdb, $plugin_prefix;

+

+		$svalue = '';

+		?>

         <script type="text/javascript">

             jQuery(document).ready(function () {

                 jQuery("#import_data").click(function () {

@@ -1254,50 +1254,50 @@ 
         </script>

         <?php

 

-        if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] == 'csv_upload_settings') {

-            if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'success') {

-                $rowcount = (int)$_REQUEST['rowcount'];

-                $uploads = wp_upload_dir();

-                ?>

+		if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] == 'csv_upload_settings') {

+			if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'success') {

+				$rowcount = (int)$_REQUEST['rowcount'];

+				$uploads = wp_upload_dir();

+				?>

                 <div class="updated fade below-h2" id="message" style="background-color: rgb(255, 251, 204); margin-left:0px; margin-top:0px; margin-bottom:10px;">

                 <?php

-                    if ($_REQUEST['invalidcount'] == 0 && $_REQUEST['blank_address'] == 0 && $_REQUEST['invalid_post_type'] == 0 && $_REQUEST['invalid_title'] == 0) {

-                        echo '<p>' . CSV_INSERT_DATA . '</p>';

-                    }

-                    echo '<p>';

-                    printf(CSV_TOTAL_RECORD, $rowcount);

-                    echo '</p>';

-

-                    if (isset($_REQUEST['invalidcount']) && $_REQUEST['invalidcount'] > 0) {

-                        echo '<p>';

-                        printf(CSV_INVALID_DEFUALT_ADDRESS, (int)$_REQUEST['invalidcount'], (int)$_REQUEST['total_records']);

-                        echo '</p>';

-                    }

+					if ($_REQUEST['invalidcount'] == 0 && $_REQUEST['blank_address'] == 0 && $_REQUEST['invalid_post_type'] == 0 && $_REQUEST['invalid_title'] == 0) {

+						echo '<p>' . CSV_INSERT_DATA . '</p>';

+					}

+					echo '<p>';

+					printf(CSV_TOTAL_RECORD, $rowcount);

+					echo '</p>';

+

+					if (isset($_REQUEST['invalidcount']) && $_REQUEST['invalidcount'] > 0) {

+						echo '<p>';

+						printf(CSV_INVALID_DEFUALT_ADDRESS, (int)$_REQUEST['invalidcount'], (int)$_REQUEST['total_records']);

+						echo '</p>';

+					}

 

-                    if (isset($_REQUEST['blank_address']) && $_REQUEST['blank_address'] > 0) {

-                        echo '<p>';

-                        printf(CSV_INVALID_TOTAL_RECORD, (int)$_REQUEST['blank_address'], (int)$_REQUEST['total_records']);

-                        echo '</p>';

-                    }

+					if (isset($_REQUEST['blank_address']) && $_REQUEST['blank_address'] > 0) {

+						echo '<p>';

+						printf(CSV_INVALID_TOTAL_RECORD, (int)$_REQUEST['blank_address'], (int)$_REQUEST['total_records']);

+						echo '</p>';

+					}

 

-                    if (isset($_REQUEST['invalid_post_type']) && $_REQUEST['invalid_post_type'] > 0) {

-                        echo '<p>';

-                        printf(CSV_INVALID_POST_TYPE, (int)$_REQUEST['invalid_post_type'], (int)$_REQUEST['total_records']);

-                        echo '</p>';

-                    }

+					if (isset($_REQUEST['invalid_post_type']) && $_REQUEST['invalid_post_type'] > 0) {

+						echo '<p>';

+						printf(CSV_INVALID_POST_TYPE, (int)$_REQUEST['invalid_post_type'], (int)$_REQUEST['total_records']);

+						echo '</p>';

+					}

 

-                    if (isset($_REQUEST['invalid_title']) && $_REQUEST['invalid_title'] > 0) {

-                        echo '<p>';

-                        printf(CSV_BLANK_POST_TITLE, (int)$_REQUEST['invalid_title'], (int)$_REQUEST['total_records']);

-                        echo '</p>';

-                    }

+					if (isset($_REQUEST['invalid_title']) && $_REQUEST['invalid_title'] > 0) {

+						echo '<p>';

+						printf(CSV_BLANK_POST_TITLE, (int)$_REQUEST['invalid_title'], (int)$_REQUEST['total_records']);

+						echo '</p>';

+					}

 

-                    if (isset($_REQUEST['upload_files']) && $_REQUEST['upload_files'] > 0) {

-                        echo '<p>';

-                        printf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir']);

-                        echo '</p>';

-                    }

-                    ?>

+					if (isset($_REQUEST['upload_files']) && $_REQUEST['upload_files'] > 0) {

+						echo '<p>';

+						printf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir']);

+						echo '</p>';

+					}

+					?>

                 </div>

             <?php } ?>

             <?php if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'wrong') { ?>

@@ -1312,7 +1312,7 @@ 
                     <p><?php echo CSV_UPLOAD_ONLY; ?></p>

                 </div>

             <?php }

-        } ?>

+		} ?>

         <?php /* ?>

     <table class="form-table">

         <tbody>

@@ -1350,10 +1350,10 @@ 
     </table>

 	<?php */ ?>

         <?php

-        $id = "gd_import_csv";

-        $multiple = false; // allow multiple files upload

-        $uploads = wp_upload_dir();

-        ?>

+		$id = "gd_import_csv";

+		$multiple = false; // allow multiple files upload

+		$uploads = wp_upload_dir();

+		?>

         <style>

             .gd-csv-form-table .filelist div.file:last-child {

                 display: block !important;

@@ -1711,12 +1711,12 @@ 
                                 <br/>

                                 <a href="<?php echo geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'?>"><?php _e("Download sample csv", 'geodirectory')?></a>

                                 <?php

-                                /**

-                                 * Called just after the sample CSV download link.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action('geodir_sample_csv_download_link'); ?>

+								/**

+								 * Called just after the sample CSV download link.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action('geodir_sample_csv_download_link'); ?>

                                 <span class="ajaxnonceplu"

                                       id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span><br/>

                                 <br/>

@@ -1775,362 +1775,362 @@ 
 }

 

 if (!function_exists('geodir_import_data')) {

-    /**

-     * Imports data from csv file.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $current_user Current user object.

-     */

-    function geodir_import_data()

-    {

+	/**

+	 * Imports data from csv file.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $current_user Current user object.

+	 */

+	function geodir_import_data()

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

+		global $wpdb, $plugin_prefix, $current_user;

 

-        if (isset($_REQUEST['geodir_import_data']) && !empty($_REQUEST['geodir_import_data'])) {

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+		if (isset($_REQUEST['geodir_import_data']) && !empty($_REQUEST['geodir_import_data'])) {

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $curr_img_url = $_REQUEST['filename'];

+			$curr_img_url = $_REQUEST['filename'];

 

-            $image_name_arr = explode('/', $curr_img_url);

+			$image_name_arr = explode('/', $curr_img_url);

 

-            $filename = end($image_name_arr);

+			$filename = end($image_name_arr);

 

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

 

-            $destination_path = $uploads_dir . '/temp_' . $current_user->data->ID;

+			$destination_path = $uploads_dir . '/temp_' . $current_user->data->ID;

 

-            $csv_target_path = $target_path;

+			$csv_target_path = $target_path;

 

-            ini_set('auto_detect_line_endings', true);

+			ini_set('auto_detect_line_endings', true);

 

-            $fd = fopen($target_path, "rt");

+			$fd = fopen($target_path, "rt");

 

-            $total_records = 0;

-            $rowcount = 0;

-            $address_invalid = 0;

-            $blank_address = 0;

-            $upload_files = 0;

-            $invalid_post_type = 0;

-            $invalid_title = 0;

+			$total_records = 0;

+			$rowcount = 0;

+			$address_invalid = 0;

+			$blank_address = 0;

+			$upload_files = 0;

+			$invalid_post_type = 0;

+			$invalid_title = 0;

 

-            $customKeyarray = array();

+			$customKeyarray = array();

 

-            $gd_post_info = array();

+			$gd_post_info = array();

 

-            $post_location = array();

-            $countpost = 0;

+			$post_location = array();

+			$countpost = 0;

 

-            $uploaded_file_type = pathinfo($filename, PATHINFO_EXTENSION);

+			$uploaded_file_type = pathinfo($filename, PATHINFO_EXTENSION);

 

-            $extensionarr = array('csv', 'CSV');

+			$extensionarr = array('csv', 'CSV');

 

-            if (in_array($uploaded_file_type, $extensionarr)) {

+			if (in_array($uploaded_file_type, $extensionarr)) {

 

-                while (!feof($fd)) {

-                    $buffer = fgetcsv($fd, 40960);

+				while (!feof($fd)) {

+					$buffer = fgetcsv($fd, 40960);

 

-                    if ($rowcount == 0) {

-                        for ($k = 0; $k < count($buffer); $k++) {

-                            $customKeyarray[$k] = $buffer[$k];

-                        }

+					if ($rowcount == 0) {

+						for ($k = 0; $k < count($buffer); $k++) {

+							$customKeyarray[$k] = $buffer[$k];

+						}

 

-                        if ($customKeyarray[0] == '') {

-                            echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&emsg=wrong';

-                            exit;

-                        }

-                    } elseif (!empty($buffer)) {

-

-                        $total_records++;

-

-                        $post_title = addslashes($buffer[0]);

-                        $current_post_author = $buffer[1];

-                        $post_desc = addslashes($buffer[2]);

-                        $post_cat = array();

-                        $catids_arr = array();

-                        $post_cat = trim($buffer[3]); // comma seperated category name

-

-                        if ($post_cat) {

-                            $post_cat_arr = explode(',', $post_cat);

-

-                            for ($c = 0; $c < count($post_cat_arr); $c++) {

-                                $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

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

-                                    if (in_array($buffer[5], geodir_get_posttypes())) {

-                                        $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        }

-                                    }

-                                }

-                            }

-                        }

+						if ($customKeyarray[0] == '') {

+							echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&emsg=wrong';

+							exit;

+						}

+					} elseif (!empty($buffer)) {

+

+						$total_records++;

+

+						$post_title = addslashes($buffer[0]);

+						$current_post_author = $buffer[1];

+						$post_desc = addslashes($buffer[2]);

+						$post_cat = array();

+						$catids_arr = array();

+						$post_cat = trim($buffer[3]); // comma seperated category name

+

+						if ($post_cat) {

+							$post_cat_arr = explode(',', $post_cat);

+

+							for ($c = 0; $c < count($post_cat_arr); $c++) {

+								$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

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

+									if (in_array($buffer[5], geodir_get_posttypes())) {

+										$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

+										if (get_term_by('name', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										}

+									}

+								}

+							}

+						}

 

-                        if (!$catids_arr) {

-                            $catids_arr[] = 1;

-                        }

+						if (!$catids_arr) {

+							$catids_arr[] = 1;

+						}

 

-                        $post_tags = trim($buffer[4]); // comma seperated tags

+						$post_tags = trim($buffer[4]); // comma seperated tags

 

-                        $tag_arr = '';

-                        if ($post_tags) {

+						$tag_arr = '';

+						if ($post_tags) {

 

-                            $tag_arr = explode(',', $post_tags);

-                        }

+							$tag_arr = explode(',', $post_tags);

+						}

 

-                        $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+						$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

 

-                        $error = '';

-                        if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+						$error = '';

+						if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

 

-                            $invalid_post_type++;

-                            continue;

+							$invalid_post_type++;

+							continue;

 

-                        }

+						}

 

-                        if ($post_title != '') {

+						if ($post_title != '') {

 

-                            $menu_order = 0;

+							$menu_order = 0;

 

-                            $image_folder_name = 'uplaod/';

+							$image_folder_name = 'uplaod/';

 

-                            $image_names = array();

+							$image_names = array();

 

-                            for ($c = 5; $c < count($customKeyarray); $c++) {

-                                $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

+							for ($c = 5; $c < count($customKeyarray); $c++) {

+								$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

 

-                                if ($customKeyarray[$c] == 'IMAGE') {

-                                    $buffer[$c] = trim($buffer[$c]);

-                                    if (!empty($buffer[$c])) {

-                                        $image_names[] = $buffer[$c];

-                                    }

+								if ($customKeyarray[$c] == 'IMAGE') {

+									$buffer[$c] = trim($buffer[$c]);

+									if (!empty($buffer[$c])) {

+										$image_names[] = $buffer[$c];

+									}

 

-                                }

+								}

 

-                                if ($customKeyarray[$c] == 'alive_days') {

-                                    if ($buffer[$c] != '0' && $buffer[$c] != '') {

-                                        $submitdata = date('Y-m-d');

-                                        $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

-                                    } else {

-                                        $gd_post_info['expire_date'] = 'Never';

-                                    }

-                                }

+								if ($customKeyarray[$c] == 'alive_days') {

+									if ($buffer[$c] != '0' && $buffer[$c] != '') {

+										$submitdata = date('Y-m-d');

+										$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+									} else {

+										$gd_post_info['expire_date'] = 'Never';

+									}

+								}

 

 

-                                if ($customKeyarray[$c] == 'post_city') {

-                                    $post_city = addslashes($buffer[$c]);

-                                }

+								if ($customKeyarray[$c] == 'post_city') {

+									$post_city = addslashes($buffer[$c]);

+								}

 

-                                if ($customKeyarray[$c] == 'post_region') {

-                                    $post_region = addslashes($buffer[$c]);

-                                }

+								if ($customKeyarray[$c] == 'post_region') {

+									$post_region = addslashes($buffer[$c]);

+								}

 

-                                if ($customKeyarray[$c] == 'post_country') {

-                                    $post_country = addslashes($buffer[$c]);

-                                }

+								if ($customKeyarray[$c] == 'post_country') {

+									$post_country = addslashes($buffer[$c]);

+								}

 

-                                if ($customKeyarray[$c] == 'post_latitude') {

-                                    $post_latitude = addslashes($buffer[$c]);

-                                }

+								if ($customKeyarray[$c] == 'post_latitude') {

+									$post_latitude = addslashes($buffer[$c]);

+								}

 

-                                if ($customKeyarray[$c] == 'post_longitude') {

-                                    $post_longitude = addslashes($buffer[$c]);

-                                }

+								if ($customKeyarray[$c] == 'post_longitude') {

+									$post_longitude = addslashes($buffer[$c]);

+								}

 

-                            }

+							}

 

-                            /* ================ before array create ============== */

+							/* ================ before array create ============== */

 

-                            $location_result = geodir_get_default_location();

+							$location_result = geodir_get_default_location();

 

-                            if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

+							if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

 

-                                $blank_address++;

-                                continue;

+								$blank_address++;

+								continue;

 

-                            } elseif ($location_result->location_id == 0) {

+							} elseif ($location_result->location_id == 0) {

 

-                                if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) ||

-                                    (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) ||

-                                    (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))

-                                ) {

+								if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) ||

+									(geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) ||

+									(geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))

+								) {

 

-                                    $address_invalid++;

-                                    continue;

+									$address_invalid++;

+									continue;

 

-                                }

+								}

 

-                            }

+							}

 

 

-                            $my_post['post_title'] = $post_title;

-                            $my_post['post_content'] = $post_desc;

-                            $my_post['post_type'] = addslashes($buffer[5]);

-                            $my_post['post_author'] = $current_post_author;

-                            $my_post['post_status'] = 'publish';

-                            $my_post['post_category'] = $catids_arr;

-                            $my_post['post_tags'] = $tag_arr;

+							$my_post['post_title'] = $post_title;

+							$my_post['post_content'] = $post_desc;

+							$my_post['post_type'] = addslashes($buffer[5]);

+							$my_post['post_author'] = $current_post_author;

+							$my_post['post_status'] = 'publish';

+							$my_post['post_category'] = $catids_arr;

+							$my_post['post_tags'] = $tag_arr;

 

 

-                            $gd_post_info['post_tags'] = $tag_arr;

-                            $gd_post_info['post_title'] = $post_title;

-                            $gd_post_info['post_status'] = 'publish';

-                            $gd_post_info['submit_time'] = time();

-                            $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+							$gd_post_info['post_tags'] = $tag_arr;

+							$gd_post_info['post_title'] = $post_title;

+							$gd_post_info['post_status'] = 'publish';

+							$gd_post_info['submit_time'] = time();

+							$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

 

 

-                            $last_postid = wp_insert_post($my_post);

-                            $countpost++;

+							$last_postid = wp_insert_post($my_post);

+							$countpost++;

 

 

-                            // Check if we need to save post location as new location

+							// Check if we need to save post location as new location

 

-                            if ($location_result->location_id > 0) {

-                                if (isset($post_city) && isset($post_region)) {

+							if ($location_result->location_id > 0) {

+								if (isset($post_city) && isset($post_region)) {

 

-                                    $request_info['post_location'] = array('city' => $post_city,

-                                        'region' => $post_region,

-                                        'country' => $post_country,

-                                        'geo_lat' => $post_latitude,

-                                        'geo_lng' => $post_longitude);

+									$request_info['post_location'] = array('city' => $post_city,

+										'region' => $post_region,

+										'country' => $post_country,

+										'geo_lat' => $post_latitude,

+										'geo_lng' => $post_longitude);

 

-                                    $post_location_info = $request_info['post_location'];

-                                    if ($location_id = geodir_add_new_location($post_location_info))

-                                        $post_location_id = $location_id;

+									$post_location_info = $request_info['post_location'];

+									if ($location_id = geodir_add_new_location($post_location_info))

+										$post_location_id = $location_id;

 

-                                } else {

-                                    $post_location_id = 0;

-                                }

-                            } else {

-                                $post_location_id = 0;

-                            }

+								} else {

+									$post_location_id = 0;

+								}

+							} else {

+								$post_location_id = 0;

+							}

 

-                            /* ------- get default package info ----- */

-                            $payment_info = array();

-                            $package_info = array();

+							/* ------- get default package info ----- */

+							$payment_info = array();

+							$package_info = array();

 

-                            $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

-                            $package_id = '';

-                            if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

-                                $package_id = $gd_post_info['package_id'];

-                            }

+							$package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+							$package_id = '';

+							if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

+								$package_id = $gd_post_info['package_id'];

+							}

 

-                            if (!empty($package_info)) {

-                                $payment_info['package_id'] = $package_info['pid'];

-                                if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                                    $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

-                                } else {

-                                    $payment_info['expire_date'] = 'Never';

-                                }

+							if (!empty($package_info)) {

+								$payment_info['package_id'] = $package_info['pid'];

+								if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

+									$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+								} else {

+									$payment_info['expire_date'] = 'Never';

+								}

 

-                                $gd_post_info = array_merge($gd_post_info, $payment_info);

-                            }

+								$gd_post_info = array_merge($gd_post_info, $payment_info);

+							}

 

 

-                            $gd_post_info['post_location_id'] = $post_location_id;

+							$gd_post_info['post_location_id'] = $post_location_id;

 

-                            $post_type = get_post_type($last_postid);

+							$post_type = get_post_type($last_postid);

 

-                            $table = $plugin_prefix . $post_type . '_detail';

+							$table = $plugin_prefix . $post_type . '_detail';

 

-                            geodir_save_post_info($last_postid, $gd_post_info);

+							geodir_save_post_info($last_postid, $gd_post_info);

 

-                            if (!empty($image_names)) {

-                                $upload_files++;

-                                $menu_order = 1;

-                                foreach ($image_names as $image_name) {

+							if (!empty($image_names)) {

+								$upload_files++;

+								$menu_order = 1;

+								foreach ($image_names as $image_name) {

 

-                                    $img_name_arr = explode('.', $image_name);

+									$img_name_arr = explode('.', $image_name);

 

-                                    $uploads = wp_upload_dir();

-                                    $sub_dir = $uploads['subdir'];

+									$uploads = wp_upload_dir();

+									$sub_dir = $uploads['subdir'];

 

-                                    $arr_file_type = wp_check_filetype($image_name);

-                                    $uploaded_file_type = $arr_file_type['type'];

+									$arr_file_type = wp_check_filetype($image_name);

+									$uploaded_file_type = $arr_file_type['type'];

 

-                                    $attachment = array();

-                                    $attachment['post_id'] = $last_postid;

-                                    $attachment['title'] = $img_name_arr[0];

-                                    $attachment['content'] = '';

-                                    $attachment['file'] = $sub_dir . '/' . $image_name;

-                                    $attachment['mime_type'] = $uploaded_file_type;

-                                    $attachment['menu_order'] = $menu_order;

-                                    $attachment['is_featured'] = 0;

+									$attachment = array();

+									$attachment['post_id'] = $last_postid;

+									$attachment['title'] = $img_name_arr[0];

+									$attachment['content'] = '';

+									$attachment['file'] = $sub_dir . '/' . $image_name;

+									$attachment['mime_type'] = $uploaded_file_type;

+									$attachment['menu_order'] = $menu_order;

+									$attachment['is_featured'] = 0;

 

-                                    $attachment_set = '';

+									$attachment_set = '';

 

-                                    foreach ($attachment as $key => $val) {

-                                        if ($val != '')

-                                            $attachment_set .= $key . " = '" . $val . "', ";

-                                    }

+									foreach ($attachment as $key => $val) {

+										if ($val != '')

+											$attachment_set .= $key . " = '" . $val . "', ";

+									}

 

-                                    $attachment_set = trim($attachment_set, ", ");

+									$attachment_set = trim($attachment_set, ", ");

 

-                                    $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+									$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

 

-                                    if ($menu_order == 1) {

+									if ($menu_order == 1) {

 

-                                        $post_type = get_post_type($last_postid);

+										$post_type = get_post_type($last_postid);

 

-                                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+										$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

 

-                                    }

+									}

 

-                                    $menu_order++;

-                                }

-                            }

+									$menu_order++;

+								}

+							}

 

-                            $gd_post_info['package_id'] = $package_id;

+							$gd_post_info['package_id'] = $package_id;

 

-                            /** This action is documented in geodirectory-functions/post-functions.php */

-                            do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

+							/** This action is documented in geodirectory-functions/post-functions.php */

+							do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

 

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

-                                if (in_array($buffer[5], geodir_get_posttypes())) {

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

+								if (in_array($buffer[5], geodir_get_posttypes())) {

 

-                                    $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

-                                    wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

-                                    wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

+									$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

+									wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

+									wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

 

 

-                                    $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

+									$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

 

-                                    $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

-                                    geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

+									$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

+									geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

 

-                                }

+								}

 

-                            }

+							}

+

+						} else {

+							$invalid_title++;

+						}

+					}

+					$rowcount++;

+				}

+				fclose($fd);

+				//unlink($csv_target_path);

+				//rmdir($destination_path);

+				if (!empty($filename))

+					geodir_remove_temp_images();

 

-                        } else {

-                            $invalid_title++;

-                        }

-                    }

-                    $rowcount++;

-                }

-                fclose($fd);

-                //unlink($csv_target_path);

-                //rmdir($destination_path);

-                if (!empty($filename))

-                    geodir_remove_temp_images();

-

-

-                echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&msg=success&rowcount=' . $countpost . '&invalidcount=' . $address_invalid . '&blank_address=' . $blank_address . '&upload_files=' . $upload_files . '&invalid_post_type=' . $invalid_post_type . '&invalid_title=' . $invalid_title . '&total_records=' . $total_records;

-                exit;

-            } else {

-                echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&emsg=csvonly';

-                exit;

-            }

-        }

 

-    }

+				echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&msg=success&rowcount=' . $countpost . '&invalidcount=' . $address_invalid . '&blank_address=' . $blank_address . '&upload_files=' . $upload_files . '&invalid_post_type=' . $invalid_post_type . '&invalid_title=' . $invalid_title . '&total_records=' . $total_records;

+				exit;

+			} else {

+				echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&emsg=csvonly';

+				exit;

+			}

+		}

+

+	}

 }

 

 /**

@@ -2146,105 +2146,105 @@ 
  */

 function geodir_admin_fields($options)

 {

-    global $geodirectory;

-

-    $first_title = true;

-    $tab_id = '';

-    $i = 0;

-    foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

-        $desc = '';

-        switch ($value['type']) :

-            case 'dummy_installer':

-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

-                geodir_autoinstall_admin_header($post_type);

-                break;

-            case 'csv_installer':

-                geodir_insert_csv_post_data();

-                break;

-            case 'title':

-

-                if ($i == 0) {

-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

-                    echo '<div class="inner_content_tab_main">';

-                }

+	global $geodirectory;

+

+	$first_title = true;

+	$tab_id = '';

+	$i = 0;

+	foreach ($options as $value) :

+		if (!isset($value['name'])) $value['name'] = '';

+		if (!isset($value['class'])) $value['class'] = '';

+		if (!isset($value['css'])) $value['css'] = '';

+		if (!isset($value['std'])) $value['std'] = '';

+		$desc = '';

+		switch ($value['type']) :

+			case 'dummy_installer':

+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

+				geodir_autoinstall_admin_header($post_type);

+				break;

+			case 'csv_installer':

+				geodir_insert_csv_post_data();

+				break;

+			case 'title':

+

+				if ($i == 0) {

+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

+					echo '<div class="inner_content_tab_main">';

+				}

 

-                $i++;

+				$i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+				if (isset($value['id']) && $value['id'])

+					$tab_id = $value['id'];

 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

 

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

-                    if ($first_title === true) {

-                        $first_title = false;

-                    } else {

-                        echo '</div>';

-                    }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

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

+					if ($first_title === true) {

+						$first_title = false;

+					} else {

+						echo '</div>';

+					}

+					echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-                }

+					echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+				}

 

-                /**

-                 * Called after a GeoDirectory settings title is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id'].

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

-                break;

-

-            case 'no_tabs':

-

-                echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-

-                break;

-

-            case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

-                /**

-                 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_start.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

-

-                break;

-            case 'sectionend':

-                /**

-                 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

-                echo '</table>';

-                /**

-                 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

-                break;

-            case 'text':

-                ?>

+				/**

+				 * Called after a GeoDirectory settings title is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id'].

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_settings_' . sanitize_title($value['id']));

+				break;

+

+			case 'no_tabs':

+

+				echo '<div class="inner_content_tab_main">';

+				echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+

+				break;

+

+			case 'sectionstart':

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+				if (isset($value['name']) && $value['name'])

+					echo '<h3>' . $value['name'] . $desc . '</h3>';

+				/**

+				 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_start.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+				echo '<table class="form-table">' . "\n\n";

+

+				break;

+			case 'sectionend':

+				/**

+				 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+				echo '</table>';

+				/**

+				 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+				break;

+			case 'text':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -2253,15 +2253,15 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'password':

-                ?>

+			case 'password':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -2270,42 +2270,42 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'html_content':

-                ?>

+			case 'html_content':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'color' :

-                ?>

+			case 'color' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>" type="text"

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>" class="colorpick"/> <span

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>" class="colorpick"/> <span

                         class="description"><?php echo $value['desc']; ?></span>

 

                     <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv"

                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>

                 </td>

                 </tr><?php

-                break;

-            case 'image_width' :

-                ?>

+				break;

+			case 'image_width' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -2327,9 +2327,9 @@ 
 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

-                break;

-            case 'select':

-                ?>

+				break;

+			case 'select':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -2338,30 +2338,30 @@ 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            $geodir_select_value = '';

-                            if (get_option($value['id']) != '') {

-                                if (get_option($value['id']) != '' && get_option($value['id']) == $key)

-                                    $geodir_select_value = ' selected="selected" ';

-                            } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

-                            }

+						foreach ($value['options'] as $key => $val) {

+							$geodir_select_value = '';

+							if (get_option($value['id']) != '') {

+								if (get_option($value['id']) != '' && get_option($value['id']) == $key)

+									$geodir_select_value = ' selected="selected" ';

+							} else {

+								if ($value['std'] == $key)

+									$geodir_select_value = ' selected="selected" ';

+							}

 

 

-                            ?>

+							?>

                             <option

                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option>

                         <?php

-                        }

-                        ?>

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'multiselect':

-                ?>

+			case 'multiselect':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

@@ -2371,27 +2371,27 @@ 
                                             data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            if (strpos($key, 'optgroup_start-') === 0) {

-                                ?><optgroup label="<?php echo ucfirst($val); ?>"><?php

-                            } else if (strpos($key, 'optgroup_end-') === 0) {

-                                ?></optgroup><?php

-                            } else {

-                                ?>

+						foreach ($value['options'] as $key => $val) {

+							if (strpos($key, 'optgroup_start-') === 0) {

+								?><optgroup label="<?php echo ucfirst($val); ?>"><?php

+							} else if (strpos($key, 'optgroup_end-') === 0) {

+								?></optgroup><?php

+							} else {

+								?>

                                 <option

                                     value="<?php echo esc_attr($key); ?>" <?php if (is_array(get_option($value['id']))) {

-                                    if (in_array($key, get_option($value['id']))) { ?> selected="selected" <?php }

-                                } ?>><?php echo ucfirst($val) ?></option>

+									if (in_array($key, get_option($value['id']))) { ?> selected="selected" <?php }

+								} ?>><?php echo ucfirst($val) ?></option>

                             <?php

-                            }

-                        }

-                        ?>

+							}

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'file':

-                ?>

+				break;

+			case 'file':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp">

@@ -2411,87 +2411,87 @@ 
                     <?php } ?>

                 </td>

                 </tr><?php

-                break;

-            case 'map_default_settings' :

-                ?>

+				break;

+			case 'map_default_settings' :

+				?>

 

                 <tr valign="top">

                     <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

-                            $arr_map_langages = array(

-                                'ar' => __('ARABIC', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'bg' => __('BULGARIAN', 'geodirectory'),

-                                'bn' => __('BENGALI', 'geodirectory'),

-                                'ca' => __('CATALAN', 'geodirectory'),

-                                'cs' => __('CZECH', 'geodirectory'),

-                                'da' => __('DANISH', 'geodirectory'),

-                                'de' => __('GERMAN', 'geodirectory'),

-                                'el' => __('GREEK', 'geodirectory'),

-                                'en' => __('ENGLISH', 'geodirectory'),

-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

-                                'es' => __('SPANISH', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'fa' => __('FARSI', 'geodirectory'),

-                                'fi' => __('FINNISH', 'geodirectory'),

-                                'fil' => __('FILIPINO', 'geodirectory'),

-                                'fr' => __('FRENCH', 'geodirectory'),

-                                'gl' => __('GALICIAN', 'geodirectory'),

-                                'gu' => __('GUJARATI', 'geodirectory'),

-                                'hi' => __('HINDI', 'geodirectory'),

-                                'hr' => __('CROATIAN', 'geodirectory'),

-                                'hu' => __('HUNGARIAN', 'geodirectory'),

-                                'id' => __('INDONESIAN', 'geodirectory'),

-                                'it' => __('ITALIAN', 'geodirectory'),

-                                'iw' => __('HEBREW', 'geodirectory'),

-                                'ja' => __('JAPANESE', 'geodirectory'),

-                                'kn' => __('KANNADA', 'geodirectory'),

-                                'ko' => __('KOREAN', 'geodirectory'),

-                                'lt' => __('LITHUANIAN', 'geodirectory'),

-                                'lv' => __('LATVIAN', 'geodirectory'),

-                                'ml' => __('MALAYALAM', 'geodirectory'),

-                                'mr' => __('MARATHI', 'geodirectory'),

-                                'nl' => __('DUTCH', 'geodirectory'),

-                                'no' => __('NORWEGIAN', 'geodirectory'),

-                                'pl' => __('POLISH', 'geodirectory'),

-                                'pt' => __('PORTUGUESE', 'geodirectory'),

-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

-                                'ro' => __('ROMANIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'sk' => __('SLOVAK', 'geodirectory'),

-                                'sl' => __('SLOVENIAN', 'geodirectory'),

-                                'sr' => __('SERBIAN', 'geodirectory'),

-                                'sv' => __('	SWEDISH', 'geodirectory'),

-                                'tl' => __('TAGALOG', 'geodirectory'),

-                                'ta' => __('TAMIL', 'geodirectory'),

-                                'te' => __('TELUGU', 'geodirectory'),

-                                'th' => __('THAI', 'geodirectory'),

-                                'tr' => __('TURKISH', 'geodirectory'),

-                                'uk' => __('UKRAINIAN', 'geodirectory'),

-                                'vi' => __('VIETNAMESE', 'geodirectory'),

-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

-                            );

-                            $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

-                            foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

-

-                                ?>

+							$arr_map_langages = array(

+								'ar' => __('ARABIC', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'bg' => __('BULGARIAN', 'geodirectory'),

+								'bn' => __('BENGALI', 'geodirectory'),

+								'ca' => __('CATALAN', 'geodirectory'),

+								'cs' => __('CZECH', 'geodirectory'),

+								'da' => __('DANISH', 'geodirectory'),

+								'de' => __('GERMAN', 'geodirectory'),

+								'el' => __('GREEK', 'geodirectory'),

+								'en' => __('ENGLISH', 'geodirectory'),

+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

+								'es' => __('SPANISH', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'fa' => __('FARSI', 'geodirectory'),

+								'fi' => __('FINNISH', 'geodirectory'),

+								'fil' => __('FILIPINO', 'geodirectory'),

+								'fr' => __('FRENCH', 'geodirectory'),

+								'gl' => __('GALICIAN', 'geodirectory'),

+								'gu' => __('GUJARATI', 'geodirectory'),

+								'hi' => __('HINDI', 'geodirectory'),

+								'hr' => __('CROATIAN', 'geodirectory'),

+								'hu' => __('HUNGARIAN', 'geodirectory'),

+								'id' => __('INDONESIAN', 'geodirectory'),

+								'it' => __('ITALIAN', 'geodirectory'),

+								'iw' => __('HEBREW', 'geodirectory'),

+								'ja' => __('JAPANESE', 'geodirectory'),

+								'kn' => __('KANNADA', 'geodirectory'),

+								'ko' => __('KOREAN', 'geodirectory'),

+								'lt' => __('LITHUANIAN', 'geodirectory'),

+								'lv' => __('LATVIAN', 'geodirectory'),

+								'ml' => __('MALAYALAM', 'geodirectory'),

+								'mr' => __('MARATHI', 'geodirectory'),

+								'nl' => __('DUTCH', 'geodirectory'),

+								'no' => __('NORWEGIAN', 'geodirectory'),

+								'pl' => __('POLISH', 'geodirectory'),

+								'pt' => __('PORTUGUESE', 'geodirectory'),

+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

+								'ro' => __('ROMANIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'sk' => __('SLOVAK', 'geodirectory'),

+								'sl' => __('SLOVENIAN', 'geodirectory'),

+								'sr' => __('SERBIAN', 'geodirectory'),

+								'sv' => __('	SWEDISH', 'geodirectory'),

+								'tl' => __('TAGALOG', 'geodirectory'),

+								'ta' => __('TAMIL', 'geodirectory'),

+								'te' => __('TELUGU', 'geodirectory'),

+								'th' => __('THAI', 'geodirectory'),

+								'tr' => __('TURKISH', 'geodirectory'),

+								'uk' => __('UKRAINIAN', 'geodirectory'),

+								'vi' => __('VIETNAMESE', 'geodirectory'),

+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

+							);

+							$geodir_default_map_language = get_option('geodir_default_map_language');

+							if (empty($geodir_default_map_language))

+								$geodir_default_map_language = 'en';

+							foreach ($arr_map_langages as $language_key => $language_txt) {

+								if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

+									$geodir_default_language_selected = "selected='selected'";

+								else

+									$geodir_default_language_selected = '';

+

+								?>

                                 <option

                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>

 

                             <?php }

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

@@ -2502,46 +2502,46 @@ 
                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

-                            $post_types = geodir_get_posttypes('array');

-                            $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

-                            if (is_array($post_types)) {

-                                foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

-

-                                    ?>

+							$post_types = geodir_get_posttypes('array');

+							$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+							if (empty($geodir_default_map_search_pt))

+								$geodir_default_map_search_pt = 'gd_place';

+							if (is_array($post_types)) {

+								foreach ($post_types as $key => $post_types_obj) {

+									if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

+										$geodir_search_pt_selected = "selected='selected'";

+									else

+										$geodir_search_pt_selected = '';

+

+									?>

                                     <option

                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo $post_types_obj['labels']['singular_name']; ?></option>

 

                                 <?php }

 

-                            }

+							}

 

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

 

                 <?php

-                break;

+				break;

 

-            case 'map':

-                ?>

+			case 'map':

+				?>

                 <tr valign="top">

                     <td class="forminp">

                         <?php

-                        global $post_cat, $cat_display;

-                        $post_types = geodir_get_posttypes('object');

-                        $cat_display = 'checkbox';

-                        $gd_post_types = get_option('geodir_exclude_post_type_on_map');

-                        $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

-                        $count = 1;

-                        ?>

+						global $post_cat, $cat_display;

+						$post_types = geodir_get_posttypes('object');

+						$cat_display = 'checkbox';

+						$gd_post_types = get_option('geodir_exclude_post_type_on_map');

+						$gd_cats = get_option('geodir_exclude_cat_on_map');

+						$gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+						$count = 1;

+						?>

                         <table width="70%" class="widefat">

                             <thead>

                             <tr>

@@ -2550,18 +2550,18 @@ 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>

                             </tr>

                             <?php

-                            $gd_categs = $gd_cats;

-                            foreach ($post_types as $key => $post_types_obj) :

-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

-                                $gd_taxonomy = geodir_get_taxonomies($key);

-                                if ($gd_cats_upgrade) {

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

-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

-                                    $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

-                                }

-                                $post_cat = implode(',', $gd_cats);

-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

-                                ?>

+							$gd_categs = $gd_cats;

+							foreach ($post_types as $key => $post_types_obj) :

+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

+								$gd_taxonomy = geodir_get_taxonomies($key);

+								if ($gd_cats_upgrade) {

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

+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

+									$gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

+								}

+								$post_cat = implode(',', $gd_cats);

+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

+								?>

                                 <tr>

                                     <td valign="top" width="5%"><?php echo $count; ?></td>

                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -2582,19 +2582,19 @@ 
                     </td>

                 </tr>

                 <?php

-                break;

+				break;

 

-            case 'checkbox' :

+			case 'checkbox' :

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'] ?>">

@@ -2604,49 +2604,49 @@ 
                 </fieldset>

                 <?php

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'radio' :

+			case 'radio' :

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'];?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

-                            echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+							echo 'checked="checked"';

+						}elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'textarea':

-                ?>

+			case 'textarea':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -2659,32 +2659,32 @@ 
 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'editor':

-                ?>

+			case 'editor':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

 

-                    $content = '';

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+					$content = '';

+					if (get_option($value['id']))

+						$content = stripslashes(get_option($value['id']));

+					else

+						$content = $value['std'];

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+					$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

-                    wp_editor($content, esc_attr($value['id']), $editor_settings);

+					wp_editor($content, esc_attr($value['id']), $editor_settings);

 

-                    ?> <span class="description"><?php echo $value['desc'] ?></span>

+					?> <span class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'single_select_page' :

-                // WPML

+			case 'single_select_page' :

+				// WPML

 				$switch_lang = false;

 				$disabled = '';

 				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -2702,18 +2702,18 @@ 
 				//

 				$page_setting = (int)get_option($value['id']);

 

-                $args = array('name' => $value['id'],

-                    'id' => $value['id'],

-                    'sort_column' => 'menu_order',

-                    'sort_order' => 'ASC',

-                    'show_option_none' => ' ',

-                    'class' => $value['class'],

-                    'echo' => false,

-                    'selected' => $page_setting);

+				$args = array('name' => $value['id'],

+					'id' => $value['id'],

+					'sort_column' => 'menu_order',

+					'sort_order' => 'ASC',

+					'show_option_none' => ' ',

+					'class' => $value['class'],

+					'echo' => false,

+					'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+				if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

 

-                ?>

+				?>

                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -2724,18 +2724,18 @@ 
 				if ($switch_lang) {

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

 				}

-                break;

-            case 'single_select_country' :

-                $countries = $geodirectory->countries->countries;

-                $country_setting = (string)get_option($value['id']);

-                if (strstr($country_setting, ':')) :

-                    $country = current(explode(':', $country_setting));

-                    $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

-                    $state = '*';

-                endif;

-                ?>

+				break;

+			case 'single_select_country' :

+				$countries = $geodirectory->countries->countries;

+				$country_setting = (string)get_option($value['id']);

+				if (strstr($country_setting, ':')) :

+					$country = current(explode(':', $country_setting));

+					$state = end(explode(':', $country_setting));

+				else :

+					$country = $country_setting;

+					$state = '*';

+				endif;

+				?>

                 <tr valign="top">

                 <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -2746,12 +2746,12 @@ 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'multi_select_countries' :

-                $countries = $geodirectory->countries->countries;

-                asort($countries);

-                $selections = (array)get_option($value['id']);

-                ?>

+				break;

+			case 'multi_select_countries' :

+				$countries = $geodirectory->countries->countries;

+				asort($countries);

+				$selections = (array)get_option($value['id']);

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -2759,22 +2759,22 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

-                        endforeach;

-                        ?>

+						if ($countries) foreach ($countries as $key => $val) :

+							echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+						endforeach;

+						?>

                     </select>

                 </td>

                 </tr>

 

                 <?php

 

-                break;

+				break;

 

-            case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

-                    ?>

+			case 'google_analytics' :

+				$selections = (array)get_option($value['id']);

+				if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+					?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                         <td class="forminp">

@@ -2782,19 +2782,19 @@ 
 

                             <?php

 

-                            $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

-                            $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-                            $response_type = "&response_type=code";

-                            $client_id = "&client_id=".get_option('geodir_ga_client_id');

-                            $access_type = "&access_type=offline";

-                            $approval_prompt = "&approval_prompt=force";

+							$oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

+							$scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

+							$state = "&state=123";//any string

+							$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+							$response_type = "&response_type=code";

+							$client_id = "&client_id=".get_option('geodir_ga_client_id');

+							$access_type = "&access_type=offline";

+							$approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+							$auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

 

 

-                            ?>

+							?>

                             <script>

                                 function gd_ga_popup() {

                                     var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

@@ -2809,47 +2809,47 @@ 
                             </script>

 

                             <?php

-                            if (get_option('gd_ga_refresh_token')) {

-                                ?>

+							if (get_option('gd_ga_refresh_token')) {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Re-authorize', 'geodirectory'); ?></span>

                                 <span

                                     style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

-                            } else {

-                                ?>

+							} else {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

                             <?php

-                            }

-                            ?>

+							}

+							?>

                         </td>

                     </tr>

 

                 <?php

-                }

+				}

 

-                break;

+				break;

 

-            case 'field_seperator' :

+			case 'field_seperator' :

 

-                ?>

+				?>

                 <tr valign="top">

                     <td colspan="2" class="forminp geodir_line_seperator"></td>

                 </tr>

                 <?php

 

-                break;

+				break;

 

-        endswitch;

+		endswitch;

 

-    endforeach;

+	endforeach;

 

-    if ($first_title === false) {

-        echo "</div>";

-    }

+	if ($first_title === false) {

+		echo "</div>";

+	}

 

-    ?>

+	?>

 

     <script type="text/javascript">

 

@@ -2909,33 +2909,33 @@ 
  */

 function geodir_post_info_setting()

 {

-    global $post, $post_id;

-

-    $post_type = get_post_type();

-

-    $package_info = array();

-

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

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

-    echo '<div id="geodir_wrapper">';

-    /**

-     * Called before the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_after_default_field_in_meta_box'

-     */

-    do_action('geodir_before_default_field_in_meta_box');

-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

-    // to display all fields in one information box

-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

-    /**

-     * Called after the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_before_default_field_in_meta_box'

-     */

-    do_action('geodir_after_default_field_in_meta_box');

-    echo '</div>';

+	global $post, $post_id;

+

+	$post_type = get_post_type();

+

+	$package_info = array();

+

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

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

+	echo '<div id="geodir_wrapper">';

+	/**

+	 * Called before the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_after_default_field_in_meta_box'

+	 */

+	do_action('geodir_before_default_field_in_meta_box');

+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

+	// to display all fields in one information box

+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

+	/**

+	 * Called after the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_before_default_field_in_meta_box'

+	 */

+	do_action('geodir_after_default_field_in_meta_box');

+	echo '</div>';

 }

 

 /**

@@ -2948,18 +2948,18 @@ 
  */

 function geodir_post_addinfo_setting()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    $post_type = get_post_type();

+	$post_type = get_post_type();

 

-    $package_info = array();

+	$package_info = array();

 

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

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

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

-    echo '<div id="geodir_wrapper">';

-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

-    echo '</div>';

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

+	echo '<div id="geodir_wrapper">';

+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

+	echo '</div>';

 

 }

 

@@ -2973,60 +2973,60 @@ 
  */

 function geodir_post_attachments()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

-    if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

-        geodir_show_featured_image($post_id, 'thumbnail');

-    }

+	if (geodir_get_featured_image($post_id, 'thumbnail')) {

+		echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+		geodir_show_featured_image($post_id, 'thumbnail');

+	}

 

-    $image_limit = 0;

+	$image_limit = 0;

 

-    ?>

+	?>

 

 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+		} ?>

     </h5>

 

 

     <?php

 

-    $curImages = geodir_get_images($post_id);

-    $place_img_array = array();

+	$curImages = geodir_get_images($post_id);

+	$place_img_array = array();

 

-    if (!empty($curImages)):

-        foreach ($curImages as $p_img):

-            $place_img_array[] = $p_img->src;

-        endforeach;

-    endif;

+	if (!empty($curImages)):

+		foreach ($curImages as $p_img):

+			$place_img_array[] = $p_img->src;

+		endforeach;

+	endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+	if (!empty($place_img_array))

+		$curImages = implode(',', $place_img_array);

 

 

-    // adjust values here

-    $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+	// adjust values here

+	$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.

+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.

 

-    $multiple = true; // allow multiple files upload

+	$multiple = true; // allow multiple files upload

 

-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-    ?>

+	?>

 

     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">

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

@@ -3068,13 +3068,13 @@ 
  */

 function geodir_action_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-        if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

-        }

-    }

+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

+		}

+	}

 }

 

 /**

@@ -3089,39 +3089,39 @@ 
  */

 function geodir_notification_add_bcc_option($settings)

 {

-    if (!empty($settings)) {

-        $new_settings = array();

-        foreach ($settings as $setting) {

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

-                $geodir_bcc_listing_published_yes = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('Yes', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '1',

-                    'radiogroup' => 'start'

-                );

-

-                $geodir_bcc_listing_published_no = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('No', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '0',

-                    'radiogroup' => 'end'

-                );

-

-                $new_settings[] = $geodir_bcc_listing_published_yes;

-                $new_settings[] = $geodir_bcc_listing_published_no;

-            }

-            $new_settings[] = $setting;

-        }

-        $settings = $new_settings;

-    }

+	if (!empty($settings)) {

+		$new_settings = array();

+		foreach ($settings as $setting) {

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

+				$geodir_bcc_listing_published_yes = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('Yes', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '1',

+					'radiogroup' => 'start'

+				);

+

+				$geodir_bcc_listing_published_no = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('No', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '0',

+					'radiogroup' => 'end'

+				);

+

+				$new_settings[] = $geodir_bcc_listing_published_yes;

+				$new_settings[] = $geodir_bcc_listing_published_no;

+			}

+			$new_settings[] = $setting;

+		}

+		$settings = $new_settings;

+	}

 

-    return $settings;

+	return $settings;

 }

 

 

@@ -3136,19 +3136,19 @@ 
  */

 function get_gd_theme_compat_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-

-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

-        if (isset($_POST['export'])) {

-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

-        } else {

-            echo json_encode($themes[$_POST['theme']]);

-        }

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

 

-    }

+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

+		if (isset($_POST['export'])) {

+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

+		} else {

+			echo json_encode($themes[$_POST['theme']]);

+		}

+

+	}

 

-    die();

+	die();

 }

 

 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -3162,20 +3162,20 @@ 
  */

 function get_gd_theme_compat_import_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {

-        $json = json_decode(stripslashes($_POST['theme']), true);

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

-            $key = sanitize_text_field(key($json));

-            $themes[$key] = $json[$key];

-            update_option('gd_theme_compats', $themes);

-            echo $key;

-            die();

-        }

-    }

-    echo '0';

-    die();

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {

+		$json = json_decode(stripslashes($_POST['theme']), true);

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

+			$key = sanitize_text_field(key($json));

+			$themes[$key] = $json[$key];

+			update_option('gd_theme_compats', $themes);

+			echo $key;

+			die();

+		}

+	}

+	echo '0';

+	die();

 }

 

 

@@ -3188,39 +3188,39 @@ 
  */

 function gd_set_theme_compat()

 {

-    global $wpdb;

-    $theme = wp_get_theme();

+	global $wpdb;

+	$theme = wp_get_theme();

 

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

 

-    $theme_compats = get_option('gd_theme_compats');

-    $current_compat = get_option('gd_theme_compat');

-    $current_compat = str_replace("_custom", "", $current_compat);

+	$theme_compats = get_option('gd_theme_compats');

+	$current_compat = get_option('gd_theme_compat');

+	$current_compat = str_replace("_custom", "", $current_compat);

 

-    if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

-        return;

-    }// if already running corect compat then bail

+	if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

+		return;

+	}// if already running corect compat then bail

 

-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

-        update_option('gd_theme_compat', $theme_name);

-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

+		update_option('gd_theme_compat', $theme_name);

+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

 

-        // if there are default options to set then set them

-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

+		// if there are default options to set then set them

+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

 

-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

-                update_option($key, $val);

-            }

-        }

+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

+				update_option($key, $val);

+			}

+		}

 

-    } else {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-    }

+	} else {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+	}

 

 

 }

@@ -3235,9 +3235,9 @@ 
  */

 function gd_check_avada_compat()

 {

-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

-        add_action('admin_notices', 'gd_avada_compat_warning');

-    }

+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

+		add_action('admin_notices', 'gd_avada_compat_warning');

+	}

 }

 

 

@@ -3250,22 +3250,22 @@ 
 function gd_avada_compat_warning()

 {

 

-    /*

+	/*

     $msg_type = error

     $msg_type = updated fade

     $msg_type = update-nag

     */

 

-    $plugin = 'avada-nag';

-    $timestamp = 'avada-nag1234';

-    $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

-    echo "<p>$message</p>";

-    echo "</div>";

+	$plugin = 'avada-nag';

+	$timestamp = 'avada-nag1234';

+	$message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

+	echo '<div id="' . $timestamp . '"  class="error">';

+	echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

+	echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+	echo "<p>$message</p>";

+	echo "</div>";

 

-    ?>

+	?>

     <script>

         function gdRemoveANotification($plugin, $timestamp) {

 

@@ -3333,10 +3333,10 @@ 
  */

 function geodir_avada_remove_notification()

 {

-    update_option('avada_nag', TRUE);

+	update_option('avada_nag', TRUE);

 

-    // Always die in functions echoing ajax content

-    die();

+	// Always die in functions echoing ajax content

+	die();

 }

 

 

@@ -3395,7 +3395,7 @@ 
 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

 			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

+			wp_redirect($redirect_url);

 			exit;

 		}

 		

@@ -3425,10 +3425,10 @@ 
  * @package GeoDirectory

  */

 function geodir_hide_admin_preview_button() {

-    global $post_type;

-    $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

+	global $post_type;

+	$post_types = geodir_get_posttypes();

+	if(in_array($post_type, $post_types))

+		echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

@@ -3443,7 +3443,7 @@ 
  */

 function geodir_import_export_tab( $tabs ) {

 	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

-    return $tabs;

+	return $tabs;

 }

 

 /**

@@ -3458,26 +3458,26 @@ 
 function geodir_import_export_page() {

 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

-    /**

-     * Filter sample category data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_cats_sample_csv Sample category data csv file url.

-     */

+	/**

+	 * Filter sample category data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_cats_sample_csv Sample category data csv file url.

+	 */

 	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

 	

 	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

-    /**

-     * Filter sample post data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_posts_sample_csv Sample post data csv file url.

-     */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+	/**

+	 * Filter sample post data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_posts_sample_csv Sample post data csv file url.

+	 */

+	$gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

 	

 	$gd_posttypes = geodir_get_posttypes( 'array' );

 	

@@ -3500,14 +3500,14 @@ 
 	$gd_chunksize_options[100000] = 100000;

 	 

 	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+	  * Filter max entries per export csv file.

+	  *

+	  * @since 1.5.6

+	  * @package GeoDirectory

+	  *

+	  * @param string $gd_chunksize_options Entries options.

+	  */

+	$gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

@@ -3523,12 +3523,12 @@ 
   <div class="gd-content-heading">

 

   <?php

-    ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

-    ini_restore('max_execution_time');

+	ini_set('max_execution_time', 999999);

+	$ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+	ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

-        ?>

+	if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+		?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

@@ -3694,7 +3694,7 @@ 
 						 * Called just after the sample CSV download link.

 						 *

 						 * @since 1.0.0

-                         * @package GeoDirectory

+						 * @package GeoDirectory

 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

@@ -3778,11 +3778,11 @@ 
 	 *

 	 * Called after the last setting on the GD > Import & Export page.

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param array $gd_posttypes GD post types.

-     * @param array $gd_chunksize_options File chunk size options.

-     * @param string $nonce Wordpress security token for GD import & export.

+	 * @param array $gd_chunksize_options File chunk size options.

+	 * @param string $nonce Wordpress security token for GD import & export.

 	 */

 	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

 	?>

@@ -4422,44 +4422,44 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

-        require_once(ABSPATH."/wp-admin/includes/file.php");

-    }

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@3';

-            return false;

-        }

+	if(!function_exists('get_filesystem_method')){

+		require_once(ABSPATH."/wp-admin/includes/file.php");

+	}

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@3';

+			return false;

+		}

 

-        global $wp_filesystem;

-        return $wp_filesystem;

-        /* do our file manipulations below */

-    } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@33';

-            return false;

-        }

+		global $wp_filesystem;

+		return $wp_filesystem;

+		/* do our file manipulations below */

+	} elseif (defined('FTP_USER')) {

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

 

-        global $wp_filesystem;

-        //return '@@@1';

-        return $wp_filesystem;

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@33';

+			return false;

+		}

 

-    } else {

-        //return '@@@2';

-        /* don't have direct write access. Prompt user with our notice */

-        add_action('admin_notice', 'geodir_filesystem_notice');

-        return false;

-    }

+		global $wp_filesystem;

+		//return '@@@1';

+		return $wp_filesystem;

+

+	} else {

+		//return '@@@2';

+		/* don't have direct write access. Prompt user with our notice */

+		add_action('admin_notice', 'geodir_filesystem_notice');

+		return false;

+	}

 

 }

 

@@ -4477,10 +4477,10 @@ 
  */

 function geodir_filesystem_notice()

 {   if ( defined( 'DOING_AJAX' ) ){return;}

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-    } elseif (!defined('FTP_USER')) {

-        ?>

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+	} elseif (!defined('FTP_USER')) {

+		?>

         <div class="error">

             <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>

                 <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a>

@@ -4506,1235 +4506,1235 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

-    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

+	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

     

-    error_reporting(0);

+	error_reporting(0);

 

-    // try to set higher limits for import

-    $max_input_time = ini_get('max_input_time');

-    $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+	// try to set higher limits for import

+	$max_input_time = ini_get('max_input_time');

+	$max_execution_time = ini_get('max_execution_time');

+	$memory_limit= ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

-        ini_set('max_input_time', 3000);

-    }

+	if(!$max_input_time || $max_input_time<3000){

+		ini_set('max_input_time', 3000);

+	}

 

-    if(!$max_execution_time || $max_execution_time<3000){

-        ini_set('max_execution_time', 3000);

-    }

+	if(!$max_execution_time || $max_execution_time<3000){

+		ini_set('max_execution_time', 3000);

+	}

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

-            ini_set('memory_limit', '256M');

-        }

-    }

+	if($memory_limit && str_replace('M','',$memory_limit)){

+		if(str_replace('M','',$memory_limit)<256){

+			ini_set('memory_limit', '256M');

+		}

+	}

 

-    $json = array();

+	$json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !current_user_can( 'manage_options' ) ) {

+		wp_send_json( $json );

+	}

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

+		wp_send_json( $json );

+	}

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

 

-    $wp_filesystem = geodir_init_filesystem();

-    if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

-    }

+	$wp_filesystem = geodir_init_filesystem();

+	if (!$wp_filesystem) {

+		$json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

-    }

+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

-        }

-    }

+	$csv_file_dir = geodir_path_import_export( false );

+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

+			wp_send_json( $json );

+		}

+	}

 

-    switch ( $task ) {

-        case 'export_posts': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+	switch ( $task ) {

+		case 'export_posts': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            if ( $post_type == 'gd_event' ) {

-                //add_filter( 'geodir_imex_count_posts', 'geodir_imex_count_events', 10, 2 );

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

-            }

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			if ( $post_type == 'gd_event' ) {

+				//add_filter( 'geodir_imex_count_posts', 'geodir_imex_count_events', 10, 2 );

+				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+			}

+			$file_name = $post_type . '_' . date( 'dmyHi' );

+			$posts_count = geodir_get_posts_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

 

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-                exit;

-            } else {				

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_posts = $posts_count;

-                    if ($chunk_per_page > $total_posts) {

-                        $chunk_per_page = $total_posts;

-                    }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				exit;

+			} else {				

+				if ( !$posts_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_posts = $posts_count;

+					if ($chunk_per_page > $total_posts) {

+						$chunk_per_page = $total_posts;

+					}

+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+					}

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $posts_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_cats': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $posts_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_cats': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			$file_name = $post_type . 'category_' . date( 'dmyHi' );

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+			$terms_count = geodir_get_terms_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-            } else {				

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_terms = $terms_count;

-                    if ($chunk_per_page > $terms_count) {

-                        $chunk_per_page = $terms_count;

-                    }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			} else {				

+				if ( !$terms_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_terms = $terms_count;

+					if ($chunk_per_page > $terms_count) {

+						$chunk_per_page = $terms_count;

+					}

+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );

                     

-                    $j = $chunk_page_no;					

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;					

+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $terms_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );			

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $terms_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_locations': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_locations_' . date( 'dmyHi' );			

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+			$items_count = (int)geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;					

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;					

+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'prepare_import':

-        case 'import_cat':

-        case 'import_post':

-        case 'import_loc': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

-            }

-            // WPML

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'prepare_import':

+		case 'import_cat':

+		case 'import_post':

+		case 'import_loc': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

+			}

+			// WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+			ini_set( 'auto_detect_line_endings', true );

             

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-            $uploads_subdir = $uploads['subdir'];

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+			$uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+			$csv_file_arr = explode( '/', $csv_file );

+			$csv_filename = end( $csv_file_arr );

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

-            $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+			$json['file'] = $csv_file;

+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

                 

-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-                    $json['error'] = NULL;

-                    $json['rows'] = 0;

+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+					$json['error'] = NULL;

+					$json['rows'] = 0;

                     

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

-                                $file[] = $data;

-                            }

-                        }

-                        fclose($handle);

-                    }

+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+							if ( !empty( $data ) ) {

+								$file[] = $data;

+							}

+						}

+						fclose($handle);

+					}

 

-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

                     

-                    if (!$json['rows'] > 0) {

-                        $json['error'] = __('No data found in csv file.', 'geodirectory');

-                    }

-                } else {

-                    wp_send_json( $json );

-                }

-            } else {

-                wp_send_json( $json );

-            }

+					if (!$json['rows'] > 0) {

+						$json['error'] = __('No data found in csv file.', 'geodirectory');

+					}

+				} else {

+					wp_send_json( $json );

+				}

+			} else {

+				wp_send_json( $json );

+			}

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

-            }

+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

+				wp_send_json( $json );

+			}

             

-            $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+			$total = $json['rows'];

+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

             

-            $count = $limit;

-            $requested_limit = $limit;

+			$count = $limit;

+			$requested_limit = $limit;

             

-            if ($count < $total) {

-                $count = $processed + $count;

-                if ($count > $total) {

-                    $count = $total;

-                }

-            } else {

-                $count = $total;

-            }

+			if ($count < $total) {

+				$count = $processed + $count;

+				if ($count > $total) {

+					$count = $total;

+				}

+			} else {

+				$count = $total;

+			}

             

-            $created = 0;

-            $updated = 0;

-            $skipped = 0;

-            $invalid = 0;

-            $invalid_addr = 0;

-            $images = 0;

+			$created = 0;

+			$updated = 0;

+			$skipped = 0;

+			$invalid = 0;

+			$invalid_addr = 0;

+			$images = 0;

             

-            $invalid_title = 0;

-            $customKeyarray = array();

-            $gd_post_info = array();

-            $post_location = array();

-            $countpost = 0;

+			$invalid_title = 0;

+			$customKeyarray = array();

+			$gd_post_info = array();

+			$post_location = array();

+			$countpost = 0;

             

-            $post_types = geodir_get_posttypes();

+			$post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {				

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+			if ( $task == 'import_cat' ) {				

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

                     

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

                             

-                            $cat_id = '';

-                            $cat_name = '';

-                            $cat_slug = '';

-                            $cat_posttype = '';

-                            $cat_parent = '';

-                            $cat_description = '';

-                            $cat_schema = '';

-                            $cat_top_description = '';

-                            $cat_image = '';

-                            $cat_icon = '';

-                            $cat_language = '';

+							$cat_id = '';

+							$cat_name = '';

+							$cat_slug = '';

+							$cat_posttype = '';

+							$cat_parent = '';

+							$cat_description = '';

+							$cat_schema = '';

+							$cat_top_description = '';

+							$cat_image = '';

+							$cat_icon = '';

+							$cat_language = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

-                                    $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

-                                    $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

-                                    $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

-                                    $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

-                                    $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

-                                    $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

-                                    $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

-                                    $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

-                                    $cat_icon = $row[$c];

-                                }

-                                // WPML

-                                if ($is_wpml && $column == 'cat_language') {

-                                    $cat_language = geodir_strtolower(trim($row[$c]));

-                                }

-                                // WPML

-                                $c++;

-                            }

+							$c = 0;

+							foreach ($columns as $column ) {

+								if ( $column == 'cat_id' ) {

+									$cat_id = (int)$row[$c];

+								} else if ( $column == 'cat_name' ) {

+									$cat_name = $row[$c];

+								} else if ( $column == 'cat_slug' ) {

+									$cat_slug = $row[$c];

+								} else if ( $column == 'cat_posttype' ) {

+									$cat_posttype = $row[$c];

+								} else if ( $column == 'cat_parent' ) {

+									$cat_parent = trim($row[$c]);

+								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+									$cat_schema = $row[$c];

+								} else if ( $column == 'cat_description' ) {

+									$cat_description = $row[$c];

+								} else if ( $column == 'cat_top_description' ) {

+									$cat_top_description = $row[$c];

+								} else if ( $column == 'cat_image' ) {

+									$cat_image = $row[$c];

+								} else if ( $column == 'cat_icon' ) {

+									$cat_icon = $row[$c];

+								}

+								// WPML

+								if ($is_wpml && $column == 'cat_language') {

+									$cat_language = geodir_strtolower(trim($row[$c]));

+								}

+								// WPML

+								$c++;

+							}

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                $invalid++;

-                                continue;

-                            }

+							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+								$invalid++;

+								continue;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

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

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($cat_language, true);

+							}

+							// WPML

                                                         

-                            $term_data = array();

-                            $term_data['name'] = $cat_name;

-                            $term_data['slug'] = $cat_slug;

-                            $term_data['description'] = $cat_description;

-                            $term_data['cat_schema'] = $cat_schema;

-                            $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+							$term_data = array();

+							$term_data['name'] = $cat_name;

+							$term_data['slug'] = $cat_slug;

+							$term_data['description'] = $cat_description;

+							$term_data['cat_schema'] = $cat_schema;

+							$term_data['top_description'] = $cat_top_description;

+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

                             

-                            //$term_data = array_map( 'utf8_encode', $term_data );

+							//$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+							$taxonomy = $cat_posttype . 'category';

                             

-                            $term_data['taxonomy'] = $taxonomy;

+							$term_data['taxonomy'] = $taxonomy;

 

-                            $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

-                                $term_parent = '';

+							$term_parent_id = 0;

+							if ($cat_parent != "" || (int)$cat_parent > 0) {

+								$term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-                                    $term_parent = $term_parent;

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

-                                    $term_parent = $term_parent;

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

-                                    $term_parent = $term_parent;

-                                } else {

-                                    $term_parent_data = array();

-                                    $term_parent_data['name'] = $cat_parent;											

-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );										

-                                    $term_parent_data['taxonomy'] = $taxonomy;

+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+									$term_parent = $term_parent;

+								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+									$term_parent = $term_parent;

+								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+									$term_parent = $term_parent;

+								} else {

+									$term_parent_data = array();

+									$term_parent_data['name'] = $cat_parent;											

+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );										

+									$term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

-                                }

+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+								}

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

-                                }

-                            }

-                            $term_data['parent'] = (int)$term_parent_id;

+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

+									$term_parent_id = (int)$term_parent->term_id;

+								}

+							}

+							$term_data['parent'] = (int)$term_parent_id;

 

-                            $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+							$term_id = NULL;

+							if ( $import_choice == 'update' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+									}

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {										

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                            }

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+									}

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+									}

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$skipped++;

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$skipped++;

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {										

+										$created++;

+									} else {

+										$invalid++;

+									}

+								}

+							} else {

+								$invalid++;

+							}

                             

-                            if ( $term_id ) {

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

-                                }

+							if ( $term_id ) {

+								if ( isset( $term_data['top_description'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+								}

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

-                                }

+								if ( isset( $term_data['cat_schema'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+								}

             

-                                $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+								$attachment = false;

+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_image) != $term_data['image'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

+									$cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_icon) != $term_data['icon'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( $attachment ) {

-                                    $images++;

-                                }

-                            }

+								if ( $attachment ) {

+									$images++;

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

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

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_post' ) {

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_post' ) {

 

-                //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+				//run some stuff to make the import quicker

+				wp_defer_term_counting( true );

+				wp_defer_comment_counting( true );

+				$wpdb->query( 'SET autocommit = 0;' );

 

-                //remove_all_actions('publish_post');

-                //remove_all_actions('transition_post_status');

-                //remove_all_actions('publish_future_post');

+				//remove_all_actions('publish_post');

+				//remove_all_actions('transition_post_status');

+				//remove_all_actions('publish_future_post');

 

 

-                if (!empty($file)) {

-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-                    $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+				if (!empty($file)) {

+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+					$default_status = 'publish';

+					$current_date = date_i18n( 'Y-m-d', time() );

                     

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

 

-                    $processed_actual=0;

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

-                        $gd_post = array();

+					$processed_actual=0;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

+						$gd_post = array();

                         

-                        if (isset($file[$index])) {$processed_actual++;

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+						if (isset($file[$index])) {$processed_actual++;

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

+							$row = array_map( 'addslashes_gpc', $row );

                             

-                            $post_id = '';

-                            $post_title = '';

-                            $post_author = '';

-                            $post_content = '';

-                            $post_category_arr = array();

-                            $default_category = '';

-                            $post_tags = array();

-                            $post_type = '';

-                            $post_status = '';

-                            $geodir_video = '';

-                            $post_address = '';

-                            $post_city = '';

-                            $post_region = '';

-                            $post_country = '';

-                            $post_zip = '';

-                            $post_latitude = '';

-                            $post_longitude = '';

-                            $geodir_timing = '';

-                            $geodir_contact = '';

-                            $geodir_email = '';

-                            $geodir_website = '';

-                            $geodir_twitter = '';

-                            $geodir_facebook = '';

-                            $geodir_twitter = '';

-                            $post_images = array();

+							$post_id = '';

+							$post_title = '';

+							$post_author = '';

+							$post_content = '';

+							$post_category_arr = array();

+							$default_category = '';

+							$post_tags = array();

+							$post_type = '';

+							$post_status = '';

+							$geodir_video = '';

+							$post_address = '';

+							$post_city = '';

+							$post_region = '';

+							$post_country = '';

+							$post_zip = '';

+							$post_latitude = '';

+							$post_longitude = '';

+							$geodir_timing = '';

+							$geodir_contact = '';

+							$geodir_email = '';

+							$geodir_website = '';

+							$geodir_twitter = '';

+							$geodir_facebook = '';

+							$geodir_twitter = '';

+							$post_images = array();

                             

-                            $expire_date = 'Never';

+							$expire_date = 'Never';

                             

-                            $language = '';

-                            $original_post_id = '';

+							$language = '';

+							$original_post_id = '';

                                                         

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                $gd_post[$column] = $row[$c];

+							$c = 0;

+							foreach ($columns as $column ) {

+								$gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

-                                    $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

-                                    $post_title = $row[$c];

-                                } else if ( $column == 'post_author' ) {

-                                    $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

-                                    $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

-                                    $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', $row[$c] );

-                                } else if ( $column == 'post_type' ) {

-                                    $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

-                                    $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

-                                    $post_address = $row[$c];

-                                } else if ( $column == 'post_city' ) {

-                                    $post_city = $row[$c];

-                                } else if ( $column == 'post_region' ) {

-                                    $post_region = $row[$c];

-                                } else if ( $column == 'post_country' ) {

-                                    $post_country = $row[$c];

-                                } else if ( $column == 'post_zip' ) {

-                                    $post_zip = $row[$c];

-                                } else if ( $column == 'post_latitude' ) {

-                                    $post_latitude = $row[$c];

-                                } else if ( $column == 'post_longitude' ) {

-                                    $post_longitude = $row[$c];

-                                } else if ( $column == 'geodir_timing' ) {

-                                    $geodir_timing = $row[$c];

-                                } else if ( $column == 'geodir_contact' ) {

-                                    $geodir_contact = $row[$c];

-                                } else if ( $column == 'geodir_email' ) {

-                                    $geodir_email = $row[$c];

-                                } else if ( $column == 'geodir_website' ) {

-                                    $geodir_website = $row[$c];

-                                } else if ( $column == 'geodir_twitter' ) {

-                                    $geodir_twitter = $row[$c];

-                                } else if ( $column == 'geodir_facebook' ) {

-                                    $geodir_facebook = $row[$c];

-                                } else if ( $column == 'geodir_twitter' ) {

-                                    $geodir_twitter = $row[$c];

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

-                                    $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

-                                    $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                }

-                                // WPML

-                                if ($is_wpml) {

-                                    if ($column == 'language') {

-                                        $language = geodir_strtolower(trim($row[$c]));

-                                    } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

+								if ( $column == 'post_id' ) {

+									$post_id = $row[$c];

+								} else if ( $column == 'post_title' ) {

+									$post_title = $row[$c];

+								} else if ( $column == 'post_author' ) {

+									$post_author = $row[$c];

+								} else if ( $column == 'post_content' ) {

+									$post_content = $row[$c];

+								} else if ( $column == 'post_category' && $row[$c] != '' ) {

+									$post_category_arr = explode( ',', $row[$c] );

+								} else if ( $column == 'default_category' ) {

+									$default_category = wp_kses_normalize_entities($row[$c]);

+								} else if ( $column == 'post_tags' && $row[$c] != '' ) {

+									$post_tags = explode( ',', $row[$c] );

+								} else if ( $column == 'post_type' ) {

+									$post_type = $row[$c];

+								} else if ( $column == 'post_status' ) {

+									$post_status = sanitize_key( $row[$c] );

+								} else if ( $column == 'is_featured' ) {

+									$is_featured = (int)$row[$c];

+								} else if ( $column == 'geodir_video' ) {

+									$geodir_video = $row[$c];

+								} else if ( $column == 'post_address' ) {

+									$post_address = $row[$c];

+								} else if ( $column == 'post_city' ) {

+									$post_city = $row[$c];

+								} else if ( $column == 'post_region' ) {

+									$post_region = $row[$c];

+								} else if ( $column == 'post_country' ) {

+									$post_country = $row[$c];

+								} else if ( $column == 'post_zip' ) {

+									$post_zip = $row[$c];

+								} else if ( $column == 'post_latitude' ) {

+									$post_latitude = $row[$c];

+								} else if ( $column == 'post_longitude' ) {

+									$post_longitude = $row[$c];

+								} else if ( $column == 'geodir_timing' ) {

+									$geodir_timing = $row[$c];

+								} else if ( $column == 'geodir_contact' ) {

+									$geodir_contact = $row[$c];

+								} else if ( $column == 'geodir_email' ) {

+									$geodir_email = $row[$c];

+								} else if ( $column == 'geodir_website' ) {

+									$geodir_website = $row[$c];

+								} else if ( $column == 'geodir_twitter' ) {

+									$geodir_twitter = $row[$c];

+								} else if ( $column == 'geodir_facebook' ) {

+									$geodir_facebook = $row[$c];

+								} else if ( $column == 'geodir_twitter' ) {

+									$geodir_twitter = $row[$c];

+								} else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+									$post_images[] = $row[$c];

+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

+								} else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+									$row[$c] = str_replace('/', '-', $row[$c]);

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+								}

+								// WPML

+								if ($is_wpml) {

+									if ($column == 'language') {

+										$language = geodir_strtolower(trim($row[$c]));

+									} else if ($column == 'original_post_id') {

+										$original_post_id = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

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

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($language, true);

+							}

+							// WPML

 

-                            $gd_post['IMAGE'] = $post_images;

+							$gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

                                                                                                                 

-                            $valid = true;

+							$valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-                                $invalid++;

-                                $valid = false;

-                            }

+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+								$invalid++;

+								$valid = false;

+							}

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

-                                $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

-                                    $invalid_addr++;

-                                    $valid = false;

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

-                                        $invalid_addr++;

-                                        $valid = false;

-                                    } else {

-                                        if (!function_exists('geodir_location_plugin_activated')) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

-                                        }

-                                    }

-                                }

-                            }

+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+							if ( $location_allowed ) {

+								$location_result = geodir_get_default_location();

+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+									$invalid_addr++;

+									$valid = false;

+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

+									if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+										$invalid_addr++;

+										$valid = false;

+									} else {

+										if (!function_exists('geodir_location_plugin_activated')) {

+											$gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+										}

+									}

+								}

+							}

                             

-                            if ( !$valid ) {

-                                continue;

-                            }

+							if ( !$valid ) {

+								continue;

+							}

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+							$cat_taxonomy = $post_type . 'category';

+							$tags_taxonomy = $post_type . '_tags';

                             

-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

-                            }

+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+								$post_category_arr = array_merge(array($default_category), $post_category_arr);

+							}

 

-                            $post_category = array();

-                            $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+							$post_category = array();

+							$default_category_id = NULL;

+							if ( !empty( $post_category_arr ) ) {

+								foreach ( $post_category_arr as $value ) {

+									$category_name = wp_kses_normalize_entities( trim( $value ) );

                                     

-                                    if ( $category_name != '' ) {

-                                        $term_category = array();

+									if ( $category_name != '' ) {

+										$term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else {

-                                            $term_data = array();

-                                            $term_data['name'] = $category_name;											

-                                            //$term_data = array_map( 'utf8_encode', $term_data );										

-                                            $term_data['taxonomy'] = $cat_taxonomy;

+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else {

+											$term_data = array();

+											$term_data['name'] = $category_name;											

+											//$term_data = array_map( 'utf8_encode', $term_data );										

+											$term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

-                                            }

-                                        }

+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

+											if ( $term_id ) {

+												$term_category = get_term( $term_id, $cat_taxonomy );

+											}

+										}

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

-                                            //$post_category[] = $term_category->slug;

-                                            $post_category[] = intval($term_category->term_id);

+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+											//$post_category[] = $term_category->slug;

+											$post_category[] = intval($term_category->term_id);

                                             

-                                            if ($category_name == $default_category) {

-                                                $default_category_id = intval($term_category->term_id);

-                                            }

-                                        }

-                                    }

-                                }

-                            }

+											if ($category_name == $default_category) {

+												$default_category_id = intval($term_category->term_id);

+											}

+										}

+									}

+								}

+							}

 

-                            $save_post = array();

-                            $save_post['post_title'] = $post_title;

-                            $save_post['post_content'] = $post_content;

-                            $save_post['post_type'] = $post_type;

-                            $save_post['post_author'] = $post_author;

-                            $save_post['post_status'] = $post_status;

-                            $save_post['post_category'] = $post_category;

-                            $save_post['post_tags'] = $post_tags;

-

-                            $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $save_post['ID'] = $post_id;

+							$save_post = array();

+							$save_post['post_title'] = $post_title;

+							$save_post['post_content'] = $post_content;

+							$save_post['post_type'] = $post_type;

+							$save_post['post_author'] = $post_author;

+							$save_post['post_status'] = $post_status;

+							$save_post['post_category'] = $post_category;

+							$save_post['post_tags'] = $post_tags;

+

+							$saved_post_id = NULL;

+							if ( $import_choice == 'update' ) {

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$save_post['ID'] = $post_id;

                                     

-                                    if ( wp_update_post( $save_post ) ) {

-                                        $saved_post_id = $post_id;

-                                        $updated++;

-                                    }

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post ) ) {

-                                        $created++;

-                                    }

-                                }

+									if ( wp_update_post( $save_post ) ) {

+										$saved_post_id = $post_id;

+										$updated++;

+									}

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post ) ) {

+										$created++;

+									}

+								}

                                 

-                                if ( !$saved_post_id > 0 ) {

-                                    $invalid++;

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $skipped++;	

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post ) ) {

-                                        $created++;	

-                                    } else {

-                                        $invalid++;

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                            }

+								if ( !$saved_post_id > 0 ) {

+									$invalid++;

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$skipped++;	

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post ) ) {

+										$created++;	

+									} else {

+										$invalid++;

+									}

+								}

+							} else {

+								$invalid++;

+							}

 

-                            if ( (int)$saved_post_id > 0 ) {

-                                // WPML

-                                if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+							if ( (int)$saved_post_id > 0 ) {

+								// WPML

+								if ($is_wpml && $original_post_id > 0 && $language != '') {

+									$wpml_post_type = 'post_' . $post_type;

+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

-                                }

-                                // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+								}

+								// WPML

+								$gd_post_info = geodir_get_post_info( $saved_post_id );

                                 

-                                $gd_post['post_id'] = $saved_post_id;

-                                $gd_post['ID'] = $saved_post_id;

-                                $gd_post['post_tags'] = $post_tags;

-                                $gd_post['post_title'] = $post_title;

-                                $gd_post['post_status'] = $post_status;

-                                $gd_post['submit_time'] = time();

-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+								$gd_post['post_id'] = $saved_post_id;

+								$gd_post['ID'] = $saved_post_id;

+								$gd_post['post_tags'] = $post_tags;

+								$gd_post['post_title'] = $post_title;

+								$gd_post['post_status'] = $post_status;

+								$gd_post['submit_time'] = time();

+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

                                                     

-                                // post location

-                                $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-                                    $post_location_info = array(

-                                                                'city' => $post_city,

-                                                                'region' => $post_region,

-                                                                'country' => $post_country,

-                                                                'geo_lat' => $post_latitude,

-                                                                'geo_lng' => $post_longitude

-                                                            );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

-                                        $post_location_id = $location_id;

-                                    }

-                                }

-                                $gd_post['post_location_id'] = $post_location_id;

+								// post location

+								$post_location_id = 0;

+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+									$post_location_info = array(

+																'city' => $post_city,

+																'region' => $post_region,

+																'country' => $post_country,

+																'geo_lat' => $post_latitude,

+																'geo_lng' => $post_longitude

+															);

+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+										$post_location_id = $location_id;

+									}

+								}

+								$gd_post['post_location_id'] = $post_location_id;

                                 

-                                // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

-                                    $package_id = $gd_post_info->package_id;

-                                }

+								// post package info

+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

+									$package_id = $gd_post_info->package_id;

+								}

                                 

-                                $package_info = array();

-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+								$package_info = array();

+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {

+									$package_info = (array)geodir_get_package_info_by_id($package_id);

                                     

-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

-                                        $package_info = array();

-                                    }

-                                }

+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+										$package_info = array();

+									}

+								}

                                 

-                                if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

-                                }

+								if (empty($package_info)) {

+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

+								}

                                  

-                                if (!empty($package_info))	 {

-                                    $package_id = $package_info['pid'];

+								if (!empty($package_info))	 {

+									$package_id = $package_info['pid'];

                                     

-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

-                                        $gd_post['expire_date'] = $expire_date;

-                                    } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

-                                        } else {

-                                            $gd_post['expire_date'] = 'Never';

-                                        }

-                                    }

+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

+										$gd_post['expire_date'] = $expire_date;

+									} else {

+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

+											$gd_post['alive_days'] = (int)$package_info['days'];

+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+										} else {

+											$gd_post['expire_date'] = 'Never';

+										}

+									}

                                     

-                                    $gd_post['package_id'] = $package_id;

-                                }

+									$gd_post['package_id'] = $package_id;

+								}

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+								$table = $plugin_prefix . $post_type . '_detail';

                                 

-                                if ($post_type == 'gd_event') {

-                                    $gd_post = geodir_imex_process_event_data($gd_post);

-                                }

+								if ($post_type == 'gd_event') {

+									$gd_post = geodir_imex_process_event_data($gd_post);

+								}

                                 

-                                if (isset($gd_post['post_id'])) {

-                                    unset($gd_post['post_id']);

-                                }

+								if (isset($gd_post['post_id'])) {

+									unset($gd_post['post_id']);

+								}

 

-                                // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-                                if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

-                                        $gd_franchise_lock = array();

+								// Export franchise fields

+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+								if ($is_franchise_active) {

+									if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+										$gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

-                                        }

+										if ( isset( $gd_post['gd_franchise_lock'] ) ) {

+											$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

+											$gd_franchise_lock = trim( $gd_franchise_lock );

+											$gd_franchise_lock = explode( ",", $gd_franchise_lock );

+										}

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

-                                    } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

-                                        }

-                                    }

-                                }

+										update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

+										update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+									} else {

+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+										}

+									}

+								}

                                 

-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

-                                    if ($default_category_id) {

-                                        $save_post['post_default_category'] = $default_category_id;

-                                        $gd_post['default_category'] = $default_category_id;

-                                    }

-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

-                                }

+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+									if ($default_category_id) {

+										$save_post['post_default_category'] = $default_category_id;

+										$gd_post['default_category'] = $default_category_id;

+									}

+									$gd_post[$cat_taxonomy] = $save_post['post_category'];

+								}

                                 

-                                // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+								// Save post info

+								geodir_save_post_info( $saved_post_id, $gd_post );

+								// post taxonomies

+								if ( !empty( $save_post['post_category'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

-                                    if ($default_category_id) {

-                                        $post_default_category = $default_category_id;

-                                    }

-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+									if ($default_category_id) {

+										$post_default_category = $default_category_id;

+									}

+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

                                     

-                                    if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-                                    }

+									if ($post_category_str != '' && $post_default_category) {

+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+									}

                                     

-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

-                                }

+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+								}

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

-                                }

+								if ( !empty( $save_post['post_tags'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+								}

 

-                                // Post images

-                                if ( !empty( $post_images ) ) {

-                                    $post_images = array_unique($post_images);

+								// Post images

+								if ( !empty( $post_images ) ) {

+									$post_images = array_unique($post_images);

                                     

-                                    $old_post_images_arr = array();

-                                    $saved_post_images_arr = array();

+									$old_post_images_arr = array();

+									$saved_post_images_arr = array();

                                     

-                                    $order = 1;

+									$order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

-                                                $old_post_images_arr[] = $old_post_image->file;

-                                            }

-                                        }

-                                    }

+									$old_post_images = geodir_get_images( $saved_post_id );

+									if (!empty($old_post_images)) {

+										foreach( $old_post_images as $old_post_image ) {

+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

+												$old_post_images_arr[] = $old_post_image->file;

+											}

+										}

+									}

                                     

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

-                                        $saved_post_images_arr[] = $image_name;

+									foreach ( $post_images as $post_image ) {

+										$image_name = basename( $post_image );

+										$saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

-                                            continue; // Skip if image already exists.

-                                        }

+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+											continue; // Skip if image already exists.

+										}

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+										$image_name_parts = explode( '.', $image_name );

+										array_pop( $image_name_parts );

+										$proper_image_name = implode( '.', $image_name_parts );

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+										$arr_file_type = wp_check_filetype( $image_name );

                                         

-                                        if ( !empty( $arr_file_type ) ) {

-                                            $uploaded_file_type = $arr_file_type['type'];

+										if ( !empty( $arr_file_type ) ) {

+											$uploaded_file_type = $arr_file_type['type'];

                                             

-                                            $attachment = array();

-                                            $attachment['post_id'] = $saved_post_id;

-                                            $attachment['title'] = $proper_image_name;

-                                            $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

-                                            $attachment['mime_type'] = $uploaded_file_type;

-                                            $attachment['menu_order'] = $order;

-                                            $attachment['is_featured'] = 0;

-

-                                            $attachment_set = '';

-                                            foreach ( $attachment as $key => $val ) {

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

-                                                }

-                                            }

-                                            $attachment_set = trim( $attachment_set, ", " );

+											$attachment = array();

+											$attachment['post_id'] = $saved_post_id;

+											$attachment['title'] = $proper_image_name;

+											$attachment['content'] = '';

+											$attachment['file'] = $uploads_subdir . '/' . $image_name;

+											$attachment['mime_type'] = $uploaded_file_type;

+											$attachment['menu_order'] = $order;

+											$attachment['is_featured'] = 0;

+

+											$attachment_set = '';

+											foreach ( $attachment as $key => $val ) {

+												if ( $val != '' ) {

+													$attachment_set .= $key . " = '" . $val . "', ";

+												}

+											}

+											$attachment_set = trim( $attachment_set, ", " );

                                                                                         

-                                            // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+											// Add new attachment

+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

                                                                                         

-                                            $order++;

-                                        }

-                                    }

+											$order++;

+										}

+									}

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

-                                    // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+									// Remove previous attachment

+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

-                                        $menu_order = 1;

+									if ( !empty( $saved_post_images_arr ) ) {

+										$menu_order = 1;

                                         

-                                        foreach ( $saved_post_images_arr as $img_name ) {

-                                            $wpdb->query( $wpdb->prepare( "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d WHERE post_id =%d AND file LIKE %s", array( $menu_order, $saved_post_id, '%/' . $img_name ) ) );

+										foreach ( $saved_post_images_arr as $img_name ) {

+											$wpdb->query( $wpdb->prepare( "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d WHERE post_id =%d AND file LIKE %s", array( $menu_order, $saved_post_id, '%/' . $img_name ) ) );

                                             

-                                            if( $menu_order == 1 ) {

-                                                if ( $featured_image = $wpdb->get_var( $wpdb->prepare( "SELECT file FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =%d AND file LIKE %s", array( $saved_post_id, '%/' . $img_name ) ) ) ) {

-                                                    $wpdb->query( $wpdb->prepare( "UPDATE " . $table . " SET featured_image = %s WHERE post_id =%d", array( $featured_image, $saved_post_id ) ) );

-                                                }

-                                            }

-                                            $menu_order++;

-                                        }

-                                    }

+											if( $menu_order == 1 ) {

+												if ( $featured_image = $wpdb->get_var( $wpdb->prepare( "SELECT file FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =%d AND file LIKE %s", array( $saved_post_id, '%/' . $img_name ) ) ) ) {

+													$wpdb->query( $wpdb->prepare( "UPDATE " . $table . " SET featured_image = %s WHERE post_id =%d", array( $featured_image, $saved_post_id ) ) );

+												}

+											}

+											$menu_order++;

+										}

+									}

                                     

-                                    if ( $order > 1 ) {

-                                        $images++;

-                                    }

-                                }

+									if ( $order > 1 ) {

+										$images++;

+									}

+								}

 

-                                /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+								/** This action is documented in geodirectory-functions/post-functions.php */

+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

                                 

-                                if (isset($is_featured)) {

-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

-                                }

-                                if (isset($gd_post['expire_date'])) {

-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-                                }

-                            }

+								if (isset($is_featured)) {

+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+								}

+								if (isset($gd_post['expire_date'])) {

+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

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

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

 

-                //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-

-                $json = array();

-                $json['processed'] = $processed_actual;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['invalid_addr'] = $invalid_addr;

-                $json['images'] = $images;

+				//undo some stuff to make the import quicker

+				wp_defer_term_counting( false );

+				wp_defer_comment_counting( false );

+				$wpdb->query( 'COMMIT;' );

+				$wpdb->query( 'SET autocommit = 1;' );

+

+				$json = array();

+				$json['processed'] = $processed_actual;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['invalid_addr'] = $invalid_addr;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_loc' ) {

-                global $gd_post_types;

-                $gd_post_types = $post_types;

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_loc' ) {

+				global $gd_post_types;

+				$gd_post_types = $post_types;

                 

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column ) {

-                                if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

-                                    $data[$column] = $row[$c];

-                                }

-                            }

+							foreach ($columns as $c => $column ) {

+								if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

+									$data[$column] = $row[$c];

+								}

+							}

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

-                                $invalid++;

-                                continue;

-                            }

+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+								$invalid++;

+								continue;

+							}

                             

-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+							if ( $import_choice == 'update' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+									}

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$data['location_id'] = (int)$location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    }

+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									}

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {										

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                            }

-                        }

-                    }

-                }

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+									}

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									$skipped++;

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$skipped++;

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {										

+										$created++;

+									} else {

+										$invalid++;

+									}

+								}

+							} else {

+								$invalid++;

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'import_finish':{

-            /**

-             * Run an action when an import finishes.

-             *

-             * This action can be used to fire functions after an import ends.

-             *

-             * @since 1.5.3

-             * @package GeoDirectory

-             */

-            do_action('geodir_import_finished');

-        }

-        break;

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'import_finish':{

+			/**

+			 * Run an action when an import finishes.

+			 *

+			 * This action can be used to fire functions after an import ends.

+			 *

+			 * @since 1.5.3

+			 * @package GeoDirectory

+			 */

+			do_action('geodir_import_finished');

+		}

+		break;

 

-    }

-    echo '0';

-    wp_die();

+	}

+	echo '0';

+	wp_die();

 }

 

 /**

@@ -5778,12 +5778,12 @@ 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

 	}

 	

-    if( !empty( $term ) ) {

+	if( !empty( $term ) ) {

 		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

-    }

+		if( !is_wp_error( $result ) ) {

+			return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

+	}

 	

 	return false;

 }

@@ -5830,16 +5830,16 @@ 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else {

 		return geodir_imex_insert_term( $taxonomy, $term_data );

 	}

@@ -5864,7 +5864,7 @@ 
 	 * Modify returned post counts for the current post type.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param int $posts_count Post counts.

 	 * @param string $post_type Post type.

@@ -6004,7 +6004,7 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

+		$xx=0;

 		foreach ( $posts as $post ) {$xx++;

 			$post_id = $post['ID'];

 			

@@ -6244,7 +6244,7 @@ 
 	 * Modify returned posts SQL query for the current post type.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param int $query The SQL query.

 	 * @param string $post_type Post type.

@@ -6257,7 +6257,7 @@ 
 	 * Modify returned post results for the current post type.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param object $results An object containing all post ids.

 	 * @param string $post_type Post type.

@@ -6983,44 +6983,44 @@ 
  */

 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish')

 {

-    global $wpdb, $current_user;

-

-    $option_value = get_option($option);

-

-    if ($option_value > 0) :

-        if (get_post($option_value)) :

-            // Page exists

-            return;

-        endif;

-    endif;

-

-

-    $page_found = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-            array($slug)

-        )

-    );

-

-    if ($page_found) :

-        // Page exists

-        if (!$option_value) update_option($option, $page_found);

-        return;

-    endif;

-

-    $page_data = array(

-        'post_status' => $status,

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => $page_content,

-        'post_parent' => $post_parent,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-

-    add_option($option, $page_id);

+	global $wpdb, $current_user;

+

+	$option_value = get_option($option);

+

+	if ($option_value > 0) :

+		if (get_post($option_value)) :

+			// Page exists

+			return;

+		endif;

+	endif;

+

+

+	$page_found = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+			array($slug)

+		)

+	);

+

+	if ($page_found) :

+		// Page exists

+		if (!$option_value) update_option($option, $page_found);

+		return;

+	endif;

+

+	$page_data = array(

+		'post_status' => $status,

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => $page_content,

+		'post_parent' => $post_parent,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+

+	add_option($option, $page_id);

 

 }

 

@@ -7051,9 +7051,9 @@ 
  * @package GeoDirectory

  */

 function geodir_admin_upgrade_notice() {

-    $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

-    echo"<div class=\"$class\"> <p>$message</p></div>";

+	$class = "error";

+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+	echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

 

@@ -7069,18 +7069,18 @@ 
  */

 function geodire_admin_upgrade_notice( $plugin_data, $r )

 {

-    // readme contents

-    $args = array(

-        'timeout'     => 15,

-        'redirection' => 5

-    );

-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+	// readme contents

+	$args = array(

+		'timeout'     => 15,

+		'redirection' => 5

+	);

+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

+	$data       = wp_remote_get( $url, $args );

 

-    if (!is_wp_error($data) && $data['response']['code'] == 200) {

+	if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

-        geodir_in_plugin_update_message($data['body']);

-    }

+		geodir_in_plugin_update_message($data['body']);

+	}

 }

 

 

@@ -7088,28 +7088,28 @@ 
 * @param string $body http response body

 */

 function geodir_in_plugin_update_message($content) {

-    // Output Upgrade Notice

-    $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

-    $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

-        //print_r($matches );

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

-

-

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( WC_VERSION, $version, '<' ) ) {

-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

-            }

-            $upgrade_notice .= '</div> ';

-        }

-        }

-    }

-    echo $upgrade_notice;

+	// Output Upgrade Notice

+	$matches        = null;

+	$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+	$upgrade_notice = '';

+	if ( preg_match( $regexp, $content, $matches ) ) {

+		if(empty($matches)){return;}

+		//print_r($matches );

+		$version = trim( $matches[1] );

+		if($version && $version>GEODIRECTORY_VERSION){

+

+

+		$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

+		if ( version_compare( WC_VERSION, $version, '<' ) ) {

+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

+			foreach ( $notices as $index => $line ) {

+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+			}

+			$upgrade_notice .= '</div> ';

+		}

+		}

+	}

+	echo $upgrade_notice;

 }

 

 /**

geodirectory-admin/admin_hooks_actions.php

Indentation +1305 added lines, -1305 removed lines

@@ -1,42 +1,42 @@ 
 <?php

 /**

- * GeoDirectory Admin.

- *

- * Main admin file which loads all settings panels and sets up admin menus.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * GeoDirectory Admin.

+	 *

+	 * Main admin file which loads all settings panels and sets up admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

-    /**

-     * Adds GD setting pages in admin.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global string $current_tab The current settings tab name.

-     */

-    function geodir_admin_init()

-    {

-

-        if (is_admin()):

-            global $current_tab;

-            geodir_redirect_to_admin_panel_on_installed();

-            $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoide Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

-            /**

-             * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

-             *

-             * @since 1.0.0

-             */

-            do_action('admin_panel_init');

-            add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

-

-

-        endif;

-    }

+	/**

+	 * Adds GD setting pages in admin.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global string $current_tab The current settings tab name.

+	 */

+	function geodir_admin_init()

+	{

+

+		if (is_admin()):

+			global $current_tab;

+			geodir_redirect_to_admin_panel_on_installed();

+			$current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

+			if (!(isset($_REQUEST['action']))) // this will avoide Ajax requests

+				geodir_handle_option_form_submit($current_tab); // located in admin function.php

+			/**

+			 * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('admin_panel_init');

+			add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

+

+

+		endif;

+	}

 }

 

 /**

@@ -47,10 +47,10 @@ 
  */

 function geodir_redirect_to_admin_panel_on_installed()

 {

-    if (get_option('geodir_installation_redirect', false)) {

-        delete_option('geodir_installation_redirect');

-        wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

-    }

+	if (get_option('geodir_installation_redirect', false)) {

+		delete_option('geodir_installation_redirect');

+		wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

+	}

 }

 

 /**

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+	geodir_admin_option_form($current_tab);// defined in admin template tags.php

 }

 

 

@@ -83,18 +83,18 @@ 
  */

 function geodir_conditional_admin_script_load()

 {

-    global $pagenow;

+	global $pagenow;

 	

 	// Get the current post type

 	$post_type = geodir_admin_current_post_type();

 	$geodir_post_types = geodir_get_posttypes();

     

 	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

-        add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

-        add_action('admin_enqueue_scripts', 'geodir_admin_styles');

-    }

+		add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

+		add_action('admin_enqueue_scripts', 'geodir_admin_styles');

+	}

 

-    add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

+	add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

 

 }

 

@@ -128,12 +128,12 @@ 
  */

 function create_default_admin_main_nav()

 {

-    add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

-    add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

-    add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

-    add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

-    add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

-    //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

+	add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

+	add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

+	add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

+	add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

+	add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

+	//add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

 

 }

 

@@ -146,16 +146,16 @@ 
  */

 function geodir_admin_list_columns()

 {

-    if ($post_types = geodir_get_posttypes()) {

+	if ($post_types = geodir_get_posttypes()) {

 

-        foreach ($post_types as $post_type):

-            add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

-            //Filter-Payment-Manager to show Package

-            add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

+		foreach ($post_types as $post_type):

+			add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

+			//Filter-Payment-Manager to show Package

+			add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

 

-            add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

-        endforeach;

-    }

+			add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

+		endforeach;

+	}

 }

 

 /**

@@ -168,15 +168,15 @@ 
  */

 function geodir_default_admin_main_tabs($tabs)

 {

-    return $tabs = array(

-        'general_settings' => array('label' => __('General', 'geodirectory')),

-        'design_settings' => array('label' => __('Design', 'geodirectory')),

-        'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

-        'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

-        'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

-        'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

-

-    );

+	return $tabs = array(

+		'general_settings' => array('label' => __('General', 'geodirectory')),

+		'design_settings' => array('label' => __('Design', 'geodirectory')),

+		'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

+		'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

+		'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

+		'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

+

+	);

 }

 

 add_action('do_meta_boxes', 'geodir_remove_image_box');

@@ -189,16 +189,16 @@ 
  */

 function geodir_remove_image_box()

 {

-    global $post;

+	global $post;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

 

-        remove_meta_box('postimagediv', $post->post_type, 'side');

-        remove_meta_box('revisionsdiv', $post->post_type, 'normal');

+		remove_meta_box('postimagediv', $post->post_type, 'side');

+		remove_meta_box('revisionsdiv', $post->post_type, 'normal');

 

-    endif;

+	endif;

 

 }

 

@@ -213,26 +213,26 @@ 
  */

 function geodir_meta_box_add()

 {

-    global $post;

+	global $post;

 

-    $geodir_post_types = geodir_get_posttypes('array');

-    $geodir_posttypes = array_keys($geodir_post_types);

+	$geodir_post_types = geodir_get_posttypes('array');

+	$geodir_posttypes = array_keys($geodir_post_types);

 

-    if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

 

-        $geodir_posttype = $post->post_type;

-        $post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);

+		$geodir_posttype = $post->post_type;

+		$post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);

 

-        // Filter-Payment-Manager

+		// Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+		add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+		add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

-        // no need of this box as all fields moved to main informain box

-        //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

+		// no need of this box as all fields moved to main informain box

+		//add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

 

-    endif;

+	endif;

 

 }

 

@@ -256,23 +256,23 @@ 
 function geodir_hide_post_taxonomy_meta_boxes()

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {

+	if (!empty($geodir_post_types)) {

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {

 

-            $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

+			$gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

-                foreach ($gd_taxonomy as $tax) {

+			if(!empty($gd_taxonomy)) {

+				foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+					remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

 

-                }

-            }

+				}

+			}

 

-        }

-    }

+		}

+	}

 }

 

 add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');

@@ -286,12 +286,12 @@ 
  */

 function geodir_add_listing_map_restrict($map_restirct)

 {

-    if (is_admin()) {

-        if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {

-            $map_restirct = false;

-        }

-    }

-    return $map_restirct;

+	if (is_admin()) {

+		if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {

+			$map_restirct = false;

+		}

+	}

+	return $map_restirct;

 }

 

 

@@ -310,16 +310,16 @@ 
 function geodir_enable_editor_on_notifications($notification)

 {

 

-    if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

-        }

+		foreach ($notification as $key => $value) {

+			if ($value['type'] == 'textarea')

+				$notification[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $notification;

+	return $notification;

 }

 

 

@@ -336,16 +336,16 @@ 
 function geodir_enable_editor_on_design_settings($design_setting)

 {

 

-    if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

-        }

+		foreach ($design_setting as $key => $value) {

+			if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

+				$design_setting[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $design_setting;

+	return $design_setting;

 }

 

 /* ----------- START MANAGE CUSTOM FIELDS ---------------- */

@@ -366,16 +366,16 @@ 
 function geodir_manage_available_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_available_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_available_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_available_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_available_fields();

+			break;

 

-    }

+	}

 }

 

 

@@ -391,16 +391,16 @@ 
 function geodir_manage_selected_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_selected_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_selected_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_selected_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_selected_fields();

+			break;

 

-    }

+	}

 }

 

 /**

@@ -412,27 +412,27 @@ 
  */

 function geodir_sorting_options_available_fields()

 {

-    global $wpdb;

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	global $wpdb;

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

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

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

-        $sort_options = geodir_get_custom_sort_options($listing_type);

+		$sort_options = geodir_get_custom_sort_options($listing_type);

         

-        foreach ($sort_options as $key => $val) {

-            $val = stripslashes_deep($val); // strip slashes

-

-            $check_html_variable = $wpdb->get_var(

-                $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

-                    array($val['htmlvar_name'], $listing_type, $val['field_type'])

-                )

-            );

+		foreach ($sort_options as $key => $val) {

+			$val = stripslashes_deep($val); // strip slashes

+

+			$check_html_variable = $wpdb->get_var(

+				$wpdb->prepare(

+					"SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+					array($val['htmlvar_name'], $listing_type, $val['field_type'])

+				)

+			);

             

-            $display = $check_html_variable ? ' style="display:none;"' : '';

-            ?>

+			$display = $check_html_variable ? ' style="display:none;"' : '';

+			?>

             <li <?php echo $display;?>>

             <a id="gt-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>"

                title="<?php echo $val['site_title'];?>"

@@ -440,8 +440,8 @@ 
                href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory');?></a>

             </li>

             <?php

-        }

-    ?>

+		}

+	?>

     </ul>

     <?php

 }

@@ -455,28 +455,28 @@ 
  */

 function geodir_sorting_options_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

+		global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_ins_upd = 'display';

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_ins_upd = 'display';

 

-                $default = false;

+				$default = false;

 

-                geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

-            }

-        }

-    ?>

+				geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

+			}

+		}

+	?>

     </ul>

     <?php

 }

@@ -489,8 +489,8 @@ 
  */

 function geodir_custom_available_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

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

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="full">

@@ -541,25 +541,25 @@ 
  */

 function geodir_custom_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

-

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_ins_upd = 'display';

-

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd);

-            }

-        }

-        ?></ul>

+		global $wpdb;

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_ins_upd = 'display';

+

+				geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd);

+			}

+		}

+		?></ul>

 <?php

 

 }

@@ -578,16 +578,16 @@ 
 function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -605,16 +605,16 @@ 
 function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -632,16 +632,16 @@ 
 function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click on any box below to make it appear in sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click on any box below to make it appear in sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $note;

 }

 

 

@@ -659,16 +659,16 @@ 
 function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('List of fields those will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('List of fields those will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('List of fields those will appear in %s listing and search resutls sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('List of fields those will appear in %s listing and search resutls sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -686,16 +686,16 @@ 
 function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $note;

 }

 

 

@@ -711,16 +711,16 @@ 
  */

 function geodir_remove_unnecessary_fields()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if (!get_option('geodir_remove_unnecessary_fields')) {

+	if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

+			$wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

 

-        update_option('geodir_remove_unnecessary_fields', '1');

+		update_option('geodir_remove_unnecessary_fields', '1');

 

-    }

+	}

 

 }

 

@@ -738,25 +738,25 @@ 
  */

 function geodir_admin_ajax_handler()

 {

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

-        $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

-        switch ($geodir_admin_ajax_action) {

-            case 'diagnosis' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-

-            case 'diagnosis-fix' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-        }

-    }

-    exit();

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

+		$geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

+		switch ($geodir_admin_ajax_action) {

+			case 'diagnosis' :

+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+

+			case 'diagnosis-fix' :

+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+		}

+	}

+	exit();

 }

 

 

@@ -774,127 +774,127 @@ 
  */

 function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix)

 {

-    global $wpdb;

-    //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You didnt follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

-

-            if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

-                //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

-

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

-

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

-

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            }

-

-        }

-

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

-                if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

-                }

-

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                }

-            } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                }

-            }

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if orignal table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            }

-

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if orignal table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

-            delete_option('geodirlocation_db_version');

-            delete_option('geodirevents_db_version');

-            delete_option('geodir_reviewrating_db_version');

-            delete_option('gdevents_db_version');

-            delete_option('geodirectory_db_version');

-            delete_option('geodirclaim_db_version');

-            delete_option('geodir_custom_posts_db_version');

-            delete_option('geodir_reviewratings_db_version');

-            delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

-        }

-

-    } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

-    }

-    return $filter_arr;

+	global $wpdb;

+	//$filter_arr['output_str'] .='###'.$table.'###';

+	if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . __('ERROR: You didnt follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+		$filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			$ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

+			$new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+

+			if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

+				//$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

+

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

+

+				$wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

+

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			}

+

+		}

+

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

+				if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+				}

+

+			} elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

+				if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				}

+				if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				}

+			} else {// else rename the original table to _ms_bak

+				if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				}

+			}

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if orignal table exists but new does not, rename

+			if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			} else {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			}

+

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if orignal table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

+			delete_option('geodirlocation_db_version');

+			delete_option('geodirevents_db_version');

+			delete_option('geodir_reviewrating_db_version');

+			delete_option('gdevents_db_version');

+			delete_option('geodirectory_db_version');

+			delete_option('geodirclaim_db_version');

+			delete_option('geodir_custom_posts_db_version');

+			delete_option('geodir_reviewratings_db_version');

+			delete_option('geodiradvancesearch_db_version');

+			$filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+		}

+

+	} else {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+	}

+	return $filter_arr;

 }

 

 

@@ -908,53 +908,53 @@ 
  */

 function geodir_diagnose_tags_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

-

-            if (!empty($posts)) {

-

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

-                    if (empty($raw_tags)) {

-                        $post_tags = '';

-                    } else {

-                        $post_tags = implode(",", $raw_tags);

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

-

-                }

-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

-            }

-

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+

+			if (!empty($posts)) {

+

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+					if (empty($raw_tags)) {

+						$post_tags = '';

+					} else {

+						$post_tags = implode(",", $raw_tags);

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+

+				}

+				$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -970,75 +970,75 @@ 
  */

 function geodir_diagnose_cats_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

 

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

 

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

 

-            if (!empty($posts)) {

+			if (!empty($posts)) {

 

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

 

-                    if (empty($raw_cats)) {

-                        $post_categories = get_post_meta($p->post_id, 'post_categories', true);

+					if (empty($raw_cats)) {

+						$post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

-                                if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

-                                }

-                            }

+						if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

+							$post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

+							foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+								if (is_numeric($cat_part)) {

+									$raw_cats[] = (int)$cat_part;

+								}

+							}

 

-                        }

+						}

 

-                        if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+						if (!empty($raw_cats)) {

+							$term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

 

-                        }

+						}

 

-                    }

+					}

 

 

-                    if (empty($raw_cats)) {

-                        $post_cats = '';

-                    } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

-                }

+					if (empty($raw_cats)) {

+						$post_cats = '';

+					} else {

+						$post_cats = ',' . implode(",", $raw_cats) . ',';

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+				}

 

-            }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+			$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

 

-        }

+		}

 

-    }

+	}

 

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1052,61 +1052,61 @@ 
  */

 function geodir_diagnose_version_clear()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'GeoDirectory Framework' => 'gdf_db_version',

-        'Advanced Search' => 'geodiradvancesearch_db_version',

-        'Review Rating Manager' => 'geodir_reviewratings_db_version',

-        'Claim Manager' => 'geodirclaim_db_version',

-        'CPT Manager' => 'geodir_custom_posts_db_version',

-        'Location Manager' => 'geodirlocation_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'Events Manager' => 'geodirevents_db_version',

-    );

-

-    /**

-     * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

-     *

-     * @since 1.0.0

-     * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

-     */

-    $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

-

-    if (!empty($ver_arr)) {

-        foreach ($ver_arr as $key => $val) {

-            if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

-            } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

-            }

-

-        }

-

-        if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'GeoDirectory Framework' => 'gdf_db_version',

+		'Advanced Search' => 'geodiradvancesearch_db_version',

+		'Review Rating Manager' => 'geodir_reviewratings_db_version',

+		'Claim Manager' => 'geodirclaim_db_version',

+		'CPT Manager' => 'geodir_custom_posts_db_version',

+		'Location Manager' => 'geodirlocation_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'Events Manager' => 'geodirevents_db_version',

+	);

+

+	/**

+	 * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

+	 *

+	 * @since 1.0.0

+	 * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

+	 */

+	$ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

+

+	if (!empty($ver_arr)) {

+		foreach ($ver_arr as $key => $val) {

+			if (delete_option($val)) {

+				$output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+			} else {

+				$output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+			}

+

+		}

+

+		if ($output_str) {

+			$output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1120,59 +1120,59 @@ 
  */

 function geodir_diagnose_ratings()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

-    }

-

-    // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

-    }

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	// check review locations

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+		$output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_location()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+	}

+

+	// check review content

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

+		$output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_content()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+	}

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1186,57 +1186,57 @@ 
  */

 function geodir_diagnose_multisite_conversion()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    $filter_arr = array();

-    $filter_arr['output_str'] = $output_str;

-    $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

-    $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

-        'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

-        'geodir_post_icon' => __('Post icon', 'geodirectory'),

-        'geodir_attachments' => __('Attachments', 'geodirectory'),

-        'geodir_post_review' => __('Reviews', 'geodirectory'),

-        'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

-        'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

-    );

-

-    // allow other addons to hook in and add their checks

-

-    /**

-     * Filter the array of tables.

-     *

-     * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows adons to add their DB tables to the checks.

-     *

-     * @since 1.0.0

-     * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

-     */

-    $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

-

-    foreach ($table_arr as $table => $table_name) {

-        // Diagnose table

-        $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

-    }

-

-

-    $output_str = $filter_arr['output_str'];

-    $is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	$filter_arr = array();

+	$filter_arr['output_str'] = $output_str;

+	$filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

+	$table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

+		'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

+		'geodir_post_icon' => __('Post icon', 'geodirectory'),

+		'geodir_attachments' => __('Attachments', 'geodirectory'),

+		'geodir_post_review' => __('Reviews', 'geodirectory'),

+		'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

+		'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

+	);

+

+	// allow other addons to hook in and add their checks

+

+	/**

+	 * Filter the array of tables.

+	 *

+	 * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows adons to add their DB tables to the checks.

+	 *

+	 * @since 1.0.0

+	 * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

+	 */

+	$table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

+

+	foreach ($table_arr as $table => $table_name) {

+		// Diagnose table

+		$filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

+	}

+

+

+	$output_str = $filter_arr['output_str'];

+	$is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 }

 

 /**

@@ -1254,39 +1254,39 @@ 
  */

 function geodir_fix_virtual_page($slug, $page_title, $old_id, $option)

 {

-    global $wpdb, $current_user;

-

-    if (!empty($old_id)) {

-        wp_delete_post($old_id, true);

-    }//delete post if already there

-    else {

-        $page_found = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-                array($slug)

-            )

-        );

-        wp_delete_post($page_found, true);

-

-    }

-

-    $page_data = array(

-        'post_status' => 'publish',

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => '',

-        'post_parent' => 0,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-    update_option($option, $page_id);

-    if ($page_id) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb, $current_user;

+

+	if (!empty($old_id)) {

+		wp_delete_post($old_id, true);

+	}//delete post if already there

+	else {

+		$page_found = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+				array($slug)

+			)

+		);

+		wp_delete_post($page_found, true);

+

+	}

+

+	$page_data = array(

+		'post_status' => 'publish',

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => '',

+		'post_parent' => 0,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+	update_option($option, $page_id);

+	if ($page_id) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -1298,212 +1298,212 @@ 
  */

 function geodir_diagnose_default_pages()

 {

-    global $wpdb;

-    $is_error_during_diagnose = false;

-    $output_str = '';

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //////////////////////////////////

-    /* Diagnose GD Home Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_home_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose GD Home Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Add Listing Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_add_listing_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Add Listing Page Ends */

-    ////////////////////////////////

-

-

-    //////////////////////////////////

-    /* Diagnose Listing Preview Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_preview_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Listing Preview Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Listing Success Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_success_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Listing Sucess Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Info Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_info_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Info Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Login Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_login_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Info Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Location Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_location_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Location Page Ends */

-    ////////////////////////////////

-

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

-    /**

-     * This action is called at the end of the GD Tools page check function.

-     *

-     * @since 1.5.2

-     */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

-

-    $output_str = $page_chk_arr['output_str'];

-    $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

-

-    if ($is_error_during_diagnose) {

-        if ($fix) {

-            flush_rewrite_rules();

-        }

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$is_error_during_diagnose = false;

+	$output_str = '';

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//////////////////////////////////

+	/* Diagnose GD Home Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_home_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose GD Home Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Add Listing Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_add_listing_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Add Listing Page Ends */

+	////////////////////////////////

+

+

+	//////////////////////////////////

+	/* Diagnose Listing Preview Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_preview_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Preview Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Listing Success Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_success_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Sucess Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Info Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_info_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Login Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_login_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Location Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_location_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Location Page Ends */

+	////////////////////////////////

+

+	$page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+	/**

+	 * This action is called at the end of the GD Tools page check function.

+	 *

+	 * @since 1.5.2

+	 */

+	$page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+

+	$output_str = $page_chk_arr['output_str'];

+	$is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

+

+	if ($is_error_during_diagnose) {

+		if ($fix) {

+			flush_rewrite_rules();

+		}

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1515,25 +1515,25 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function geodir_diagnose_load_db_language() {

-    global $wpdb;

+	global $wpdb;

 	

 	$is_error_during_diagnose = geodirectory_load_db_language();

 

-    $output_str = '';

+	$output_str = '';

 

-    if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+	if ($is_error_during_diagnose) {

+		$output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

 		$info_div_class = "geodir_problem_info";

-    } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+	} else {

+		$output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

 		$info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

+		$fix_button_txt = '';

+	}

     

 	echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1564,23 +1564,23 @@ 
  */

 function geodir_posts_clauses_request($clauses)

 {

-    global $wpdb, $wp_query, $plugin_prefix;

+	global $wpdb, $wp_query, $plugin_prefix;

 

-    if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+	if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

+		$table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

-        $clauses['join'] = $join;

+		$join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+		$clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

-        $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

-        $clauses['fields'] = $fields;

+		$fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+		$fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

+		$clauses['fields'] = $fields;

 

-        $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

-        $clauses['orderby'] = $orderby;

-    }

-    return $clauses;

+		$order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

+		$orderby = 'gd_expire ' . $order;

+		$clauses['orderby'] = $orderby;

+	}

+	return $clauses;

 }

 

 

@@ -1601,7 +1601,7 @@ 
  */

 function gd_theme_switch_compat_check()

 {

-    gd_set_theme_compat();

+	gd_set_theme_compat();

 }

 

 /**

@@ -1614,27 +1614,27 @@ 
  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

 {

-    if (function_exists('str_getcsv')) {

-        $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

-    } else {

-        global $current_user;

-        $upload_dir = wp_upload_dir();

-

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

-        $handle = fopen($file, 'w');

-

-        fwrite($handle, $input);

-        fclose($handle);

-

-        $handle = fopen($file, 'rt');

-        if (PHP_VERSION >= '5.3.0') {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

-        } else {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

-        }

-        fclose($handle);

-    }

-    return $fgetcsv;

+	if (function_exists('str_getcsv')) {

+		$fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

+	} else {

+		global $current_user;

+		$upload_dir = wp_upload_dir();

+

+		$file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+		$handle = fopen($file, 'w');

+

+		fwrite($handle, $input);

+		fclose($handle);

+

+		$handle = fopen($file, 'rt');

+		if (PHP_VERSION >= '5.3.0') {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

+		} else {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

+		}

+		fclose($handle);

+	}

+	return $fgetcsv;

 }

 

 add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');

@@ -1649,375 +1649,375 @@ 
  */

 function geodir_ajax_import_csv()

 {

-    error_reporting(0); // hide error to get clean json response

+	error_reporting(0); // hide error to get clean json response

 

-    global $wpdb, $plugin_prefix, $current_user;

-    $uploads = wp_upload_dir();

-    ini_set('auto_detect_line_endings', true);

+	global $wpdb, $plugin_prefix, $current_user;

+	$uploads = wp_upload_dir();

+	ini_set('auto_detect_line_endings', true);

 	

 	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

-    $task = isset($_POST['task']) ? $_POST['task'] : '';

-    $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

-    $filename = $uploadedFile;

-

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

-    $image_name_arr = explode('/', $filename);

-    $filename = end($image_name_arr);

-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-    $return = array();

-    $return['file'] = $uploadedFile;

-    $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

-

-    if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

-        $wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

-

-        if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-            $return['error'] = NULL;

-

-            $return['rows'] = 0;

-

-

-

-                if (($handle = fopen($target_path, "r")) !== FALSE) {

-                    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

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

-                            $file[] = '"' . implode('","', $data) . '"';

-                        }

-                    }

-                    fclose($handle);

-                    $file = $file;

-                }

-

-

-

-                $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

-

-

-            if (!$return['rows'] > 0) {

-                $return['error'] = __('No data found in csv file.', 'geodirectory');

-            }

-        }

-    }

-    if ($task == 'prepare' || !empty($return['error'])) {

-        echo json_encode($return);

-        exit;

-    }

-

-    $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

-    $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

-    $count = $importlimit;

-    $requested_limit = $importlimit;

-    $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

-

-    if ($count < $totRecords) {

-        $count = $tmpCnt + $count;

-        if ($count > $totRecords) {

-            $count = $totRecords;

-        }

-    } else {

-        $count = $totRecords;

-    }

-

-    $total_records = 0;

-    $rowcount = 0;

-    $address_invalid = 0;

-    $blank_address = 0;

-    $upload_files = 0;

-    $invalid_post_type = 0;

-    $invalid_title = 0;

-    $customKeyarray = array();

-    $gd_post_info = array();

-    $post_location = array();

-    $countpost = 0;

-

-    if (!empty($file)) {

-        $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

-        $customKeyarray = $columns;

-

-        if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-            $return['error'] = CSV_INVAILD_FILE;

-            echo json_encode($return);

-            exit;

-        }

-

-        for ($i = 1; $i <= $importlimit; $i++) {

-            $current_index = $tmpCnt + $i;

-            if (isset($file[$current_index])) {

-                $total_records++;

-

-                $buffer = geodir_str_getcsv($file[$current_index]);

-                $post_title = addslashes($buffer[0]);

-                $current_post_author = $buffer[1];

-                $post_desc = addslashes($buffer[2]);

-                $post_cat = array();

-                $catids_arr = array();

-                $post_cat = trim($buffer[3]); // comma seperated category name

-

-                if ($post_cat) {

-                    $post_cat_arr = explode(',', $post_cat);

-

-                    for ($c = 0; $c < count($post_cat_arr); $c++) {

-                        $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

-

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

-                            if (in_array($buffer[5], geodir_get_posttypes())) {

-

-                                $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

-

-                                if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else {

-                                    $ret = wp_insert_term($catid, $p_taxonomy[0]);

-                                    if ($ret && !is_wp_error($ret)) {

-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        }

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-

-                if (!$catids_arr) {

-                    $catids_arr[] = 1;

-                }

-

-                $post_tags = trim($buffer[4]); // comma seperated tags

-

-                $tag_arr = '';

-                if ($post_tags) {

-                    $tag_arr = explode(',', $post_tags);

-                }

-

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

-

-                $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

-                    $invalid_post_type++;

-                    continue;

-                }

-

-                if ($post_title != '') {

-                    $menu_order = 0;

-                    $image_folder_name = 'uplaod/';

-

-                    $image_names = array();

-

-                    for ($c = 5; $c < count($customKeyarray); $c++) {

-                        $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

-

-                        if ($customKeyarray[$c] == 'IMAGE') {

-                            $buffer[$c] = trim($buffer[$c]);

-

-                            if (!empty($buffer[$c])) {

-                                $image_names[] = $buffer[$c];

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'alive_days') {

-                            if ($buffer[$c] != '0' && $buffer[$c] != '') {

-                                $submitdata = date('Y-m-d');

-

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

-                            } else {

-                                $gd_post_info['expire_date'] = 'Never';

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'post_city') {

-                            $post_city = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_region') {

-                            $post_region = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_country') {

-                            $post_country = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_latitude') {

-                            $post_latitude = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_longitude') {

-                            $post_longitude = addslashes($buffer[$c]);

-                        }

+	$task = isset($_POST['task']) ? $_POST['task'] : '';

+	$uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

+	$filename = $uploadedFile;

+

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

+	$image_name_arr = explode('/', $filename);

+	$filename = end($image_name_arr);

+	$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+	$return = array();

+	$return['file'] = $uploadedFile;

+	$return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

+

+	if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

+		$wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

+

+		if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+			$return['error'] = NULL;

+

+			$return['rows'] = 0;

+

+

+

+				if (($handle = fopen($target_path, "r")) !== FALSE) {

+					while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

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

+							$file[] = '"' . implode('","', $data) . '"';

+						}

+					}

+					fclose($handle);

+					$file = $file;

+				}

+

+

+

+				$return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+

+

+			if (!$return['rows'] > 0) {

+				$return['error'] = __('No data found in csv file.', 'geodirectory');

+			}

+		}

+	}

+	if ($task == 'prepare' || !empty($return['error'])) {

+		echo json_encode($return);

+		exit;

+	}

+

+	$totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

+	$importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

+	$count = $importlimit;

+	$requested_limit = $importlimit;

+	$tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

+

+	if ($count < $totRecords) {

+		$count = $tmpCnt + $count;

+		if ($count > $totRecords) {

+			$count = $totRecords;

+		}

+	} else {

+		$count = $totRecords;

+	}

+

+	$total_records = 0;

+	$rowcount = 0;

+	$address_invalid = 0;

+	$blank_address = 0;

+	$upload_files = 0;

+	$invalid_post_type = 0;

+	$invalid_title = 0;

+	$customKeyarray = array();

+	$gd_post_info = array();

+	$post_location = array();

+	$countpost = 0;

+

+	if (!empty($file)) {

+		$columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

+		$customKeyarray = $columns;

+

+		if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+			$return['error'] = CSV_INVAILD_FILE;

+			echo json_encode($return);

+			exit;

+		}

+

+		for ($i = 1; $i <= $importlimit; $i++) {

+			$current_index = $tmpCnt + $i;

+			if (isset($file[$current_index])) {

+				$total_records++;

+

+				$buffer = geodir_str_getcsv($file[$current_index]);

+				$post_title = addslashes($buffer[0]);

+				$current_post_author = $buffer[1];

+				$post_desc = addslashes($buffer[2]);

+				$post_cat = array();

+				$catids_arr = array();

+				$post_cat = trim($buffer[3]); // comma seperated category name

+

+				if ($post_cat) {

+					$post_cat_arr = explode(',', $post_cat);

+

+					for ($c = 0; $c < count($post_cat_arr); $c++) {

+						$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

+

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

+							if (in_array($buffer[5], geodir_get_posttypes())) {

+

+								$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

+

+								if (get_term_by('name', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else {

+									$ret = wp_insert_term($catid, $p_taxonomy[0]);

+									if ($ret && !is_wp_error($ret)) {

+										if (get_term_by('name', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+

+				if (!$catids_arr) {

+					$catids_arr[] = 1;

+				}

+

+				$post_tags = trim($buffer[4]); // comma seperated tags

+

+				$tag_arr = '';

+				if ($post_tags) {

+					$tag_arr = explode(',', $post_tags);

+				}

+

+				$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+

+				$error = '';

+				if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+					$invalid_post_type++;

+					continue;

+				}

+

+				if ($post_title != '') {

+					$menu_order = 0;

+					$image_folder_name = 'uplaod/';

+

+					$image_names = array();

+

+					for ($c = 5; $c < count($customKeyarray); $c++) {

+						$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

+

+						if ($customKeyarray[$c] == 'IMAGE') {

+							$buffer[$c] = trim($buffer[$c]);

+

+							if (!empty($buffer[$c])) {

+								$image_names[] = $buffer[$c];

+							}

+						}

+

+						if ($customKeyarray[$c] == 'alive_days') {

+							if ($buffer[$c] != '0' && $buffer[$c] != '') {

+								$submitdata = date('Y-m-d');

+

+								$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+							} else {

+								$gd_post_info['expire_date'] = 'Never';

+							}

+						}

+

+						if ($customKeyarray[$c] == 'post_city') {

+							$post_city = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_region') {

+							$post_region = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_country') {

+							$post_country = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_latitude') {

+							$post_latitude = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_longitude') {

+							$post_longitude = addslashes($buffer[$c]);

+						}

 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

-                        }

-                    }

-

-                    /* ================ before array create ============== */

-                    $location_result = geodir_get_default_location();

-                    if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

-                        $blank_address++;

-                        continue;

-                    } else if ($location_result->location_id == 0) {

-                        if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

-                            $address_invalid++;

-                            continue;

-                        }

-                    }

+							$post_status = sanitize_key( $buffer[$c] );

+						}

+					}

+

+					/* ================ before array create ============== */

+					$location_result = geodir_get_default_location();

+					if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

+						$blank_address++;

+						continue;

+					} else if ($location_result->location_id == 0) {

+						if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

+							$address_invalid++;

+							continue;

+						}

+					}

 					

 					// Default post status

 					$default_status = 'publish';

 					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

 					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

 

-                    $my_post['post_title'] = $post_title;

-                    $my_post['post_content'] = $post_desc;

-                    $my_post['post_type'] = addslashes($buffer[5]);

-                    $my_post['post_author'] = $current_post_author;

-                    $my_post['post_status'] = $post_status;

-                    $my_post['post_category'] = $catids_arr;

-                    $my_post['post_tags'] = $tag_arr;

-

-                    $gd_post_info['post_tags'] = $tag_arr;

-                    $gd_post_info['post_title'] = $post_title;

-                    $gd_post_info['post_status'] = $post_status;

-                    $gd_post_info['submit_time'] = time();

-                    $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

-

-                    $last_postid = wp_insert_post($my_post);

-                    $countpost++;

-

-                    // Check if we need to save post location as new location

-                    if ($location_result->location_id > 0) {

-                        if (isset($post_city) && isset($post_region)) {

-                            $request_info['post_location'] = array(

-                                'city' => $post_city,

-                                'region' => $post_region,

-                                'country' => $post_country,

-                                'geo_lat' => $post_latitude,

-                                'geo_lng' => $post_longitude

-                            );

-

-                            $post_location_info = $request_info['post_location'];

-                            if ($location_id = geodir_add_new_location($post_location_info))

-                                $post_location_id = $location_id;

-                        } else {

-                            $post_location_id = 0;

-                        }

-                    } else {

-                        $post_location_id = 0;

-                    }

-

-                    /* ------- get default package info ----- */

-                    $payment_info = array();

-                    $package_info = array();

-

-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

-                    $package_id = '';

-                    if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

-                        $package_id = $gd_post_info['package_id'];

-                    }

-

-                    if (!empty($package_info)) {

-                        $payment_info['package_id'] = $package_info['pid'];

-

-                        if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

-                        } else {

-                            $payment_info['expire_date'] = 'Never';

-                        }

-

-                        $gd_post_info = array_merge($gd_post_info, $payment_info);

-                    }

-

-                    $gd_post_info['post_location_id'] = $post_location_id;

-

-                    $post_type = get_post_type($last_postid);

-

-                    $table = $plugin_prefix . $post_type . '_detail';

-

-                    geodir_save_post_info($last_postid, $gd_post_info);

-

-                    if (!empty($image_names)) {

-                        $upload_files++;

-                        $menu_order = 1;

-

-                        foreach ($image_names as $image_name) {

-                            $img_name_arr = explode('.', $image_name);

-

-                            $uploads = wp_upload_dir();

-                            $sub_dir = $uploads['subdir'];

-

-                            $arr_file_type = wp_check_filetype($image_name);

-                            $uploaded_file_type = $arr_file_type['type'];

-

-                            $attachment = array();

-                            $attachment['post_id'] = $last_postid;

-                            $attachment['title'] = $img_name_arr[0];

-                            $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

-

-                            $attachment_set = '';

-

-                            foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

-                            }

-                            $attachment_set = trim($attachment_set, ", ");

-

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

-

-                            if ($menu_order == 1) {

-                                $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

-                            }

-                            $menu_order++;

-                        }

-                    }

-

-                    $gd_post_info['package_id'] = $package_id;

-

-                    /** This action is documented in geodirectory-functions/post-functions.php */

-                    do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

-

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

-                        if (in_array($buffer[5], geodir_get_posttypes())) {

-                            $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

-                            wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

-                            wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

-

-                            $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

-                            $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

-                            geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

-                        }

-                    }

-                } else {

-                    $invalid_title++;

-                }

-            }

-        }

-    }

-    $return['rowcount'] = $countpost;

-    $return['invalidcount'] = $address_invalid;

-    $return['blank_address'] = $blank_address;

-    $return['upload_files'] = $upload_files;

-    $return['invalid_post_type'] = $invalid_post_type;

-    $return['invalid_title'] = $invalid_title;

-    $return['total_records'] = $total_records;

-

-    echo json_encode($return);

-    exit;

+					$my_post['post_title'] = $post_title;

+					$my_post['post_content'] = $post_desc;

+					$my_post['post_type'] = addslashes($buffer[5]);

+					$my_post['post_author'] = $current_post_author;

+					$my_post['post_status'] = $post_status;

+					$my_post['post_category'] = $catids_arr;

+					$my_post['post_tags'] = $tag_arr;

+

+					$gd_post_info['post_tags'] = $tag_arr;

+					$gd_post_info['post_title'] = $post_title;

+					$gd_post_info['post_status'] = $post_status;

+					$gd_post_info['submit_time'] = time();

+					$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+

+					$last_postid = wp_insert_post($my_post);

+					$countpost++;

+

+					// Check if we need to save post location as new location

+					if ($location_result->location_id > 0) {

+						if (isset($post_city) && isset($post_region)) {

+							$request_info['post_location'] = array(

+								'city' => $post_city,

+								'region' => $post_region,

+								'country' => $post_country,

+								'geo_lat' => $post_latitude,

+								'geo_lng' => $post_longitude

+							);

+

+							$post_location_info = $request_info['post_location'];

+							if ($location_id = geodir_add_new_location($post_location_info))

+								$post_location_id = $location_id;

+						} else {

+							$post_location_id = 0;

+						}

+					} else {

+						$post_location_id = 0;

+					}

+

+					/* ------- get default package info ----- */

+					$payment_info = array();

+					$package_info = array();

+

+					$package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+					$package_id = '';

+					if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

+						$package_id = $gd_post_info['package_id'];

+					}

+

+					if (!empty($package_info)) {

+						$payment_info['package_id'] = $package_info['pid'];

+

+						if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

+							$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+						} else {

+							$payment_info['expire_date'] = 'Never';

+						}

+

+						$gd_post_info = array_merge($gd_post_info, $payment_info);

+					}

+

+					$gd_post_info['post_location_id'] = $post_location_id;

+

+					$post_type = get_post_type($last_postid);

+

+					$table = $plugin_prefix . $post_type . '_detail';

+

+					geodir_save_post_info($last_postid, $gd_post_info);

+

+					if (!empty($image_names)) {

+						$upload_files++;

+						$menu_order = 1;

+

+						foreach ($image_names as $image_name) {

+							$img_name_arr = explode('.', $image_name);

+

+							$uploads = wp_upload_dir();

+							$sub_dir = $uploads['subdir'];

+

+							$arr_file_type = wp_check_filetype($image_name);

+							$uploaded_file_type = $arr_file_type['type'];

+

+							$attachment = array();

+							$attachment['post_id'] = $last_postid;

+							$attachment['title'] = $img_name_arr[0];

+							$attachment['content'] = '';

+							$attachment['file'] = $sub_dir . '/' . $image_name;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

+

+							$attachment_set = '';

+

+							foreach ($attachment as $key => $val) {

+								if ($val != '')

+									$attachment_set .= $key . " = '" . $val . "', ";

+							}

+							$attachment_set = trim($attachment_set, ", ");

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+

+							if ($menu_order == 1) {

+								$post_type = get_post_type($last_postid);

+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+							}

+							$menu_order++;

+						}

+					}

+

+					$gd_post_info['package_id'] = $package_id;

+

+					/** This action is documented in geodirectory-functions/post-functions.php */

+					do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

+

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

+						if (in_array($buffer[5], geodir_get_posttypes())) {

+							$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

+							wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

+							wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

+

+							$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

+							$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

+							geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

+						}

+					}

+				} else {

+					$invalid_title++;

+				}

+			}

+		}

+	}

+	$return['rowcount'] = $countpost;

+	$return['invalidcount'] = $address_invalid;

+	$return['blank_address'] = $blank_address;

+	$return['upload_files'] = $upload_files;

+	$return['invalid_post_type'] = $invalid_post_type;

+	$return['invalid_title'] = $invalid_title;

+	$return['total_records'] = $total_records;

+

+	echo json_encode($return);

+	exit;

 }

 

 // Add the tab in left sidebar menu fro import & export page.

@@ -2037,9 +2037,9 @@ 
  * @param $post object $post The post object of the post being saved.

  */

 function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

-    }

+	if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

+		update_option('geodir_location_prefix',$post->post_name);

+	}

 

 }

 

@@ -2050,50 +2050,50 @@ 
 function geodir_ga_callback(){

 

 if(isset($_REQUEST['code']) && $_REQUEST['code']) {

-    $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

-    $code = "code=".$_REQUEST['code'];

-    $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-    $client_id = "&client_id=".get_option('geodir_ga_client_id');

-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

+	$oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

+	$code = "code=".$_REQUEST['code'];

+	$grant_type = "&grant_type=authorization_code";

+	$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+	$client_id = "&client_id=".get_option('geodir_ga_client_id');

+	$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+	$auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

 

-    $response = wp_remote_post($auth_url, array('timeout' => 15));

+	$response = wp_remote_post($auth_url, array('timeout' => 15));

 

-    //print_r($response);

+	//print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+	$error_msg =  __('Something went wrong','geodirectory');

+	if(!empty($response['response']['code']) && $response['response']['code']==200){

 

-        $parts = json_decode($response['body']);

-        //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+		$parts = json_decode($response['body']);

+		//print_r($parts);

+		if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

+		else{

 

-            update_option('gd_ga_access_token', $parts->access_token);

-            update_option('gd_ga_refresh_token', $parts->refresh_token);

-            ?><script>window.close();</script><?php

-        }

+			update_option('gd_ga_access_token', $parts->access_token);

+			update_option('gd_ga_refresh_token', $parts->refresh_token);

+			?><script>window.close();</script><?php

+		}

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

-        $parts = json_decode($response['body']);

+	}

+	elseif(!empty($response['response']['code'])) {

+		$parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

-        }

+		if(isset($parts->error)){

+			echo $parts->error.": ".$parts->error_description;exit;

+		}else{

+			echo $error_msg." - #2";exit;

+		}

 

-    }else{

+	}else{

 

-        echo $error_msg." - #3";exit;

+		echo $error_msg." - #3";exit;

 

-    }

+	}

 }

-    exit;

+	exit;

 }

 

 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

geodirectory-admin/admin_install.php

Indentation +167 added lines, -167 removed lines

@@ -1,12 +1,12 @@ 
 <?php

 /**

- * GeoDirectory Installation related functions.

- *

- * Plugin install script which adds default pages, taxonomies, and database tables.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * GeoDirectory Installation related functions.

+	 *

+	 * Plugin install script which adds default pages, taxonomies, and database tables.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /**

  * Include custom database table related functions.

@@ -24,8 +24,8 @@ 
 function geodir_activation()

 {

 

-    geodir_install();

-    add_action('wp_loaded', 'geodir_flush_activation');

+	geodir_install();

+	add_action('wp_loaded', 'geodir_flush_activation');

 }

 

 /**

@@ -36,9 +36,9 @@ 
  */

 function geodir_flush_activation()

 {

-    // Remove rewrite rules and then recreate rewrite rules.

-    // flush late so everything is loaded

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	// flush late so everything is loaded

+	flush_rewrite_rules();

 }

 

 /**

@@ -50,44 +50,44 @@ 
  */

 function geodir_install()

 {

-    global $geodir_settings;

-

-    /**

-     * Called before the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_end'

-     */

-    do_action('geodir_installation_start');

-

-    // Do install

-    if (!get_option('geodir_default_data_installed')) {

-        geodir_create_tables(); // in admin db install.php

-        geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

-        geodir_create_default_fields();

-        //geodir_default_taxonomies();

-        geodir_set_default_options();

-        geodir_create_pages();

-        geodir_set_default_widgets();

-        gd_install_theme_compat();

-

-        update_option('geodir_default_data_installed', 1);

-

-    }

-

-    if (!get_option('geodir_default_data_installed_1.2.8')) {

-        //geodir_create_tables(); // in admin db install.php

-        update_option('geodir_default_data_installed_1.2.8', 1);

-    }

-

-    geodir_installation_end();

-    /**

-     * Called after the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_start'

-     */

-    do_action('geodir_installation_end');

+	global $geodir_settings;

+

+	/**

+	 * Called before the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_end'

+	 */

+	do_action('geodir_installation_start');

+

+	// Do install

+	if (!get_option('geodir_default_data_installed')) {

+		geodir_create_tables(); // in admin db install.php

+		geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

+		geodir_create_default_fields();

+		//geodir_default_taxonomies();

+		geodir_set_default_options();

+		geodir_create_pages();

+		geodir_set_default_widgets();

+		gd_install_theme_compat();

+

+		update_option('geodir_default_data_installed', 1);

+

+	}

+

+	if (!get_option('geodir_default_data_installed_1.2.8')) {

+		//geodir_create_tables(); // in admin db install.php

+		update_option('geodir_default_data_installed_1.2.8', 1);

+	}

+

+	geodir_installation_end();

+	/**

+	 * Called after the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_start'

+	 */

+	do_action('geodir_installation_end');

 

 

 }

@@ -104,16 +104,16 @@ 
 function geodir_create_pages()

 {

 

-    //geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

+	//geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

 

-    //New since 1.5.3

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	//New since 1.5.3

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 

 

 }

@@ -129,11 +129,11 @@ 
  */

 function geodir_installation_end()

 {

-    //update_option( "geodir_db_version", GEODIRECTORY_VERSION );

+	//update_option( "geodir_db_version", GEODIRECTORY_VERSION );

 

-    update_option("geodir_installed", 1);

-    update_option("geodir_installation_redirect", 1);

-    update_option('skip_install_geodir_pages', 0);

+	update_option("geodir_installed", 1);

+	update_option("geodir_installation_redirect", 1);

+	update_option('skip_install_geodir_pages', 0);

 }

 

 /**

@@ -147,45 +147,45 @@ 
  */

 function geodir_set_default_options()

 {

-    global $geodir_settings;

-    /**

-     * Contains settings array for general tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/general_settings_array.php");

-    /**

-     * Contains settings array for design tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/design_settings_array.php");

-    /**

-     * Contains settings array for notifications tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/notifications_settings_array.php");

-    /**

-     * Contains settings array for permalink tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/permalink_settings_array.php");

-    /**

-     * Contains settings array for title / meta tab.

-     *

-     * @since 1.5.4

-     * @package GeoDirectory

-     */

-    include_once("option-pages/title_meta_settings_array.php");

-    foreach ($geodir_settings as $value) {

-        geodir_update_options($value, true);

-    }

+	global $geodir_settings;

+	/**

+	 * Contains settings array for general tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/general_settings_array.php");

+	/**

+	 * Contains settings array for design tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/design_settings_array.php");

+	/**

+	 * Contains settings array for notifications tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/notifications_settings_array.php");

+	/**

+	 * Contains settings array for permalink tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/permalink_settings_array.php");

+	/**

+	 * Contains settings array for title / meta tab.

+	 *

+	 * @since 1.5.4

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/title_meta_settings_array.php");

+	foreach ($geodir_settings as $value) {

+		geodir_update_options($value, true);

+	}

 

 }

 

@@ -199,103 +199,103 @@ 
 function geodir_set_default_widgets()

 {

 

-    $widget_option_list = array();

-    $widgetinfo = array();

-    $sidebarvalue_array = array();

-    $sidebars_widgets = array();

+	$widget_option_list = array();

+	$widgetinfo = array();

+	$sidebarvalue_array = array();

+	$sidebars_widgets = array();

 

-    /*===========================*/

-    /*  Widgets ON HOME PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON HOME PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_home_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_home_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_home_content'] =

-        array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_content'] =

+		array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

 

-    $widget_option_list['geodir_home_right'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_right'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON LISTING PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON LISTING PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_listing_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_listing_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_listing_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_listing_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON SEARCH PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON SEARCH PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_search_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_search_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_search_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_search_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON DETAIL/SINGLE PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON DETAIL/SINGLE PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_detail_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_detail_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON AUTHOR PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON AUTHOR PAGE     */

+	/*===========================*/

 

 

-    $widget_option_list['geodir_author_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

+	$widget_option_list['geodir_author_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

 

 

-    $sidebars_widgets = get_option('sidebars_widgets');

+	$sidebars_widgets = get_option('sidebars_widgets');

 

-    foreach ($widget_option_list as $key => $widget_options) {

+	foreach ($widget_option_list as $key => $widget_options) {

 

-        foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+		foreach ($widget_options as $key2 => $widget_options_obj) {

+			$widgetid = 'widget_' . $key2;

 

-            $widgetinfo[$widgetid][] = $widget_options_obj;

+			$widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+			$sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

 

-            $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

+			$widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

-        }

+		}

 

-        if (!empty($sidebarvalue_array[$key])) {

+		if (!empty($sidebarvalue_array[$key])) {

 

-            $sidebars_widgets = get_option('sidebars_widgets');

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

-            update_option('sidebars_widgets', $sidebars_widgets);

+			$sidebars_widgets = get_option('sidebars_widgets');

+			$sidebars_widgets[$key] = $sidebarvalue_array[$key];

+			update_option('sidebars_widgets', $sidebars_widgets);

 

-            foreach ($widget_update as $key => $value) {

+			foreach ($widget_update as $key => $value) {

 

-                update_option($key, $value);

+				update_option($key, $value);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 

 }

geodirectory-admin/admin_template_tags.php

Indentation +515 added lines, -515 removed lines

@@ -7,33 +7,33 @@ 
  */

 

 if (!function_exists('geodir_admin_panel')) {

-    /**

-     * GeoDirectory Backend Admin Panel.

-     *

-     * Handles the display of the main GeoDirectory admin panel.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global string $current_tab Current tab in geodirectory settings.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_panel()

-    {

-        global $geodirectory;

-        global $current_tab;

-

-

-        ?>

+	/**

+	 * GeoDirectory Backend Admin Panel.

+	 *

+	 * Handles the display of the main GeoDirectory admin panel.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global string $current_tab Current tab in geodirectory settings.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_panel()

+	{

+		global $geodirectory;

+		global $current_tab;

+

+

+		?>

 

         <div id="gd-wrapper-main" class="wrap geodirectory">

             <?php

-            /**

-             * Called just after the opening wrapper div for the GD settings page in the admin area.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_admin_panel');

-            ?>

+			/**

+			 * Called just after the opening wrapper div for the GD settings page in the admin area.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_admin_panel');

+			?>

 

             <div class="gd-wrapper gd-wrapper-vr clearfix">

 

@@ -44,75 +44,75 @@ 
                          alt="geo-logo" class="geo-logoalter"/>

                     <ul>

                         <?php

-                        $tabs = array();

-                        /**

-                         * Filter the GD admin settings tabs on the left of the admin menu.

-                         *

-                         * @since 1.0.0

-                         * @param array $tabs The array of tabs to display.

-                         */

-                        $tabs = apply_filters('geodir_settings_tabs_array', $tabs);

-                        update_option('geodir_tabs', $tabs);// Important to show settings menu dropdown

-

-                        foreach ($tabs as $name => $args) :

-                            $label = $args['label'];

-

-

-                            $query_string = '';

-                            if (isset($args['subtabs']) && !empty($args['subtabs'])):

-

-                                $subtabs = $args['subtabs'];

-

-                                $query_string = '&subtab=' . $subtabs[0]['subtab'];

-

-                            endif;

-

-

-                            $tab_link = admin_url('admin.php?page=geodirectory&tab=' . $name . $query_string);

-

-                            if (isset($args['url']) && $args['url'] != '') {

-                                $tab_link = $args['url'];

-                            }

-

-                            if (!empty($args['request']))

-                                $tab_link = geodir_getlink($tab_link, $args['request']);

-

-                            if (isset($args['target']) && $args['target'] != '') {

-                                $tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

-                            } else

-                                $tab_target = '';

-

-                            $tab_active = '';

-                            if ($current_tab == $name)

-                                $tab_active = ' class="tab-active" ';

-                            /**

-                             * Called before the individual settings tabs are output.

-                             *

-                             * @since 1.0.0

-                             * @param string $name The name of the settings tab.

-                             * @see 'geodir_after_settings_tabs'

-                             */

-                            do_action('geodir_before_settings_tabs', $name);

-                            echo '<li ' . $tab_active . ' ><a href="' . esc_url($tab_link) . '"  ' . $tab_target . ' >' . sanitize_text_field($label) . '</a></li>';

-                            /**

-                             * Called after the individual settings tabs are output.

-                             *

-                             * @since 1.0.0

-                             * @param string $name The name of the settings tab.

-                             * @see 'geodir_before_settings_tabs'

-                             */

-                            do_action('geodir_after_settings_tabs', $name);

-                        endforeach;

-

-                        /**

-                         * Called after the GD settings tabs have been output.

-                         *

-                         * Called before the closing `ul` so can be used to add new settings tab links.

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_settings_tabs');

-                        ?>

+						$tabs = array();

+						/**

+						 * Filter the GD admin settings tabs on the left of the admin menu.

+						 *

+						 * @since 1.0.0

+						 * @param array $tabs The array of tabs to display.

+						 */

+						$tabs = apply_filters('geodir_settings_tabs_array', $tabs);

+						update_option('geodir_tabs', $tabs);// Important to show settings menu dropdown

+

+						foreach ($tabs as $name => $args) :

+							$label = $args['label'];

+

+

+							$query_string = '';

+							if (isset($args['subtabs']) && !empty($args['subtabs'])):

+

+								$subtabs = $args['subtabs'];

+

+								$query_string = '&subtab=' . $subtabs[0]['subtab'];

+

+							endif;

+

+

+							$tab_link = admin_url('admin.php?page=geodirectory&tab=' . $name . $query_string);

+

+							if (isset($args['url']) && $args['url'] != '') {

+								$tab_link = $args['url'];

+							}

+

+							if (!empty($args['request']))

+								$tab_link = geodir_getlink($tab_link, $args['request']);

+

+							if (isset($args['target']) && $args['target'] != '') {

+								$tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

+							} else

+								$tab_target = '';

+

+							$tab_active = '';

+							if ($current_tab == $name)

+								$tab_active = ' class="tab-active" ';

+							/**

+							 * Called before the individual settings tabs are output.

+							 *

+							 * @since 1.0.0

+							 * @param string $name The name of the settings tab.

+							 * @see 'geodir_after_settings_tabs'

+							 */

+							do_action('geodir_before_settings_tabs', $name);

+							echo '<li ' . $tab_active . ' ><a href="' . esc_url($tab_link) . '"  ' . $tab_target . ' >' . sanitize_text_field($label) . '</a></li>';

+							/**

+							 * Called after the individual settings tabs are output.

+							 *

+							 * @since 1.0.0

+							 * @param string $name The name of the settings tab.

+							 * @see 'geodir_before_settings_tabs'

+							 */

+							do_action('geodir_after_settings_tabs', $name);

+						endforeach;

+

+						/**

+						 * Called after the GD settings tabs have been output.

+						 *

+						 * Called before the closing `ul` so can be used to add new settings tab links.

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_settings_tabs');

+						?>

                     </ul>

                 </div>

                 <!--gd-left-nav ends here-->

@@ -121,52 +121,52 @@ 
                     <div class="gd-tabs-main">

 

                         <?php

-                        unset($subtabs);

-                        if (isset($tabs[$current_tab]['subtabs']))

-                            $subtabs = $tabs[$current_tab]['subtabs'];

-                        $form_action = '';

+						unset($subtabs);

+						if (isset($tabs[$current_tab]['subtabs']))

+							$subtabs = $tabs[$current_tab]['subtabs'];

+						$form_action = '';

 

-                        if (!empty($subtabs)):

-                        ?>

+						if (!empty($subtabs)):

+						?>

                             <dl class="gd-tab-head">

                                 <?php

-                                foreach ($subtabs as $sub) {

-                                    $subtab_active = '';

-                                    if (isset($_REQUEST['subtab']) && $sub['subtab'] == $_REQUEST['subtab']) {

-                                        $subtab_active = 'class="gd-tab-active"';

-                                        $form_action = isset($sub['form_action']) ? $sub['form_action'] : '';

-                                    }

-

-                                    $sub_tabs_link = admin_url() . 'admin.php?page=geodirectory&tab=' . $current_tab . '&subtab=' . $sub['subtab'];

-                                    if (isset($sub['request']) && is_array($sub['request']) && !empty($sub['request'])) {

-                                        $sub_tabs_link = geodir_getlink($sub_tabs_link, $sub['request']);

-                                    }

-                                    echo '<dd ' . $subtab_active . ' id="claim_listing"><a href="' . esc_url($sub_tabs_link) . '" >' . sanitize_text_field($sub['label']) . '</a></dd>';

-                                }

-                                ?>

+								foreach ($subtabs as $sub) {

+									$subtab_active = '';

+									if (isset($_REQUEST['subtab']) && $sub['subtab'] == $_REQUEST['subtab']) {

+										$subtab_active = 'class="gd-tab-active"';

+										$form_action = isset($sub['form_action']) ? $sub['form_action'] : '';

+									}

+

+									$sub_tabs_link = admin_url() . 'admin.php?page=geodirectory&tab=' . $current_tab . '&subtab=' . $sub['subtab'];

+									if (isset($sub['request']) && is_array($sub['request']) && !empty($sub['request'])) {

+										$sub_tabs_link = geodir_getlink($sub_tabs_link, $sub['request']);

+									}

+									echo '<dd ' . $subtab_active . ' id="claim_listing"><a href="' . esc_url($sub_tabs_link) . '" >' . sanitize_text_field($sub['label']) . '</a></dd>';

+								}

+								?>

                             </dl>

 

                         <?php endif; ?>

                         <div class="gd-tab-content <?php if (empty($subtabs)) {

-                            echo "inner_contet_tabs";

-                        } ?>">

+							echo "inner_contet_tabs";

+						} ?>">

                             <form method="post" id="mainform"

                                   class="geodir_optionform <?php echo $current_tab . ' '; ?><?php if (isset($sub['subtab'])) {

-                                      echo sanitize_text_field($sub['subtab']);

-                                  } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

+									  echo sanitize_text_field($sub['subtab']);

+								  } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

                                 <input type="hidden" class="active_tab" name="active_tab"

                                        value="<?php if (isset($_REQUEST['active_tab'])) {

-                                           echo sanitize_text_field($_REQUEST['active_tab']);

-                                       } ?>"/>

+										   echo sanitize_text_field($_REQUEST['active_tab']);

+									   } ?>"/>

                                 <?php wp_nonce_field('geodir-settings', '_wpnonce', true, true); ?>

                                 <?php wp_nonce_field('geodir-settings-' . $current_tab, '_wpnonce-' . $current_tab, true, true); ?>

                                 <?php

-                                /**

-                                 * Used to call the content of each GD settings tab page.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action('geodir_admin_option_form', $current_tab); ?>

+								/**

+								 * Used to call the content of each GD settings tab page.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action('geodir_admin_option_form', $current_tab); ?>

                             </form>

                         </div>

 

@@ -267,7 +267,7 @@ 
         </script>

     <?php

 

-    }

+	}

 }

 

 

@@ -283,48 +283,48 @@ 
 function geodir_admin_option_form($tab_name)

 {

 

-    //echo $tab_name.'_array.php' ;

-    global $geodir_settings, $is_default, $mapzoom;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $tab_name . '_array.php')) {

-        /**

-         * Contains settings array for given tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('option-pages/' . $tab_name . '_array.php');

-    }

-

-    $listing_type = isset($_REQUEST['listing_type']) ? $_REQUEST['listing_type'] : '';

-

-    switch ($tab_name) {

-

-        case 'general_settings':

-

-            geodir_admin_fields($geodir_settings['general_settings']);

-            /**

-             *

-             * Update Taxonomy Options *

-             *

-             **/

-            /*add_action('updated_option_place_prefix','update_listing_prefix');

+	//echo $tab_name.'_array.php' ;

+	global $geodir_settings, $is_default, $mapzoom;

+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $tab_name . '_array.php')) {

+		/**

+		 * Contains settings array for given tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('option-pages/' . $tab_name . '_array.php');

+	}

+

+	$listing_type = isset($_REQUEST['listing_type']) ? $_REQUEST['listing_type'] : '';

+

+	switch ($tab_name) {

+

+		case 'general_settings':

+

+			geodir_admin_fields($geodir_settings['general_settings']);

+			/**

+			 *

+			 * Update Taxonomy Options *

+			 *

+			 **/

+			/*add_action('updated_option_place_prefix','update_listing_prefix');

             function update_listing_prefix(){

                 geodir_register_defaults();

             }*/

 

-            if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings'))

-                $hide_save_button = "style='display:none;'";

-            else

-                $hide_save_button = '';

+			if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings'))

+				$hide_save_button = "style='display:none;'";

+			else

+				$hide_save_button = '';

 

-            /**

-             * Filter weather the default save button in the GD admin settings pages should be shown.

-             *

-             * @since 1.0.0

-             * @param string $hide_save_button The style element, either blank or: style='display:none;'.

-             */

-            $hide_save_button = apply_filters('geodir_hide_save_button', $hide_save_button);

-            ?>

+			/**

+			 * Filter weather the default save button in the GD admin settings pages should be shown.

+			 *

+			 * @since 1.0.0

+			 * @param string $hide_save_button The style element, either blank or: style='display:none;'.

+			 */

+			$hide_save_button = apply_filters('geodir_hide_save_button', $hide_save_button);

+			?>

 

             <p class="submit">

             <input <?php echo $hide_save_button;?> name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

@@ -334,36 +334,36 @@ 
             </div>

             

 		<?php break;

-        case 'design_settings' :

-            geodir_admin_fields($geodir_settings['design_settings']);

+		case 'design_settings' :

+			geodir_admin_fields($geodir_settings['design_settings']);

 

 

 

-            ?>

+			?>

 			<p class="submit">

 			<input name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

 			<input type="hidden" name="subtab" id="last_tab" />

 			</p>

 			</div>

         <?php break;

-        case 'permalink_settings' :

-            geodir_admin_fields($geodir_settings['permalink_settings']); ?>

+		case 'permalink_settings' :

+			geodir_admin_fields($geodir_settings['permalink_settings']); ?>

             <p class="submit">

             <input name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

             <input type="hidden" name="subtab" id="last_tab" />

             </p>

             </div>	

 		<?php break;

-        case 'title_meta_settings' :

-            geodir_admin_fields($geodir_settings['title_meta_settings']); ?>

+		case 'title_meta_settings' :

+			geodir_admin_fields($geodir_settings['title_meta_settings']); ?>

             <p class="submit">

             <input name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

             <input type="hidden" name="subtab" id="last_tab" />

             </p>

             </div>

 		<?php break;

-        case 'notifications_settings' :

-            geodir_admin_fields($geodir_settings['notifications_settings']); ?>

+		case 'notifications_settings' :

+			geodir_admin_fields($geodir_settings['notifications_settings']); ?>

 			

 			<p class="submit">

 				

@@ -373,36 +373,36 @@ 
 			</div>

 			

 		<?php break;

-        case 'default_location_settings' :

-            ?>

+		case 'default_location_settings' :

+			?>

             <div class="inner_content_tab_main">

                 <div class="gd-content-heading">

                     <?php global $wpdb;

 

 

-                    $location_result = geodir_get_default_location();

+					$location_result = geodir_get_default_location();

 

-                    $prefix = '';

+					$prefix = '';

 

 

-                    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '';

-                    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '';

-                    $city = isset($location_result->city) ? $location_result->city : '';

-                    $region = isset($location_result->region) ? $location_result->region : '';

-                    $country = isset($location_result->country) ? $location_result->country : '';

+					$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '';

+					$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '';

+					$city = isset($location_result->city) ? $location_result->city : '';

+					$region = isset($location_result->region) ? $location_result->region : '';

+					$country = isset($location_result->country) ? $location_result->country : '';

 

 

-                    $map_title = __("Set Address On Map", 'geodirectory');

+					$map_title = __("Set Address On Map", 'geodirectory');

 

-                    ?>

+					?>

 

                     <h3><?php _e('Set Default Location', 'geodirectory');?></h3>

 

                     <input type="hidden" name="add_location" value="location">

 

                     <input type="hidden" name="update_city" value="<?php if (isset($location_result->location_id)) {

-                        echo $location_result->location_id;

-                    } ?>">

+						echo $location_result->location_id;

+					} ?>">

 

                     <input type="hidden" name="address" id="<?php echo $prefix;?>address" value="">

 

@@ -415,8 +415,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>city" name="city"

                                            value="<?php if (isset($location_result->city)) {

-                                               echo $location_result->city;

-                                           } ?>"/>

+											   echo $location_result->city;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -431,8 +431,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>region" name="region"

                                            value="<?php if (isset($location_result->region)) {

-                                               echo $location_result->region;

-                                           } ?>"/>

+											   echo $location_result->region;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -446,8 +446,8 @@ 
                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <?php

 

-                                    $country_result = isset($location_result->country) ? $location_result->country : '';

-                                    ?>

+									$country_result = isset($location_result->country) ? $location_result->country : '';

+									?>

                                     <select id="<?php echo $prefix ?>country" class="chosen_select"

                                             data-location_type="country" name="<?php echo $prefix ?>country"

                                             data-placeholder="<?php _e('Choose a country.', 'geodirectory');?>"

@@ -470,12 +470,12 @@ 
                                 scope="row"><?php _e('Set Location on Map', 'geodirectory');?></th>

                             <td class="forminp">

                                 <?php

-                                /**

-                                 * Contains add listing page map functions.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");?>

+								/**

+								 * Contains add listing page map functions.

+								 *

+								 * @since 1.0.0

+								 */

+								include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");?>

                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

@@ -485,8 +485,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>latitude" name="latitude"

                                            value="<?php if (isset($location_result->city_latitude)) {

-                                               echo $location_result->city_latitude;

-                                           } ?>"/>

+											   echo $location_result->city_latitude;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -502,8 +502,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>longitude" name="longitude"

                                            value="<?php if (isset($location_result->city_longitude)) {

-                                               echo $location_result->city_longitude;

-                                           } ?>"/>

+											   echo $location_result->city_longitude;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -535,22 +535,22 @@ 
                 </div>

             </div>

             <?php break;

-        case $listing_type . '_fields_settings' :

+		case $listing_type . '_fields_settings' :

 

-            geodir_custom_post_type_form();

+			geodir_custom_post_type_form();

 

-            break;

-        case 'tools_settings' :

-            geodir_diagnostic_tools_setting_page();

-            break;

-        case 'compatibility_settings' :

-            geodir_theme_compatibility_setting_page();

-            break;		

+			break;

+		case 'tools_settings' :

+			geodir_diagnostic_tools_setting_page();

+			break;

+		case 'compatibility_settings' :

+			geodir_theme_compatibility_setting_page();

+			break;		

 		case 'import_export' :

-            geodir_import_export_page();

-            break;

+			geodir_import_export_page();

+			break;

 

-    }// end of switch

+	}// end of switch

 }

 

 

@@ -590,170 +590,170 @@ 
 function geodir_update_options_compatibility_settings()

 {

 

-    global $wpdb;

+	global $wpdb;

 

 

-    $theme_settings = array();

+	$theme_settings = array();

 

-    $theme_settings['geodir_wrapper_open_id'] = $_POST['geodir_wrapper_open_id'];

-    $theme_settings['geodir_wrapper_open_class'] = $_POST['geodir_wrapper_open_class'];

-    $theme_settings['geodir_wrapper_open_replace'] = stripslashes($_POST['geodir_wrapper_open_replace']);

+	$theme_settings['geodir_wrapper_open_id'] = $_POST['geodir_wrapper_open_id'];

+	$theme_settings['geodir_wrapper_open_class'] = $_POST['geodir_wrapper_open_class'];

+	$theme_settings['geodir_wrapper_open_replace'] = stripslashes($_POST['geodir_wrapper_open_replace']);

 

-    $theme_settings['geodir_wrapper_close_replace'] = stripslashes($_POST['geodir_wrapper_close_replace']);

+	$theme_settings['geodir_wrapper_close_replace'] = stripslashes($_POST['geodir_wrapper_close_replace']);

 

-    $theme_settings['geodir_wrapper_content_open_id'] = $_POST['geodir_wrapper_content_open_id'];

-    $theme_settings['geodir_wrapper_content_open_class'] = $_POST['geodir_wrapper_content_open_class'];

-    $theme_settings['geodir_wrapper_content_open_replace'] = stripslashes($_POST['geodir_wrapper_content_open_replace']);

+	$theme_settings['geodir_wrapper_content_open_id'] = $_POST['geodir_wrapper_content_open_id'];

+	$theme_settings['geodir_wrapper_content_open_class'] = $_POST['geodir_wrapper_content_open_class'];

+	$theme_settings['geodir_wrapper_content_open_replace'] = stripslashes($_POST['geodir_wrapper_content_open_replace']);

 

-    $theme_settings['geodir_wrapper_content_close_replace'] = stripslashes($_POST['geodir_wrapper_content_close_replace']);

+	$theme_settings['geodir_wrapper_content_close_replace'] = stripslashes($_POST['geodir_wrapper_content_close_replace']);

 

-    $theme_settings['geodir_article_open_id'] = $_POST['geodir_article_open_id'];

-    $theme_settings['geodir_article_open_class'] = $_POST['geodir_article_open_class'];

-    $theme_settings['geodir_article_open_replace'] = stripslashes($_POST['geodir_article_open_replace']);

+	$theme_settings['geodir_article_open_id'] = $_POST['geodir_article_open_id'];

+	$theme_settings['geodir_article_open_class'] = $_POST['geodir_article_open_class'];

+	$theme_settings['geodir_article_open_replace'] = stripslashes($_POST['geodir_article_open_replace']);

 

-    $theme_settings['geodir_article_close_replace'] = stripslashes($_POST['geodir_article_close_replace']);

+	$theme_settings['geodir_article_close_replace'] = stripslashes($_POST['geodir_article_close_replace']);

 

-    $theme_settings['geodir_sidebar_right_open_id'] = $_POST['geodir_sidebar_right_open_id'];

-    $theme_settings['geodir_sidebar_right_open_class'] = $_POST['geodir_sidebar_right_open_class'];

-    $theme_settings['geodir_sidebar_right_open_replace'] = stripslashes($_POST['geodir_sidebar_right_open_replace']);

+	$theme_settings['geodir_sidebar_right_open_id'] = $_POST['geodir_sidebar_right_open_id'];

+	$theme_settings['geodir_sidebar_right_open_class'] = $_POST['geodir_sidebar_right_open_class'];

+	$theme_settings['geodir_sidebar_right_open_replace'] = stripslashes($_POST['geodir_sidebar_right_open_replace']);

 

-    $theme_settings['geodir_sidebar_right_close_replace'] = stripslashes($_POST['geodir_sidebar_right_close_replace']);

+	$theme_settings['geodir_sidebar_right_close_replace'] = stripslashes($_POST['geodir_sidebar_right_close_replace']);

 

-    $theme_settings['geodir_sidebar_left_open_id'] = $_POST['geodir_sidebar_left_open_id'];

-    $theme_settings['geodir_sidebar_left_open_class'] = $_POST['geodir_sidebar_left_open_class'];

-    $theme_settings['geodir_sidebar_left_open_replace'] = stripslashes($_POST['geodir_sidebar_left_open_replace']);

+	$theme_settings['geodir_sidebar_left_open_id'] = $_POST['geodir_sidebar_left_open_id'];

+	$theme_settings['geodir_sidebar_left_open_class'] = $_POST['geodir_sidebar_left_open_class'];

+	$theme_settings['geodir_sidebar_left_open_replace'] = stripslashes($_POST['geodir_sidebar_left_open_replace']);

 

-    $theme_settings['geodir_sidebar_left_close_replace'] = stripslashes($_POST['geodir_sidebar_left_close_replace']);

+	$theme_settings['geodir_sidebar_left_close_replace'] = stripslashes($_POST['geodir_sidebar_left_close_replace']);

 

-    $theme_settings['geodir_main_content_open_id'] = $_POST['geodir_main_content_open_id'];

-    $theme_settings['geodir_main_content_open_class'] = $_POST['geodir_main_content_open_class'];

-    $theme_settings['geodir_main_content_open_replace'] = stripslashes($_POST['geodir_main_content_open_replace']);

+	$theme_settings['geodir_main_content_open_id'] = $_POST['geodir_main_content_open_id'];

+	$theme_settings['geodir_main_content_open_class'] = $_POST['geodir_main_content_open_class'];

+	$theme_settings['geodir_main_content_open_replace'] = stripslashes($_POST['geodir_main_content_open_replace']);

 

-    $theme_settings['geodir_main_content_close_replace'] = stripslashes($_POST['geodir_main_content_close_replace']);

+	$theme_settings['geodir_main_content_close_replace'] = stripslashes($_POST['geodir_main_content_close_replace']);

 

 // Other Actions

-    $theme_settings['geodir_top_content_add'] = stripslashes($_POST['geodir_top_content_add']);

-    $theme_settings['geodir_before_main_content_add'] = stripslashes($_POST['geodir_before_main_content_add']);

+	$theme_settings['geodir_top_content_add'] = stripslashes($_POST['geodir_top_content_add']);

+	$theme_settings['geodir_before_main_content_add'] = stripslashes($_POST['geodir_before_main_content_add']);

 

 // Filters

-    $theme_settings['geodir_full_page_class_filter'] = stripslashes($_POST['geodir_full_page_class_filter']);

-    $theme_settings['geodir_before_widget_filter'] = stripslashes($_POST['geodir_before_widget_filter']);

-    $theme_settings['geodir_after_widget_filter'] = stripslashes($_POST['geodir_after_widget_filter']);

-    $theme_settings['geodir_before_title_filter'] = stripslashes($_POST['geodir_before_title_filter']);

-    $theme_settings['geodir_after_title_filter'] = stripslashes($_POST['geodir_after_title_filter']);

-    $theme_settings['geodir_menu_li_class_filter'] = stripslashes($_POST['geodir_menu_li_class_filter']);

-    $theme_settings['geodir_sub_menu_ul_class_filter'] = stripslashes($_POST['geodir_sub_menu_ul_class_filter']);

-    $theme_settings['geodir_sub_menu_li_class_filter'] = stripslashes($_POST['geodir_sub_menu_li_class_filter']);

-    $theme_settings['geodir_menu_a_class_filter'] = stripslashes($_POST['geodir_menu_a_class_filter']);

-    $theme_settings['geodir_sub_menu_a_class_filter'] = stripslashes($_POST['geodir_sub_menu_a_class_filter']);

+	$theme_settings['geodir_full_page_class_filter'] = stripslashes($_POST['geodir_full_page_class_filter']);

+	$theme_settings['geodir_before_widget_filter'] = stripslashes($_POST['geodir_before_widget_filter']);

+	$theme_settings['geodir_after_widget_filter'] = stripslashes($_POST['geodir_after_widget_filter']);

+	$theme_settings['geodir_before_title_filter'] = stripslashes($_POST['geodir_before_title_filter']);

+	$theme_settings['geodir_after_title_filter'] = stripslashes($_POST['geodir_after_title_filter']);

+	$theme_settings['geodir_menu_li_class_filter'] = stripslashes($_POST['geodir_menu_li_class_filter']);

+	$theme_settings['geodir_sub_menu_ul_class_filter'] = stripslashes($_POST['geodir_sub_menu_ul_class_filter']);

+	$theme_settings['geodir_sub_menu_li_class_filter'] = stripslashes($_POST['geodir_sub_menu_li_class_filter']);

+	$theme_settings['geodir_menu_a_class_filter'] = stripslashes($_POST['geodir_menu_a_class_filter']);

+	$theme_settings['geodir_sub_menu_a_class_filter'] = stripslashes($_POST['geodir_sub_menu_a_class_filter']);

 //location manager filters

-    $theme_settings['geodir_location_switcher_menu_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_li_class_filter']);

-    $theme_settings['geodir_location_switcher_menu_a_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_a_class_filter']);

-    $theme_settings['geodir_location_switcher_menu_sub_ul_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_ul_class_filter']);

-    $theme_settings['geodir_location_switcher_menu_sub_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_li_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_li_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_a_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_a_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_sub_ul_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_ul_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_sub_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_li_class_filter']);

 

 

 // theme required css

-    $theme_settings['geodir_theme_compat_css'] = stripslashes($_POST['geodir_theme_compat_css']);

+	$theme_settings['geodir_theme_compat_css'] = stripslashes($_POST['geodir_theme_compat_css']);

 

 // theme required js

-    $theme_settings['geodir_theme_compat_js'] = stripslashes($_POST['geodir_theme_compat_js']);

+	$theme_settings['geodir_theme_compat_js'] = stripslashes($_POST['geodir_theme_compat_js']);

 

 // theme compat name

-    $theme_settings['gd_theme_compat'] = $_POST['gd_theme_compat'];

-    if ($theme_settings['gd_theme_compat'] == '') {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-        return;

-    }

+	$theme_settings['gd_theme_compat'] = $_POST['gd_theme_compat'];

+	if ($theme_settings['gd_theme_compat'] == '') {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+		return;

+	}

 

 // theme default options

-    $theme_settings['geodir_theme_compat_default_options'] = '';

+	$theme_settings['geodir_theme_compat_default_options'] = '';

 

 

 //suported theme code

-    $theme_settings['geodir_theme_compat_code'] = false;

-

-    $theme = wp_get_theme();

-

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

-

-    if (in_array($theme_name, array('Avada', 'Enfold', 'X', 'Divi', 'Genesis', 'Jupiter', 'Multi_News'))) {// list of themes that have php files

-        $theme_settings['geodir_theme_compat_code'] = $theme_name;

-    }

-

-

-    $theme_name = $theme_name . "_custom";

-    $theme_arr = get_option('gd_theme_compats');

-    update_option('gd_theme_compat', $theme_name);

-    /**

-     * Called before the theme compatibility settings are saved to the DB.

-     *

-     * @since 1.4.0

-     * @param array $theme_settings {

-     *    Attributes of the theme compatibility settings array.

-     *

-     *    @type string $geodir_wrapper_open_id Geodir wrapper open html id.

-     *    @type string $geodir_wrapper_open_class Geodir wrapper open html class.

-     *    @type string $geodir_wrapper_open_replace Geodir wrapper open content replace.

-     *    @type string $geodir_wrapper_close_replace Geodir wrapper close content replace.

-     *    @type string $geodir_wrapper_content_open_id Geodir wrapper content open html id.

-     *    @type string $geodir_wrapper_content_open_class Geodir wrapper content open html class.

-     *    @type string $geodir_wrapper_content_open_replace Geodir wrapper content open content replace.

-     *    @type string $geodir_wrapper_content_close_replace Geodir wrapper content close content replace.

-     *    @type string $geodir_article_open_id Geodir article open html id.

-     *    @type string $geodir_article_open_class Geodir article open html class.

-     *    @type string $geodir_article_open_replace Geodir article open content replace.

-     *    @type string $geodir_article_close_replace Geodir article close content replace.

-     *    @type string $geodir_sidebar_right_open_id Geodir sidebar right open html id.

-     *    @type string $geodir_sidebar_right_open_class Geodir sidebar right open html class.

-     *    @type string $geodir_sidebar_right_open_replace Geodir sidebar right open content replace.

-     *    @type string $geodir_sidebar_right_close_replace Geodir sidebar right close content replace.

-     *    @type string $geodir_sidebar_left_open_id Geodir sidebar left open html id.

-     *    @type string $geodir_sidebar_left_open_class Geodir sidebar left open html class.

-     *    @type string $geodir_sidebar_left_open_replace Geodir sidebar left open content replace.

-     *    @type string $geodir_sidebar_left_close_replace Geodir sidebar left close content replace.

-     *    @type string $geodir_main_content_open_id Geodir main content open html id.

-     *    @type string $geodir_main_content_open_class Geodir main content open html class.

-     *    @type string $geodir_main_content_open_replace Geodir main content open content replace.

-     *    @type string $geodir_main_content_close_replace Geodir main content close content replace.

-     *    @type string $geodir_top_content_add Geodir top content add.

-     *    @type string $geodir_before_main_content_add Geodir before main content add.

-     *    @type string $geodir_full_page_class_filter Geodir full page class filter.

-     *    @type string $geodir_before_widget_filter Geodir before widget filter.

-     *    @type string $geodir_after_widget_filter Geodir after widget filter.

-     *    @type string $geodir_before_title_filter Geodir before title filter.

-     *    @type string $geodir_after_title_filter Geodir after title filter.

-     *    @type string $geodir_menu_li_class_filter Geodir menu li class filter.

-     *    @type string $geodir_sub_menu_ul_class_filter Geodir sub menu ul class filter.

-     *    @type string $geodir_sub_menu_li_class_filter Geodir sub menu li class filter.

-     *    @type string $geodir_menu_a_class_filter Geodir menu a class filter.

-     *    @type string $geodir_sub_menu_a_class_filter Geodir sub menu a class filter.

-     *    @type string $geodir_location_switcher_menu_li_class_filter Geodir location switcher menu li class filter.

-     *    @type string $geodir_location_switcher_menu_a_class_filter Geodir location switcher menu a class filter.

-     *    @type string $geodir_location_switcher_menu_sub_ul_class_filter Geodir location switcher menu sub ul class filter.

-     *    @type string $geodir_location_switcher_menu_sub_li_class_filter Geodir location switcher menu sub li class filter.

-     *    @type string $geodir_theme_compat_css Geodir theme compatibility css.

-     *    @type string $geodir_theme_compat_js Geodir theme compatibility js.

-     *    @type string $gd_theme_compat Gd theme compatibility.

-     *    @type string $geodir_theme_compat_default_options Geodir theme compatibility default options.

-     *    @type bool $geodir_theme_compat_code Geodir theme compatibility code Ex: 'Avada.

-     *

-     * }

-     */

-    do_action('gd_compat_save_settings', $theme_settings);

+	$theme_settings['geodir_theme_compat_code'] = false;

+

+	$theme = wp_get_theme();

+

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

+

+	if (in_array($theme_name, array('Avada', 'Enfold', 'X', 'Divi', 'Genesis', 'Jupiter', 'Multi_News'))) {// list of themes that have php files

+		$theme_settings['geodir_theme_compat_code'] = $theme_name;

+	}

+

+

+	$theme_name = $theme_name . "_custom";

+	$theme_arr = get_option('gd_theme_compats');

+	update_option('gd_theme_compat', $theme_name);

+	/**

+	 * Called before the theme compatibility settings are saved to the DB.

+	 *

+	 * @since 1.4.0

+	 * @param array $theme_settings {

+	 *    Attributes of the theme compatibility settings array.

+	 *

+	 *    @type string $geodir_wrapper_open_id Geodir wrapper open html id.

+	 *    @type string $geodir_wrapper_open_class Geodir wrapper open html class.

+	 *    @type string $geodir_wrapper_open_replace Geodir wrapper open content replace.

+	 *    @type string $geodir_wrapper_close_replace Geodir wrapper close content replace.

+	 *    @type string $geodir_wrapper_content_open_id Geodir wrapper content open html id.

+	 *    @type string $geodir_wrapper_content_open_class Geodir wrapper content open html class.

+	 *    @type string $geodir_wrapper_content_open_replace Geodir wrapper content open content replace.

+	 *    @type string $geodir_wrapper_content_close_replace Geodir wrapper content close content replace.

+	 *    @type string $geodir_article_open_id Geodir article open html id.

+	 *    @type string $geodir_article_open_class Geodir article open html class.

+	 *    @type string $geodir_article_open_replace Geodir article open content replace.

+	 *    @type string $geodir_article_close_replace Geodir article close content replace.

+	 *    @type string $geodir_sidebar_right_open_id Geodir sidebar right open html id.

+	 *    @type string $geodir_sidebar_right_open_class Geodir sidebar right open html class.

+	 *    @type string $geodir_sidebar_right_open_replace Geodir sidebar right open content replace.

+	 *    @type string $geodir_sidebar_right_close_replace Geodir sidebar right close content replace.

+	 *    @type string $geodir_sidebar_left_open_id Geodir sidebar left open html id.

+	 *    @type string $geodir_sidebar_left_open_class Geodir sidebar left open html class.

+	 *    @type string $geodir_sidebar_left_open_replace Geodir sidebar left open content replace.

+	 *    @type string $geodir_sidebar_left_close_replace Geodir sidebar left close content replace.

+	 *    @type string $geodir_main_content_open_id Geodir main content open html id.

+	 *    @type string $geodir_main_content_open_class Geodir main content open html class.

+	 *    @type string $geodir_main_content_open_replace Geodir main content open content replace.

+	 *    @type string $geodir_main_content_close_replace Geodir main content close content replace.

+	 *    @type string $geodir_top_content_add Geodir top content add.

+	 *    @type string $geodir_before_main_content_add Geodir before main content add.

+	 *    @type string $geodir_full_page_class_filter Geodir full page class filter.

+	 *    @type string $geodir_before_widget_filter Geodir before widget filter.

+	 *    @type string $geodir_after_widget_filter Geodir after widget filter.

+	 *    @type string $geodir_before_title_filter Geodir before title filter.

+	 *    @type string $geodir_after_title_filter Geodir after title filter.

+	 *    @type string $geodir_menu_li_class_filter Geodir menu li class filter.

+	 *    @type string $geodir_sub_menu_ul_class_filter Geodir sub menu ul class filter.

+	 *    @type string $geodir_sub_menu_li_class_filter Geodir sub menu li class filter.

+	 *    @type string $geodir_menu_a_class_filter Geodir menu a class filter.

+	 *    @type string $geodir_sub_menu_a_class_filter Geodir sub menu a class filter.

+	 *    @type string $geodir_location_switcher_menu_li_class_filter Geodir location switcher menu li class filter.

+	 *    @type string $geodir_location_switcher_menu_a_class_filter Geodir location switcher menu a class filter.

+	 *    @type string $geodir_location_switcher_menu_sub_ul_class_filter Geodir location switcher menu sub ul class filter.

+	 *    @type string $geodir_location_switcher_menu_sub_li_class_filter Geodir location switcher menu sub li class filter.

+	 *    @type string $geodir_theme_compat_css Geodir theme compatibility css.

+	 *    @type string $geodir_theme_compat_js Geodir theme compatibility js.

+	 *    @type string $gd_theme_compat Gd theme compatibility.

+	 *    @type string $geodir_theme_compat_default_options Geodir theme compatibility default options.

+	 *    @type bool $geodir_theme_compat_code Geodir theme compatibility code Ex: 'Avada.

+	 *

+	 * }

+	 */

+	do_action('gd_compat_save_settings', $theme_settings);

 

 //if($_POST['gd_theme_compat'])==

-    $theme_arr[$theme_name] = $theme_settings;

-    update_option('gd_theme_compats', $theme_arr);

+	$theme_arr[$theme_name] = $theme_settings;

+	update_option('gd_theme_compats', $theme_arr);

 

 

 //print_r($theme_settings);exit;

-    update_option('theme_compatibility_setting', $theme_settings);

+	update_option('theme_compatibility_setting', $theme_settings);

 

 }

 

@@ -766,12 +766,12 @@ 
  */

 function geodir_theme_compatibility_setting_page()

 {

-    global $wpdb;

-    $tc = get_option('theme_compatibility_setting');

-    //print_r($tc);

-    //print_r(wp_get_theme());

+	global $wpdb;

+	$tc = get_option('theme_compatibility_setting');

+	//print_r($tc);

+	//print_r(wp_get_theme());

 

-    ?>

+	?>

     <div class="inner_content_tab_main">

         <div class="gd-content-heading">

 

@@ -813,21 +813,21 @@ 
                 <option value=""><?php _e('Select Theme', 'geodirectory');?></option>

                 <option value="custom"><?php _e('Custom', 'geodirectory');?></option>

                 <?php

-                $theme_arr = get_option('gd_theme_compats');

-                $theme_active = get_option('gd_theme_compat');

-                if (is_array($theme_arr)) {

-                    foreach ($theme_arr as $key => $theme) {

-                        $sel = '';

-                        if ($theme_active == $key) {

-                            $sel = "selected";

-                        }

-                        echo "<option $sel>$key</option>";

-                    }

+				$theme_arr = get_option('gd_theme_compats');

+				$theme_active = get_option('gd_theme_compat');

+				if (is_array($theme_arr)) {

+					foreach ($theme_arr as $key => $theme) {

+						$sel = '';

+						if ($theme_active == $key) {

+							$sel = "selected";

+						}

+						echo "<option $sel>$key</option>";

+					}

 

 

-                }

+				}

 

-                ?>

+				?>

             </select>

             <button onclick="gd_comp_export();" type="button"

                     class="button-primary"><?php _e('Export', 'geodirectory');?></button>

@@ -936,11 +936,11 @@ 
                         <small>geodir_wrapper_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_open_id'])) {

-                            echo $tc['geodir_wrapper_open_id'];

-                        }?>" type="text" name="geodir_wrapper_open_id" placeholder="geodir-wrapper"/></td>

+							echo $tc['geodir_wrapper_open_id'];

+						}?>" type="text" name="geodir_wrapper_open_id" placeholder="geodir-wrapper"/></td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_open_class'])) {

-                            echo $tc['geodir_wrapper_open_class'];

-                        }?>" type="text" name="geodir_wrapper_open_class" placeholder=""/></td>

+							echo $tc['geodir_wrapper_open_class'];

+						}?>" type="text" name="geodir_wrapper_open_class" placeholder=""/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

@@ -948,8 +948,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_wrapper_open_replace"

                                   placeholder='<div id="[id]" class="[class]">'><?php if (isset($tc['geodir_wrapper_open_replace'])) {

-                                echo $tc['geodir_wrapper_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -969,8 +969,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_wrapper_close_replace"

                                   placeholder='</div><!-- wrapper ends here-->'><?php if (isset($tc['geodir_wrapper_close_replace'])) {

-                                echo $tc['geodir_wrapper_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -980,12 +980,12 @@ 
                         <small>geodir_wrapper_content_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_content_open_id'])) {

-                            echo $tc['geodir_wrapper_content_open_id'];

-                        }?>" type="text" name="geodir_wrapper_content_open_id" placeholder="geodir-wrapper-content"/>

+							echo $tc['geodir_wrapper_content_open_id'];

+						}?>" type="text" name="geodir_wrapper_content_open_id" placeholder="geodir-wrapper-content"/>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_content_open_class'])) {

-                            echo $tc['geodir_wrapper_content_open_class'];

-                        }?>" type="text" name="geodir_wrapper_content_open_class" placeholder=""/></td>

+							echo $tc['geodir_wrapper_content_open_class'];

+						}?>" type="text" name="geodir_wrapper_content_open_class" placeholder=""/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

@@ -993,8 +993,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_wrapper_content_open_replace"

                                   placeholder='<div id="[id]" class="[class]" role="main" [width_css]>'><?php if (isset($tc['geodir_wrapper_content_open_replace'])) {

-                                echo $tc['geodir_wrapper_content_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_content_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1014,8 +1014,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_wrapper_content_close_replace"

                                   placeholder='</div><!-- content ends here-->'><?php if (isset($tc['geodir_wrapper_content_close_replace'])) {

-                                echo $tc['geodir_wrapper_content_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_content_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1024,11 +1024,11 @@ 
                         <small>geodir_article_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_article_open_id'])) {

-                            echo $tc['geodir_article_open_id'];

-                        }?>" type="text" name="geodir_article_open_id" placeholder="geodir-wrapper-content"/></td>

+							echo $tc['geodir_article_open_id'];

+						}?>" type="text" name="geodir_article_open_id" placeholder="geodir-wrapper-content"/></td>

                     <td><input value="<?php if (isset($tc['geodir_article_open_class'])) {

-                            echo $tc['geodir_article_open_class'];

-                        }?>" type="text" name="geodir_article_open_class" placeholder=""/></td>

+							echo $tc['geodir_article_open_class'];

+						}?>" type="text" name="geodir_article_open_class" placeholder=""/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

@@ -1036,8 +1036,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_article_open_replace"

                                   placeholder='<article  id="[id]" class="[class]" itemscope itemtype="[itemtype]">'><?php if (isset($tc['geodir_article_open_replace'])) {

-                                echo $tc['geodir_article_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_article_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1056,8 +1056,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_article_close_replace"

                                   placeholder='</article><!-- article ends here-->'><?php if (isset($tc['geodir_article_close_replace'])) {

-                                echo $tc['geodir_article_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_article_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1066,11 +1066,11 @@ 
                         <small>geodir_sidebar_right_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_right_open_id'])) {

-                            echo $tc['geodir_sidebar_right_open_id'];

-                        }?>" type="text" name="geodir_sidebar_right_open_id" placeholder="geodir-sidebar-right"/></td>

+							echo $tc['geodir_sidebar_right_open_id'];

+						}?>" type="text" name="geodir_sidebar_right_open_id" placeholder="geodir-sidebar-right"/></td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_right_open_class'])) {

-                            echo $tc['geodir_sidebar_right_open_class'];

-                        }?>" type="text" name="geodir_sidebar_right_open_class"

+							echo $tc['geodir_sidebar_right_open_class'];

+						}?>" type="text" name="geodir_sidebar_right_open_class"

                                placeholder="geodir-sidebar-right geodir-listings-sidebar-right"/></td>

                 </tr>

 

@@ -1079,8 +1079,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_sidebar_right_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_right_open_replace'])) {

-                                echo $tc['geodir_sidebar_right_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_right_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1099,8 +1099,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_sidebar_right_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_right_close_replace'])) {

-                                echo $tc['geodir_sidebar_right_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_right_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1110,11 +1110,11 @@ 
                         <small>geodir_sidebar_left_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_left_open_id'])) {

-                            echo $tc['geodir_sidebar_left_open_id'];

-                        }?>" type="text" name="geodir_sidebar_left_open_id" placeholder="geodir-sidebar-left"/></td>

+							echo $tc['geodir_sidebar_left_open_id'];

+						}?>" type="text" name="geodir_sidebar_left_open_id" placeholder="geodir-sidebar-left"/></td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_left_open_class'])) {

-                            echo $tc['geodir_sidebar_left_open_class'];

-                        }?>" type="text" name="geodir_sidebar_left_open_class"

+							echo $tc['geodir_sidebar_left_open_class'];

+						}?>" type="text" name="geodir_sidebar_left_open_class"

                                placeholder="geodir-sidebar-left geodir-listings-sidebar-left"/></td>

                 </tr>

 

@@ -1123,8 +1123,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_sidebar_left_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_left_open_replace'])) {

-                                echo $tc['geodir_sidebar_left_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_left_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1143,8 +1143,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_sidebar_left_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_left_close_replace'])) {

-                                echo $tc['geodir_sidebar_left_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_left_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1153,11 +1153,11 @@ 
                         <small>geodir_main_content_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_main_content_open_id'])) {

-                            echo $tc['geodir_main_content_open_id'];

-                        }?>" type="text" name="geodir_main_content_open_id" placeholder="geodir-main-content"/></td>

+							echo $tc['geodir_main_content_open_id'];

+						}?>" type="text" name="geodir_main_content_open_id" placeholder="geodir-main-content"/></td>

                     <td><input value="<?php if (isset($tc['geodir_main_content_open_class'])) {

-                            echo $tc['geodir_main_content_open_class'];

-                        }?>" type="text" name="geodir_main_content_open_class" placeholder="CURRENT-PAGE-page"/></td>

+							echo $tc['geodir_main_content_open_class'];

+						}?>" type="text" name="geodir_main_content_open_class" placeholder="CURRENT-PAGE-page"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

@@ -1165,8 +1165,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_main_content_open_replace"

                                   placeholder='<main  id="[id]" class="[class]"  role="main">'><?php if (isset($tc['geodir_main_content_open_replace'])) {

-                                echo $tc['geodir_main_content_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_main_content_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1185,8 +1185,8 @@ 
                         <span><?php _e('Output:', 'geodirectory');?></span>

                         <textarea name="geodir_main_content_close_replace"

                                   placeholder='</main><!-- main ends here-->'><?php if (isset($tc['geodir_main_content_close_replace'])) {

-                                echo $tc['geodir_main_content_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_main_content_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1210,8 +1210,8 @@ 
                     </td>

                     <td><textarea name="geodir_top_content_add"

                                   placeholder=''><?php if (isset($tc['geodir_top_content_add'])) {

-                                echo $tc['geodir_top_content_add'];

-                            }?></textarea></td>

+								echo $tc['geodir_top_content_add'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1220,8 +1220,8 @@ 
                     </td>

                     <td><textarea name="geodir_before_main_content_add"

                                   placeholder=''><?php if (isset($tc['geodir_before_main_content_add'])) {

-                                echo $tc['geodir_before_main_content_add'];

-                            }?></textarea></td>

+								echo $tc['geodir_before_main_content_add'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1244,8 +1244,8 @@ 
                     </td>

                     <td><textarea name="geodir_full_page_class_filter"

                                   placeholder='geodir_full_page clearfix'><?php if (isset($tc['geodir_full_page_class_filter'])) {

-                                echo $tc['geodir_full_page_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_full_page_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1254,8 +1254,8 @@ 
                     </td>

                     <td><textarea name="geodir_before_widget_filter"

                                   placeholder='<section id="%1$s" class="widget geodir-widget %2$s">'><?php if (isset($tc['geodir_before_widget_filter'])) {

-                                echo $tc['geodir_before_widget_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_before_widget_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1264,8 +1264,8 @@ 
                     </td>

                     <td><textarea name="geodir_after_widget_filter"

                                   placeholder='</section>'><?php if (isset($tc['geodir_after_widget_filter'])) {

-                                echo $tc['geodir_after_widget_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_after_widget_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1274,8 +1274,8 @@ 
                     </td>

                     <td><textarea name="geodir_before_title_filter"

                                   placeholder='<h3 class="widget-title">'><?php if (isset($tc['geodir_before_title_filter'])) {

-                                echo $tc['geodir_before_title_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_before_title_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1284,8 +1284,8 @@ 
                     </td>

                     <td><textarea name="geodir_after_title_filter"

                                   placeholder='</h3>'><?php if (isset($tc['geodir_after_title_filter'])) {

-                                echo $tc['geodir_after_title_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_after_title_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1294,8 +1294,8 @@ 
                     </td>

                     <td><textarea name="geodir_menu_li_class_filter"

                                   placeholder='menu-item'><?php if (isset($tc['geodir_menu_li_class_filter'])) {

-                                echo $tc['geodir_menu_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_menu_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1304,8 +1304,8 @@ 
                     </td>

                     <td><textarea name="geodir_sub_menu_ul_class_filter"

                                   placeholder='sub-menu'><?php if (isset($tc['geodir_sub_menu_ul_class_filter'])) {

-                                echo $tc['geodir_sub_menu_ul_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_sub_menu_ul_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1314,8 +1314,8 @@ 
                     </td>

                     <td><textarea name="geodir_sub_menu_li_class_filter"

                                   placeholder='menu-item'><?php if (isset($tc['geodir_sub_menu_li_class_filter'])) {

-                                echo $tc['geodir_sub_menu_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_sub_menu_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1324,8 +1324,8 @@ 
                     </td>

                     <td><textarea name="geodir_menu_a_class_filter"

                                   placeholder=''><?php if (isset($tc['geodir_menu_a_class_filter'])) {

-                                echo $tc['geodir_menu_a_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_menu_a_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1334,8 +1334,8 @@ 
                     </td>

                     <td><textarea name="geodir_sub_menu_a_class_filter"

                                   placeholder=''><?php if (isset($tc['geodir_sub_menu_a_class_filter'])) {

-                                echo $tc['geodir_sub_menu_a_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_sub_menu_a_class_filter'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1345,8 +1345,8 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_li_class_filter"

                                   placeholder='menu-item menu-item-type-social menu-item-type-social gd-location-switcher'><?php if (isset($tc['geodir_location_switcher_menu_li_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1355,8 +1355,8 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_a_class_filter"

                                   placeholder=''><?php if (isset($tc['geodir_location_switcher_menu_a_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_a_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_a_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1365,8 +1365,8 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_sub_ul_class_filter"

                                   placeholder='sub-menu'><?php if (isset($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1375,21 +1375,21 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_sub_li_class_filter"

                                   placeholder='menu-item gd-location-switcher-menu-item'><?php if (isset($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_sub_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_sub_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

 

 

                 <?php

-                /**

-                 * Allows more filter setting to be added to theme compatibility settings page.

-                 *

-                 * Called after the last setting in "Other filters" section of theme compatibility settings.

-                 *

-                 * @since 1.4.0

-                 */

-                do_action('gd_compat_other_filters');?>

+				/**

+				 * Allows more filter setting to be added to theme compatibility settings page.

+				 *

+				 * Called after the last setting in "Other filters" section of theme compatibility settings.

+				 *

+				 * @since 1.4.0

+				 */

+				do_action('gd_compat_other_filters');?>

 

                 </tbody>

             </table>

@@ -1402,8 +1402,8 @@ 
                 <tr>

                     <td><textarea name="geodir_theme_compat_css"

                                   placeholder=''><?php if (isset($tc['geodir_theme_compat_css'])) {

-                                echo $tc['geodir_theme_compat_css'];

-                            }?></textarea></td>

+								echo $tc['geodir_theme_compat_css'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1417,8 +1417,8 @@ 
                 <tr>

                     <td><textarea name="geodir_theme_compat_js"

                                   placeholder=''><?php if (isset($tc['geodir_theme_compat_js'])) {

-                                echo $tc['geodir_theme_compat_js'];

-                            }?></textarea></td>

+								echo $tc['geodir_theme_compat_js'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1445,23 +1445,23 @@ 
  */

 function geodir_custom_post_type_form()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? $_REQUEST['listing_type'] : 'gd_place';

+	$listing_type = ($_REQUEST['listing_type'] != '') ? $_REQUEST['listing_type'] : 'gd_place';

 

-    $sub_tab = ($_REQUEST['subtab'] != '') ? $_REQUEST['subtab'] : '';

+	$sub_tab = ($_REQUEST['subtab'] != '') ? $_REQUEST['subtab'] : '';

 

 

-    ?>

+	?>

 

     <div class="gd-content-heading">

         <?php

-        /**

-         * Filter custom fields panel heading.

-         *

-         * @since 1.0.0

-         * @param string $sub_tab Sub tab name.

-         * @param string $listing_type Post type.

-         */

-        ?>

+		/**

+		 * Filter custom fields panel heading.

+		 *

+		 * @since 1.0.0

+		 * @param string $sub_tab Sub tab name.

+		 * @param string $listing_type Post type.

+		 */

+		?>

         <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type);?></h3>

     </div>

     <div id="container_general" class="clearfix">

@@ -1469,25 +1469,25 @@ 
 

             <div class="side-sortables" id="geodir-available-fields">

                 <?php

-                /**

-                 * Filter custom field available fields heading.

-                 *

-                 * @since 1.0.0

-                 * @param string $sub_tab Sub tab name.

-                 * @param string $listing_type Post type.

-                 */

-                ?>

+				/**

+				 * Filter custom field available fields heading.

+				 *

+				 * @since 1.0.0

+				 * @param string $sub_tab Sub tab name.

+				 * @param string $listing_type Post type.

+				 */

+				?>

                 <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type);?>

 							</span></h3>

                 <?php

-                /**

-                 * Filter custom field available fields note text.

-                 *

-                 * @since 1.0.0

-                 * @param string $sub_tab Sub tab name.

-                 * @param string $listing_type Post type.

-                 */

-                ?>

+				/**

+				 * Filter custom field available fields note text.

+				 *

+				 * @since 1.0.0

+				 * @param string $sub_tab Sub tab name.

+				 * @param string $listing_type Post type.

+				 */

+				?>

                 <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type);?></p>

 

                 <div class="inside">

@@ -1495,13 +1495,13 @@ 
                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

 

                         <?php

-                        /**

-                         * Adds the available fields to the custom fields settings page per post type.

-                         *

-                         * @since 1.0.0

-                         * @param string $sub_tab The current settings tab name.

-                         */

-                        do_action('geodir_manage_available_fields', $sub_tab); ?>

+						/**

+						 * Adds the available fields to the custom fields settings page per post type.

+						 *

+						 * @since 1.0.0

+						 * @param string $sub_tab The current settings tab name.

+						 */

+						do_action('geodir_manage_available_fields', $sub_tab); ?>

 

                         <div style="clear:both"></div>

                     </div>

@@ -1514,25 +1514,25 @@ 
             <div class="side-sortables" id="geodir-selected-fields">

                 <h3 class="hndle">

                     <?php

-                    /**

-                     * Filter custom field selected fields heading.

-                     *

-                     * @since 1.0.0

-                     * @param string $sub_tab Sub tab name.

-                     * @param string $listing_type Post type.

-                     */

-                    ?>

+					/**

+					 * Filter custom field selected fields heading.

+					 *

+					 * @since 1.0.0

+					 * @param string $sub_tab Sub tab name.

+					 * @param string $listing_type Post type.

+					 */

+					?>

                     <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type);?></span>

                 </h3>

                 <?php

-                /**

-                 * Filter custom field selected fields note text.

-                 *

-                 * @since 1.0.0

-                 * @param string $sub_tab Sub tab name.

-                 * @param string $listing_type Post type.

-                 */

-                ?>

+				/**

+				 * Filter custom field selected fields note text.

+				 *

+				 * @since 1.0.0

+				 * @param string $sub_tab Sub tab name.

+				 * @param string $listing_type Post type.

+				 */

+				?>

                 <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type);?></p>

 

                 <div class="inside">

@@ -1540,13 +1540,13 @@ 
                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

                         <div class="field_row_main">

                             <?php

-                            /**

-                             * Adds the selected fields and setting to the custom fields settings page per post type.

-                             *

-                             * @since 1.0.0

-                             * @param string $sub_tab The current settings tab name.

-                             */

-                            do_action('geodir_manage_selected_fields', $sub_tab); ?>

+							/**

+							 * Adds the selected fields and setting to the custom fields settings page per post type.

+							 *

+							 * @since 1.0.0

+							 * @param string $sub_tab The current settings tab name.

+							 */

+							do_action('geodir_manage_selected_fields', $sub_tab); ?>

                         </div>

                         <div style="clear:both"></div>

                     </div>

@@ -1569,7 +1569,7 @@ 
  */

 function geodir_diagnostic_tools_setting_page()

 {

-    ?>

+	?>

     <div class="inner_content_tab_main">

         <div class="gd-content-heading">

 

@@ -1671,13 +1671,13 @@ 
 					</td>

 				</tr>

                 <?php

-                /**

-                 * Allows you to add more setting to the GD>Tools settings page.

-                 *

-                 * Called after the last setting on the GD>Tools page.

-                 * @since 1.0.0

-                 */

-                do_action('geodir_diagnostic_tool');?>

+				/**

+				 * Allows you to add more setting to the GD>Tools settings page.

+				 *

+				 * Called after the last setting on the GD>Tools page.

+				 * @since 1.0.0

+				 */

+				do_action('geodir_diagnostic_tool');?>

 

                 </tbody>

             </table>

geodirectory-admin/geodir_admin_ajax.php

Indentation +6 added lines, -6 removed lines

@@ -13,14 +13,14 @@
 	 * @since 1.0.0
 	 */
 	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
-    die;
+	die;
 }
 
 
 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] != '') {
-    switch ($_REQUEST['ajax_action']):
-        case 'get_cat_dl':
-            geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
-            break;
-    endswitch;
+	switch ($_REQUEST['ajax_action']):
+		case 'get_cat_dl':
+			geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
+			break;
+	endswitch;
 }
\ No newline at end of file

geodirectory-admin/option-pages/create_field.php

Indentation +65 added lines, -65 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Creates custom fields
- *
- * @since 1.0.0
- * @package GeoDirectory
- */
+	 * Creates custom fields
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 */
 
 $data_type = isset($_REQUEST['data_type']) ? sanitize_text_field($_REQUEST['data_type']) : '';
 $field_type = isset($_REQUEST['field_type']) ? sanitize_text_field($_REQUEST['field_type']) : '';
@@ -15,95 +15,95 @@ 
 
 $field_ids = array();
 if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) {
-    foreach ($_REQUEST['licontainer'] as $lic_id) {
-        $field_ids[] = sanitize_text_field($lic_id);
-    }
+	foreach ($_REQUEST['licontainer'] as $lic_id) {
+		$field_ids[] = sanitize_text_field($lic_id);
+	}
 }
 
 /* ------- check nonce field ------- */
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    echo godir_set_field_order($field_ids);
+	echo godir_set_field_order($field_ids);
 }
 
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    echo godir_set_sort_field_order($field_ids);
+	echo godir_set_sort_field_order($field_ids);
 }
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action);
+	geodir_custom_field_adminhtml($field_type, $field_id, $field_action);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action);
+	geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_field_delete($field_id);
+	echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_sort_field_delete($field_id);
+	echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit');
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		geodir_custom_field_adminhtml($field_type, $lastid, 'submit');
+	} else {
+		echo $return;
+	}
 }
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_sort_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        $default = false;
-        geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_sort_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		$default = false;
+		geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
+	} else {
+		echo $return;
+	}
 }
\ No newline at end of file

geodirectory-admin/option-pages/design_settings_array.php

Indentation +902 added lines, -902 removed lines

@@ -1,11 +1,11 @@ 
 <?php

 /**

- * Design tab settings.

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global array $geodir_settings Geodirectory settings array.

- */

+	 * Design tab settings.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $geodir_settings Geodirectory settings array.

+	 */

 global $geodir_settings;

 

 

@@ -17,14 +17,14 @@ 
  */

 function geodir_post_type_setting_fun()

 {

-    $post_type_arr = array();

+	$post_type_arr = array();

 

-    $post_types = geodir_get_posttypes('object');

+	$post_types = geodir_get_posttypes('object');

 

-    foreach ($post_types as $key => $post_types_obj) {

-        $post_type_arr[$key] = $post_types_obj->labels->singular_name;

-    }

-    return $post_type_arr;

+	foreach ($post_types as $key => $post_types_obj) {

+		$post_type_arr[$key] = $post_types_obj->labels->singular_name;

+	}

+	return $post_type_arr;

 }

 

 /**

@@ -35,548 +35,548 @@ 
  */

 function geodir_theme_location_setting_fun()

 {

-    $post_type_arr = array();

-    $geodir_all_nav_locations = get_registered_nav_menus();

-    $geodir_active_nav_locations = get_nav_menu_locations();

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

-        foreach ($geodir_active_nav_locations as $key => $theme_location) {

-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];

-        }

-    }

-

-    return $post_type_arr;

+	$post_type_arr = array();

+	$geodir_all_nav_locations = get_registered_nav_menus();

+	$geodir_active_nav_locations = get_nav_menu_locations();

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

+		foreach ($geodir_active_nav_locations as $key => $theme_location) {

+			if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

+				$post_type_arr[$key] = $geodir_all_nav_locations[$key];

+		}

+	}

+

+	return $post_type_arr;

 }

 /**

- * Filter GD design settings array.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Filter GD design settings array.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 $geodir_settings['design_settings'] = apply_filters('geodir_design_settings', array(

 

-    /* Home Layout Settings start */

-    array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),

+	/* Home Layout Settings start */

+	array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),

 

 

-    array('name' => __('Home Top Section Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_top_section'),

+	array('name' => __('Home Top Section Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_top_section'),

 

-    array(

-        'name' => __('Geodirectory home page', 'geodirectory'),

-        'desc' => __('Set geodirectory home page as your home. <b style="color:red;">This setting has been depreciated and will be removed in the next version, instead please set the GD home page in GD>Permalinks and then set this page to the front page under Settings>Reading>Front Page</b>', 'geodirectory'),

-        'id' => 'geodir_set_as_home',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Geodirectory home page', 'geodirectory'),

+		'desc' => __('Set geodirectory home page as your home. <b style="color:red;">This setting has been depreciated and will be removed in the next version, instead please set the GD home page in GD>Permalinks and then set this page to the front page under Settings>Reading>Front Page</b>', 'geodirectory'),

+		'id' => 'geodir_set_as_home',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home top section', 'geodirectory'),

-        'desc' => __('Show the top section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home top section', 'geodirectory'),

+		'desc' => __('Show the top section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),

+	array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),

 

 

-    array('name' => __('Home Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_layout'),

+	array('name' => __('Home Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_layout'),

 

-    array(

-        'name' => __('Home right section', 'geodirectory'),

-        'desc' => __('Show the right section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home right section', 'geodirectory'),

+		'desc' => __('Show the right section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home content section', 'geodirectory'),

-        'desc' => __('Show the content section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_contant_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home content section', 'geodirectory'),

+		'desc' => __('Show the content section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_contant_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home left section', 'geodirectory'),

-        'desc' => __('Show the left section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home left section', 'geodirectory'),

+		'desc' => __('Show the left section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Resize image large size', 'geodirectory'),

-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

-        'id' => 'geodir_use_wp_media_large_size',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Home bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'name' => __('Resize image large size', 'geodirectory'),

+		'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

+		'id' => 'geodir_use_wp_media_large_size',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_home_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_home_layout'),

 

 

-    /* Home Layout Settings end */

+	/* Home Layout Settings end */

 

 

-    /* Listing Layout Settings end */

+	/* Listing Layout Settings end */

 

-    array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),

+	array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),

 

 

-    array('name' => __('Listing Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_listing_layout'),

+	array('name' => __('Listing Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_listing_layout'),

 

-    array(

-        'name' => __('Listing top section', 'geodirectory'),

-        'desc' => __('Show the top section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing top section', 'geodirectory'),

+		'desc' => __('Show the top section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing right section', 'geodirectory'),

-        'desc' => __('Show the right section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing right section', 'geodirectory'),

+		'desc' => __('Show the right section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of listing right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Listing content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of listing page', 'geodirectory'),

-        'id' => 'geodir_listing_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Listing content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of listing page', 'geodirectory'),

+		'id' => 'geodir_listing_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of listing content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing left section', 'geodirectory'),

-        'desc' => __('Show the left section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing left section', 'geodirectory'),

+		'desc' => __('Show the left section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of listing left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Upload listing no image', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_listing_no_img',

-        'type' => 'file',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload listing no image', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_listing_no_img',

+		'type' => 'file',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Description word limit', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_desc_word_limit',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '50' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Description word limit', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_desc_word_limit',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '50' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),

 

 

-    array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),

+	array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),

 

-    array(

-        'name' => __('New listing default status', 'geodirectory'),

-        'desc' => __('Select new listing default status.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_new_post_default_status',

-        'css' => 'min-width:300px;',

-        'std' => 'publish',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'publish' => __('publish', 'geodirectory'),

-            'draft' => __('draft', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('New listing default status', 'geodirectory'),

+		'desc' => __('Select new listing default status.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_new_post_default_status',

+		'css' => 'min-width:300px;',

+		'std' => 'publish',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'publish' => __('publish', 'geodirectory'),

+			'draft' => __('draft', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('New listings settings', 'geodirectory'),

-        'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),

-        'id' => 'geodir_listing_new_days',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('New listings settings', 'geodirectory'),

+		'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),

+		'id' => 'geodir_listing_new_days',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value for the page title - changed in settings

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),

 

 

-    array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),

+	array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),

 

-    array(

-        'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),

-        'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),

-        'id' => 'geodir_accept_term_condition',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),

+		'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),

+		'id' => 'geodir_accept_term_condition',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Show description field as editor', 'geodirectory'),

-        'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_tiny_editor_on_add_listing',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show description field as editor', 'geodirectory'),

+		'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_tiny_editor_on_add_listing',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),

-    /* Listing Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),

+	/* Listing Layout Settings end */

 

 

-    /* Search Layout Settings end */

+	/* Search Layout Settings end */

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),

 

 

-    array('name' => __('Search Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_search_layout'),

+	array('name' => __('Search Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_search_layout'),

 

-    array(

-        'name' => __('Search top section', 'geodirectory'),

-        'desc' => __('Show the top section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search top section', 'geodirectory'),

+		'desc' => __('Show the top section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search right section', 'geodirectory'),

-        'desc' => __('Show the right section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search right section', 'geodirectory'),

+		'desc' => __('Show the right section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of search right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),

-        'id' => 'geodir_width_search_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),

+		'id' => 'geodir_width_search_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Search content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of search page', 'geodirectory'),

-        'id' => 'geodir_search_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Search content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of search page', 'geodirectory'),

+		'id' => 'geodir_search_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of search content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),

-        'id' => 'geodir_width_search_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),

+		'id' => 'geodir_width_search_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search left section', 'geodirectory'),

-        'desc' => __('Show the left section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search left section', 'geodirectory'),

+		'desc' => __('Show the left section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of search left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of search in %', 'geodirectory'),

-        'id' => 'geodir_width_search_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of search in %', 'geodirectory'),

+		'id' => 'geodir_width_search_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 	

 	array(

-        'name' => __('Show advanced pagination details', 'geodirectory'),

-        'desc' => __('This will add extra pagination info like "Showing listings x-y of z" aftre/before pagination.', 'geodirectory'),

-        'id' => 'geodir_pagination_advance_info',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array(

+		'name' => __('Show advanced pagination details', 'geodirectory'),

+		'desc' => __('This will add extra pagination info like "Showing listings x-y of z" aftre/before pagination.', 'geodirectory'),

+		'id' => 'geodir_pagination_advance_info',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array(

 						'' => __('Never Display', 'geodirectory'),

 						'after' => __('After Pagination', 'geodirectory'),

 						'before' => __('Before Pagination', 'geodirectory')

 					)

-    ),

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_search_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_search_layout'),

 

 

-    array('name' => __('Search form default text settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),

+	array('name' => __('Search form default text settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),

 

-    array(

-        'name' => __('Search field default value', 'geodirectory'),

-        'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),

-        'id' => 'geodir_search_field_default_text',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Search for' // show on the listing page.

-    ),

+	array(

+		'name' => __('Search field default value', 'geodirectory'),

+		'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),

+		'id' => 'geodir_search_field_default_text',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Search for' // show on the listing page.

+	),

 

-    array(

-        'name' => __('Near field default value', 'geodirectory'),

-        'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),

-        'id' => 'geodir_near_field_default_text',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Near' // show on the listing page.

-    ),

+	array(

+		'name' => __('Near field default value', 'geodirectory'),

+		'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),

+		'id' => 'geodir_near_field_default_text',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Near' // show on the listing page.

+	),

 

-    array(

-        'name' => __('Search button label', 'geodirectory'),

-        'desc' => __('Show the search button label on search form.', 'geodirectory'),

-        'id' => 'geodir_search_button_label',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Search' // show on the listing page.

-    ),

+	array(

+		'name' => __('Search button label', 'geodirectory'),

+		'desc' => __('Show the search button label on search form.', 'geodirectory'),

+		'id' => 'geodir_search_button_label',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Search' // show on the listing page.

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),

 

-    /* Listing Layout Settings end */

+	/* Listing Layout Settings end */

 

 

-    /* Detail Layout Settings end */

+	/* Detail Layout Settings end */

 

-    array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),

+	array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),

 

-    array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),

+	array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),

 

-    array(

-        'name' => __('Detail top section', 'geodirectory'),

-        'desc' => __('Show the top section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_detail_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Detail top section', 'geodirectory'),

+		'desc' => __('Show the top section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_detail_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Detail bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_detail_bottom_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Detail sidebar section on left side', 'geodirectory'),

-        'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),

-        'id' => 'geodir_detail_sidebar_left_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable GD modal', 'geodirectory'),

-        'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),

-        'id' => 'geodir_disable_gb_modal',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),

-        'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_tfg_buttons_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable share this button section', 'geodirectory'),

-        'desc' => __('Disable share this button section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_sharethis_button_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Google Analytics section', 'geodirectory'),

-        'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_google_analytics_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable User Links section', 'geodirectory'),

-        'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_user_links_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Rating Info section', 'geodirectory'),

-        'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_rating_info_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Listing Info section', 'geodirectory'),

-        'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_listing_info_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Detail bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_detail_bottom_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

+	array(

+		'name' => __('Detail sidebar section on left side', 'geodirectory'),

+		'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),

+		'id' => 'geodir_detail_sidebar_left_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable GD modal', 'geodirectory'),

+		'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),

+		'id' => 'geodir_disable_gb_modal',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),

+		'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_tfg_buttons_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable share this button section', 'geodirectory'),

+		'desc' => __('Disable share this button section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_sharethis_button_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Google Analytics section', 'geodirectory'),

+		'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_google_analytics_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable User Links section', 'geodirectory'),

+		'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_user_links_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Rating Info section', 'geodirectory'),

+		'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_rating_info_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Listing Info section', 'geodirectory'),

+		'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_listing_info_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'detail_page_settings'),

+	array('type' => 'sectionend', 'id' => 'detail_page_settings'),

 

 

-    /* ---------- DETAIL PAGE TAB SETTING START*/

+	/* ---------- DETAIL PAGE TAB SETTING START*/

 

-    array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),

+	array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),

 

-    array(

-        'name' => __('Exclude selected tabs from detail page', 'geodirectory'),

-        'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_detail_page_tabs_excluded',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select tabs', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_detail_page_tabs_key_value_array())

-    ),

+	array(

+		'name' => __('Exclude selected tabs from detail page', 'geodirectory'),

+		'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_detail_page_tabs_excluded',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select tabs', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_detail_page_tabs_key_value_array())

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

-    /* ---------- DETAIL PAGE TAB SETTING END*/

+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

+	/* ---------- DETAIL PAGE TAB SETTING END*/

 

-    /* START DEFAULT STAR IMAGE*/

-    array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),

+	/* START DEFAULT STAR IMAGE*/

+	array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),

 

-    array(

-        'name' => __('Upload default rating star icon', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_default_rating_star_icon',

-        'type' => 'file',

-        'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload default rating star icon', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_default_rating_star_icon',

+		'type' => 'file',

+		'std' => '0',

+		'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

+	),

 	array(

 		'name' => __('Enable Font Awesome', 'geodirectory'),

 		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

@@ -592,368 +592,368 @@ 
 		'std' => '#757575'

 	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

 

-    /* END DEFAULT STAR IMAGE*/

+	/* END DEFAULT STAR IMAGE*/

 

-    /* Detail related post settings start */

+	/* Detail related post settings start */

 

-    array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),

+	array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),

 

-    array(

-        'name' => __('Show related post listing on', 'geodirectory'),

-        'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_add_related_listing_posttypes',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show related post listing on', 'geodirectory'),

+		'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_add_related_listing_posttypes',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Relate to', 'geodirectory'),

-        'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),

-        'id' => 'geodir_related_post_relate_to',

-        'css' => 'min-width:300px;',

-        'std' => 'category',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'category' => __('Categories', 'geodirectory'),

-            'tags' => __('Tags', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Relate to', 'geodirectory'),

+		'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),

+		'id' => 'geodir_related_post_relate_to',

+		'css' => 'min-width:300px;',

+		'std' => 'category',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'category' => __('Categories', 'geodirectory'),

+			'tags' => __('Tags', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Layout', 'geodirectory'),

-        'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),

-        'id' => 'geodir_related_post_listing_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Layout', 'geodirectory'),

+		'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),

+		'id' => 'geodir_related_post_listing_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Sort by', 'geodirectory'),

-        'desc' => __('Set the related post listing sort by view', 'geodirectory'),

-        'id' => 'geodir_related_post_sortby',

-        'css' => 'min-width:300px;',

-        'std' => 'latest',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'latest' => __('Latest', 'geodirectory'),

-            'featured' => __('Featured', 'geodirectory'),

-            'high_review' => __('Review', 'geodirectory'),

-            'high_rating' => __('Rating', 'geodirectory'),

-            'random' => __('Random', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Sort by', 'geodirectory'),

+		'desc' => __('Set the related post listing sort by view', 'geodirectory'),

+		'id' => 'geodir_related_post_sortby',

+		'css' => 'min-width:300px;',

+		'std' => 'latest',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'latest' => __('Latest', 'geodirectory'),

+			'featured' => __('Featured', 'geodirectory'),

+			'high_review' => __('Review', 'geodirectory'),

+			'high_rating' => __('Rating', 'geodirectory'),

+			'random' => __('Random', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Number of posts:', 'geodirectory'),

-        'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),

-        'id' => 'geodir_related_post_count',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '5' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Number of posts:', 'geodirectory'),

+		'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),

+		'id' => 'geodir_related_post_count',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '5' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Post excerpt', 'geodirectory'),

-        'desc' => __('Post content excerpt character count', 'geodirectory'),

-        'id' => 'geodir_related_post_excerpt',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '20' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Post excerpt', 'geodirectory'),

+		'desc' => __('Post content excerpt character count', 'geodirectory'),

+		'id' => 'geodir_related_post_excerpt',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '20' // Default value to show home top section

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),

-    /* Detail Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),

+	/* Detail Layout Settings end */

 

-    /* Author Layout Settings Start */

+	/* Author Layout Settings Start */

 

-    array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),

+	array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),

 

 

-    array('name' => __('Author Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_author_layout'),

+	array('name' => __('Author Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_author_layout'),

 

-    array(

-        'name' => __('Author top section', 'geodirectory'),

-        'desc' => __('Show the top section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author top section', 'geodirectory'),

+		'desc' => __('Show the top section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author right section', 'geodirectory'),

-        'desc' => __('Show the right section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author right section', 'geodirectory'),

+		'desc' => __('Show the right section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of author right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of author page', 'geodirectory'),

-        'id' => 'geodir_author_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Author content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of author page', 'geodirectory'),

+		'id' => 'geodir_author_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of author content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author left section', 'geodirectory'),

-        'desc' => __('Show the left section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author left section', 'geodirectory'),

+		'desc' => __('Show the left section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of author left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Description word limit', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_author_desc_word_limit',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '50' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Description word limit', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_author_desc_word_limit',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '50' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_author_layout'),

-    /* Author Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'geodir_author_layout'),

+	/* Author Layout Settings end */

 

 

-    /* Post Type Navigation Settings Start */

-    array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),

+	/* Post Type Navigation Settings Start */

+	array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),

 

 

-    /* Post Type Navigation Settings Start */

+	/* Post Type Navigation Settings Start */

 

-    array('name' => __('Navigation Locations', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_navigation_locations'),

+	array('name' => __('Navigation Locations', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_navigation_locations'),

 

-    array(

-        'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_theme_location_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select menu locations', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_theme_location_setting_fun())

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

-

-

-    array('name' => __('Navigation Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_navigation_options'),

+	array(

+		'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_theme_location_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select menu locations', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_theme_location_setting_fun())

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

 

 

-    array(

-        'name' => __('Show add listing navigation in menu', 'geodirectory'),

-        'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),

-        'id' => 'geodir_show_addlisting_nav',

-        'std' => '1',

-        'type' => 'checkbox'

-    ),

+	array('name' => __('Navigation Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_navigation_options'),

 

-    array(

-        'name' => __('Show listings navigation in menu', 'geodirectory'),

-        'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),

-        'id' => 'geodir_show_listing_nav',

-        'std' => '1',

-        'type' => 'checkbox'

-    ),

 

-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

+	array(

+		'name' => __('Show add listing navigation in menu', 'geodirectory'),

+		'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),

+		'id' => 'geodir_show_addlisting_nav',

+		'std' => '1',

+		'type' => 'checkbox'

+	),

 

+	array(

+		'name' => __('Show listings navigation in menu', 'geodirectory'),

+		'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),

+		'id' => 'geodir_show_listing_nav',

+		'std' => '1',

+		'type' => 'checkbox'

+	),

 

-    array('name' => __('Post Type Navigation Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_post_type_navigation_layout'),

-    array(

-        'name' => __('Show listing link in main navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_posttype_in_main_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

 

-    array(

-        'name' => __('Show listing link in listing navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_posttype_in_listing_nav',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

 

-    array(

-        'name' => __('Allow post type to add from frontend', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_allow_posttype_frontend',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('name' => __('Post Type Navigation Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_post_type_navigation_layout'),

+	array(

+		'name' => __('Show listing link in main navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_posttype_in_main_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Show add listing link in main navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_main_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show listing link in listing navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_posttype_in_listing_nav',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Show add listing link in add listing navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_add_listing_nav',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Allow post type to add from frontend', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_allow_posttype_frontend',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),

+	array(

+		'name' => __('Show add listing link in main navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_main_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

+	array(

+		'name' => __('Show add listing link in add listing navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_add_listing_nav',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),

+	array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),

 

 

-    array(

-        'name' => __('Show add listing link in user dashboard', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),

 

-    array(

-        'name' => __('Show favorite link in user dashboard', 'geodirectory'),

-        'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_favorite_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

 

-    array(

-        'name' => __('Show listing link in user dashboard', 'geodirectory'),

-        'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_listing_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),

-    /* Post Type Navigation Settings End */

-

-    /* Script Settings Start */

-    array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),

-

-    /*

+	array(

+		'name' => __('Show add listing link in user dashboard', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array(

+		'name' => __('Show favorite link in user dashboard', 'geodirectory'),

+		'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_favorite_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array(

+		'name' => __('Show listing link in user dashboard', 'geodirectory'),

+		'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_listing_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),

+	/* Post Type Navigation Settings End */

+

+	/* Script Settings Start */

+	array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),

+

+	/*

     array( 	'name' => __( 'Add/Remove Scripts', 'geodirectory' ),

                 'type' => 'sectionstart',

                 'desc' => '',

@@ -979,150 +979,150 @@ 
 

     */

 

-    array('name' => __('SCSS Settings (CSS combine and minify)', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_scss_settings'),

+	array('name' => __('SCSS Settings (CSS combine and minify)', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_scss_settings'),

 

-    array(

-        'name' => __('Disable Core SCSS', 'geodirectory'),

-        'desc' => __('Stops the CSS files being minified and output as one.', 'geodirectory'),

-        'id' => 'geodir_scss_core',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Disable Core SCSS', 'geodirectory'),

+		'desc' => __('Stops the CSS files being minified and output as one.', 'geodirectory'),

+		'id' => 'geodir_scss_core',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_scss_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_scss_settings'),

 

-    array('name' => __('Script Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_script_settings'),

+	array('name' => __('Script Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_script_settings'),

 

-    array(

-        'name' => __('Custom style css code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_coustem_css',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Custom style css code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_coustem_css',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Header script code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_header_scripts',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Header script code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_header_scripts',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Footer script code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_footer_scripts',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Footer script code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_footer_scripts',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_script_settings'),

-    /* Script Settings End */

+	array('type' => 'sectionend', 'id' => 'geodir_script_settings'),

+	/* Script Settings End */

 

-    /* Map Settings Start */

-    array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),

+	/* Map Settings Start */

+	array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),

 

-    /* Untick the category by default on home map */

-    array(

-        'name' => __('Home Map Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_map_section'

-    ),

-    array(

-        'name' => __('Select category to untick by default on map', 'geodirectory'),

-        'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_home_map_untick',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select category', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => geodir_home_map_cats_key_value_array()

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_home_map_section'

-    ),

+	/* Untick the category by default on home map */

+	array(

+		'name' => __('Home Map Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_map_section'

+	),

+	array(

+		'name' => __('Select category to untick by default on map', 'geodirectory'),

+		'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_home_map_untick',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select category', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => geodir_home_map_cats_key_value_array()

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_home_map_section'

+	),

 

-    array(

-        'name' => __('Add Listing Map Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_add_listing_map_section'

-    ),

-    array(

-        'name' => __('Disable mouse scroll', 'geodirectory'),

-        'desc' => __('Stops the mouse scroll zooming the map', 'geodirectory'),

-        'id' => 'geodir_add_listing_mouse_scroll',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_add_listing_map_section'

-    ),

+	array(

+		'name' => __('Add Listing Map Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_add_listing_map_section'

+	),

+	array(

+		'name' => __('Disable mouse scroll', 'geodirectory'),

+		'desc' => __('Stops the mouse scroll zooming the map', 'geodirectory'),

+		'id' => 'geodir_add_listing_mouse_scroll',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_add_listing_map_section'

+	),

 

 

-    array('name' => __('Default map settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_map_default_settings'),

+	array('name' => __('Default map settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_map_default_settings'),

 

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'map_default_settings',

-        'type' => 'map_default_settings',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'map_default_settings',

+		'type' => 'map_default_settings',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Upload map default marker icon', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_default_marker_icon',

-        'type' => 'file',

-        'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

-    ),

-    // add option that allows enable/disable map dragging to phone devices

-    array(

-        'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),

-        'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),

-        'id' => 'geodir_map_onoff_dragging',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload map default marker icon', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_default_marker_icon',

+		'type' => 'file',

+		'std' => '0',

+		'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

+	),

+	// add option that allows enable/disable map dragging to phone devices

+	array(

+		'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),

+		'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),

+		'id' => 'geodir_map_onoff_dragging',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),

 

-    array('name' => __('Show / hide post type and category on map', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_map_settings'),

+	array('name' => __('Show / hide post type and category on map', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_map_settings'),

 

-    array(

-        'name' => __('Select Map Category', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_map_settings',

-        'type' => 'map',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_map_settings'),

-    /* Map Settings End */

+	array(

+		'name' => __('Select Map Category', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_map_settings',

+		'type' => 'map',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array('type' => 'sectionend', 'id' => 'geodir_map_settings'),

+	/* Map Settings End */

 

 )); // End Design settings

geodirectory-admin/option-pages/general_settings_array.php

Indentation +252 added lines, -252 removed lines

@@ -16,30 +16,30 @@ 
  */

 $general_options = apply_filters('geodir_general_options', array(

 

-    array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

-

-    array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

-

-    array(

-        'name' => __('Sender name', 'geodirectory'),

-        'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

-        'id' => 'site_email_name',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => get_bloginfo('name') // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Email address', 'geodirectory'),

-        'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

-        'id' => 'site_email',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

-    ),

-

-

-    /*array(

+	array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

+

+	array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

+

+	array(

+		'name' => __('Sender name', 'geodirectory'),

+		'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

+		'id' => 'site_email_name',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => get_bloginfo('name') // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Email address', 'geodirectory'),

+		'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

+		'id' => 'site_email',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

+	),

+

+

+	/*array(

         'name' => __( 'Display Category', 'geodirectory' ),

         'desc' 		=> __( 'Allow users to select category at add listing page', 'geodirectory' ),

         'tip' 		=> '',

@@ -58,69 +58,69 @@ 
 

 

     */

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_allow_cpass',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_allow_cpass',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Disable rating on comments', 'geodirectory'),

-        'desc' => __('Disable rating without disabling comments on listings', 'geodirectory'),

-        'id' => 'geodir_disable_rating',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('User deleted posts go to trash', 'geodirectory'),

-        'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

-        'id' => 'geodir_disable_perm_delete',

-        'type' => 'checkbox',

-        'std' => '1'

-    ),

-    array(

-        'name' => __('Maxi upload file size(in mb)', 'geodirectory'),

-        'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2 )', 'geodirectory'),

-        'id' => 'geodir_upload_max_filesize',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '2'

-    ),

-

-

-

-    array('type' => 'sectionend', 'id' => 'general_options'),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_allow_cpass',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_allow_cpass',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Disable rating on comments', 'geodirectory'),

+		'desc' => __('Disable rating without disabling comments on listings', 'geodirectory'),

+		'id' => 'geodir_disable_rating',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('User deleted posts go to trash', 'geodirectory'),

+		'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

+		'id' => 'geodir_disable_perm_delete',

+		'type' => 'checkbox',

+		'std' => '1'

+	),

+	array(

+		'name' => __('Maxi upload file size(in mb)', 'geodirectory'),

+		'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2 )', 'geodirectory'),

+		'id' => 'geodir_upload_max_filesize',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '2'

+	),

+

+

+

+	array('type' => 'sectionend', 'id' => 'general_options'),

 

 ));/* General Options End*/

 

@@ -132,82 +132,82 @@ 
  */

 $google_analytic_settings = apply_filters('geodir_google_analytic_settings', array(

 

-    array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

-

-    array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

-

-

-

-    array(

-        'name' => __('Show business owner google analytics stats?', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_ga_stats',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_ga_stats',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Google analytics "Profile ID(ie: ga:12345678)?', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

-        'desc' => '',

-        'id' => 'geodir_ga_id',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Client ID', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

-        'desc' => '',

-        'id' => 'geodir_ga_client_id',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Client secret', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

-        'desc' => '',

-        'id' => 'geodir_ga_client_secret',

-        'type' => 'password',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Google analytics access', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_ga_token',

-        'type' => 'google_analytics',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-

-    array(

-        'name' => __('Google analytics tracking code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_ga_tracking_code',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'google_analytic_settings'),

+	array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

+

+	array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

+

+

+

+	array(

+		'name' => __('Show business owner google analytics stats?', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_ga_stats',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_ga_stats',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Google analytics "Profile ID(ie: ga:12345678)?', 'geodirectory') . ' ' .

+			'<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+		'desc' => '',

+		'id' => 'geodir_ga_id',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Client ID', 'geodirectory') . ' ' .

+			'<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+		'desc' => '',

+		'id' => 'geodir_ga_client_id',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Client secret', 'geodirectory') . ' ' .

+			'<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+		'desc' => '',

+		'id' => 'geodir_ga_client_secret',

+		'type' => 'password',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Google analytics access', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_ga_token',

+		'type' => 'google_analytics',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+

+	array(

+		'name' => __('Google analytics tracking code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_ga_tracking_code',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'google_analytic_settings'),

 

 )); // google_analytic_settings End

 

@@ -219,84 +219,84 @@ 
  */

 $search_settings = apply_filters('geodir_search_settings', array(

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

-

-    array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

-

-    array(

-        'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

-        'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

-        'id' => 'geodir_search_dist',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '40' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

-        'desc' => __('Miles', 'geodirectory'),

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'miles',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

-        'desc' => __('Kilometers', 'geodirectory'),

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'km',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

-        'desc' => __('Meters', 'geodirectory'),

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'meters',

-        'radiogroup' => 'start'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

-        'desc' => __('Feet', 'geodirectory'),

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'feet',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

-        'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

-        'id' => 'geodir_search_near_addition',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => ''

-    ),

-    array(

-        'name' => __('Individual word search limit', 'geodirectory'),

-        'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

-        'id' => 'geodir_search_word_limit',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            '0' => __('Disabled', 'geodirectory'),

-            '1' => __('1 Character words excluded', 'geodirectory'),

-            '2' => __('2 Character words and less excluded', 'geodirectory'),

-            '3' => __('3 Character words and less excluded', 'geodirectory'),

-        ))

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'search_settings'),

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

+

+	array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

+

+	array(

+		'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

+		'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

+		'id' => 'geodir_search_dist',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '40' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

+		'desc' => __('Miles', 'geodirectory'),

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'miles',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

+		'desc' => __('Kilometers', 'geodirectory'),

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'km',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

+		'desc' => __('Meters', 'geodirectory'),

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'meters',

+		'radiogroup' => 'start'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

+		'desc' => __('Feet', 'geodirectory'),

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'feet',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

+		'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

+		'id' => 'geodir_search_near_addition',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => ''

+	),

+	array(

+		'name' => __('Individual word search limit', 'geodirectory'),

+		'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

+		'id' => 'geodir_search_word_limit',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'0' => __('Disabled', 'geodirectory'),

+			'1' => __('1 Character words excluded', 'geodirectory'),

+			'2' => __('2 Character words and less excluded', 'geodirectory'),

+			'3' => __('3 Character words and less excluded', 'geodirectory'),

+		))

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'search_settings'),

 

 )); //search_settings End

 

@@ -308,17 +308,17 @@ 
  */

 $dummy_data_settings = apply_filters('geodir_dummy_data_settings', array(

 

-    array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

-

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_dummy_data_installer',

-        'type' => 'dummy_installer',

-        'css' => 'min-width:300px;',

-        'std' => '40' // Default value for the page title - changed in settings

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_dummy_data_settings'),

+	array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

+

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_dummy_data_installer',

+		'type' => 'dummy_installer',

+		'css' => 'min-width:300px;',

+		'std' => '40' // Default value for the page title - changed in settings

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_dummy_data_settings'),

 

 )); //dummy_data_settings End