GeoDirectory / geodirectory

tests/test-Install_uninstall.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	function drop_tables() {
 		global $wpdb, $plugin_prefix;
 		//build our query to delete our custom table
-		$sql = "DROP TABLE IF EXISTS " . GEODIR_COUNTRIES_TABLE . ", " . GEODIR_ICON_TABLE . ", " . GEODIR_CUSTOM_FIELDS_TABLE . ", " . $plugin_prefix . "gd_place_detail, " . GEODIR_ATTACHMENT_TABLE . ", " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . ", " . GEODIR_REVIEW_TABLE . ";";
+		$sql = "DROP TABLE IF EXISTS ".GEODIR_COUNTRIES_TABLE.", ".GEODIR_ICON_TABLE.", ".GEODIR_CUSTOM_FIELDS_TABLE.", ".$plugin_prefix."gd_place_detail, ".GEODIR_ATTACHMENT_TABLE.", ".GEODIR_CUSTOM_SORT_FIELDS_TABLE.", ".GEODIR_REVIEW_TABLE.";";
 
 		//execute the query deleting the table
 		$wpdb->query($sql);

tests/test-Misc.php

Indentation +67 added lines, -67 removed lines

@@ -1,102 +1,102 @@
 <?php
 class MiscTests extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testOptionDesignSettings() {
+	public function testOptionDesignSettings() {
 
-        geodir_post_type_setting_fun();
-        global $geodir_settings;
+		geodir_post_type_setting_fun();
+		global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/design_settings_array.php';
-        include_once($template);
+		$template = geodir_plugin_path() . '/geodirectory-admin/option-pages/design_settings_array.php';
+		include_once($template);
 
-        $output = $geodir_settings['design_settings'];
+		$output = $geodir_settings['design_settings'];
 
-        $this->assertContains('Home Top Section Settings', $output[1]['name']);
-    }
+		$this->assertContains('Home Top Section Settings', $output[1]['name']);
+	}
 
-    public function testOptionGeneralSettings() {
+	public function testOptionGeneralSettings() {
 
-        geodir_post_type_setting_fun();
-        global $geodir_settings;
+		geodir_post_type_setting_fun();
+		global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/general_settings_array.php';
-        include_once($template);
+		$template = geodir_plugin_path() . '/geodirectory-admin/option-pages/general_settings_array.php';
+		include_once($template);
 
-        $output = $geodir_settings['general_settings'];
+		$output = $geodir_settings['general_settings'];
 
-        $this->assertContains('General', $output[0]['name']);
-    }
+		$this->assertContains('General', $output[0]['name']);
+	}
 
-    public function testOptionNotiSettings() {
+	public function testOptionNotiSettings() {
 
-        geodir_post_type_setting_fun();
-        global $geodir_settings;
+		geodir_post_type_setting_fun();
+		global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/notifications_settings_array.php';
-        include_once($template);
+		$template = geodir_plugin_path() . '/geodirectory-admin/option-pages/notifications_settings_array.php';
+		include_once($template);
 
-        $output = $geodir_settings['notifications_settings'];
+		$output = $geodir_settings['notifications_settings'];
 
-        $this->assertContains('Options', $output[0]['name']);
-    }
+		$this->assertContains('Options', $output[0]['name']);
+	}
 
-    public function testOptionPermalinkSettings() {
+	public function testOptionPermalinkSettings() {
 
-        geodir_post_type_setting_fun();
-        global $geodir_settings;
+		geodir_post_type_setting_fun();
+		global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/permalink_settings_array.php';
-        include_once($template);
+		$template = geodir_plugin_path() . '/geodirectory-admin/option-pages/permalink_settings_array.php';
+		include_once($template);
 
-        $output = $geodir_settings['permalink_settings'];
+		$output = $geodir_settings['permalink_settings'];
 
-        $this->assertContains('Permalink', $output[0]['name']);
-    }
+		$this->assertContains('Permalink', $output[0]['name']);
+	}
 
-    public function testOptionMetaSettings() {
+	public function testOptionMetaSettings() {
 
-        geodir_post_type_setting_fun();
-        global $geodir_settings;
+		geodir_post_type_setting_fun();
+		global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/title_meta_settings_array.php';
-        include_once($template);
+		$template = geodir_plugin_path() . '/geodirectory-admin/option-pages/title_meta_settings_array.php';
+		include_once($template);
 
-        $output = $geodir_settings['title_meta_settings'];
+		$output = $geodir_settings['title_meta_settings'];
 
-        $this->assertContains('Title / Meta', $output[0]['name']);
-    }
+		$this->assertContains('Title / Meta', $output[0]['name']);
+	}
 
-    public function testDiagnose() {
-        ob_start();
-        geodir_diagnose_default_pages();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains( 'GD Home page exists with proper setting', $output );
-        $this->assertContains( 'Add Listing page exists with proper setting', $output );
-        $this->assertContains( 'Listing Preview page exists with proper setting', $output );
-        $this->assertContains( 'Listing Success page exists with proper setting', $output );
-        $this->assertContains( 'Info page exists with proper setting', $output );
-        $this->assertContains( 'Login page exists with proper setting', $output );
-        $this->assertContains( 'Location page exists with proper setting', $output );
+	public function testDiagnose() {
+		ob_start();
+		geodir_diagnose_default_pages();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains( 'GD Home page exists with proper setting', $output );
+		$this->assertContains( 'Add Listing page exists with proper setting', $output );
+		$this->assertContains( 'Listing Preview page exists with proper setting', $output );
+		$this->assertContains( 'Listing Success page exists with proper setting', $output );
+		$this->assertContains( 'Info page exists with proper setting', $output );
+		$this->assertContains( 'Login page exists with proper setting', $output );
+		$this->assertContains( 'Location page exists with proper setting', $output );
 
-        ob_start();
-        geodir_diagnose_load_db_language();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains( 'ul', $output );
+		ob_start();
+		geodir_diagnose_load_db_language();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains( 'ul', $output );
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 
 }
 ?>
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
         geodir_post_type_setting_fun();
         global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/design_settings_array.php';
+        $template = geodir_plugin_path().'/geodirectory-admin/option-pages/design_settings_array.php';
         include_once($template);
 
         $output = $geodir_settings['design_settings'];
@@ -25,7 +25,7 @@ 
         geodir_post_type_setting_fun();
         global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/general_settings_array.php';
+        $template = geodir_plugin_path().'/geodirectory-admin/option-pages/general_settings_array.php';
         include_once($template);
 
         $output = $geodir_settings['general_settings'];
@@ -38,7 +38,7 @@ 
         geodir_post_type_setting_fun();
         global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/notifications_settings_array.php';
+        $template = geodir_plugin_path().'/geodirectory-admin/option-pages/notifications_settings_array.php';
         include_once($template);
 
         $output = $geodir_settings['notifications_settings'];
@@ -51,7 +51,7 @@ 
         geodir_post_type_setting_fun();
         global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/permalink_settings_array.php';
+        $template = geodir_plugin_path().'/geodirectory-admin/option-pages/permalink_settings_array.php';
         include_once($template);
 
         $output = $geodir_settings['permalink_settings'];
@@ -64,7 +64,7 @@ 
         geodir_post_type_setting_fun();
         global $geodir_settings;
 
-        $template = geodir_plugin_path() . '/geodirectory-admin/option-pages/title_meta_settings_array.php';
+        $template = geodir_plugin_path().'/geodirectory-admin/option-pages/title_meta_settings_array.php';
         include_once($template);
 
         $output = $geodir_settings['title_meta_settings'];
@@ -77,19 +77,19 @@ 
         geodir_diagnose_default_pages();
         $output = ob_get_contents();
         ob_end_clean();
-        $this->assertContains( 'GD Home page exists with proper setting', $output );
-        $this->assertContains( 'Add Listing page exists with proper setting', $output );
-        $this->assertContains( 'Listing Preview page exists with proper setting', $output );
-        $this->assertContains( 'Listing Success page exists with proper setting', $output );
-        $this->assertContains( 'Info page exists with proper setting', $output );
-        $this->assertContains( 'Login page exists with proper setting', $output );
-        $this->assertContains( 'Location page exists with proper setting', $output );
+        $this->assertContains('GD Home page exists with proper setting', $output);
+        $this->assertContains('Add Listing page exists with proper setting', $output);
+        $this->assertContains('Listing Preview page exists with proper setting', $output);
+        $this->assertContains('Listing Success page exists with proper setting', $output);
+        $this->assertContains('Info page exists with proper setting', $output);
+        $this->assertContains('Login page exists with proper setting', $output);
+        $this->assertContains('Location page exists with proper setting', $output);
 
         ob_start();
         geodir_diagnose_load_db_language();
         $output = ob_get_contents();
         ob_end_clean();
-        $this->assertContains( 'ul', $output );
+        $this->assertContains('ul', $output);
 
     }
 

tests/test-Admin.php

Indentation +65 added lines, -65 removed lines

@@ -1,75 +1,75 @@
 <?php
 class AdminTests extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testAdminPanel()
-    {
+	public function testAdminPanel()
+	{
 
-        $_POST = array(
-            'geodir_wrapper_open_id' => '',
-            'geodir_wrapper_open_class' => 'main-container clearfix',
-            'geodir_wrapper_open_replace' => '',
-            'geodir_wrapper_close_replace' => '',
-            'geodir_wrapper_content_open_id' => '',
-            'geodir_wrapper_content_open_class' => '',
-            'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',
-            'geodir_wrapper_content_close_replace' => '</div></div></div>',
-            'geodir_article_open_id' => '',
-            'geodir_article_open_class' => '',
-            'geodir_article_open_replace' => '',
-            'geodir_article_close_replace' => '',
-            'geodir_sidebar_right_open_id' => '',
-            'geodir_sidebar_right_open_class' => '',
-            'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
-            'geodir_sidebar_right_close_replace' => '',
-            'geodir_sidebar_left_open_id' => '',
-            'geodir_sidebar_left_open_class' => '',
-            'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
-            'geodir_sidebar_left_close_replace' => '',
-            'geodir_main_content_open_id' => '',
-            'geodir_main_content_open_class' => '',
-            'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',
-            'geodir_main_content_close_replace' => '</div>',
-            'geodir_top_content_add' => '',
-            'geodir_before_main_content_add' => '',
-            'geodir_full_page_class_filter' => 'section full-width-section',
-            'geodir_before_widget_filter' => '',
-            'geodir_after_widget_filter' => '',
-            'geodir_before_title_filter' => '<div class="widget-title"><h2>',
-            'geodir_after_title_filter' => '</h2></div>',
-            'geodir_menu_li_class_filter' => '',
-            'geodir_sub_menu_ul_class_filter' => '',
-            'geodir_sub_menu_li_class_filter' => '',
-            'geodir_menu_a_class_filter' => '',
-            'geodir_sub_menu_a_class_filter' => '',
-            'geodir_location_switcher_menu_li_class_filter' => '',
-            'geodir_location_switcher_menu_a_class_filter' => '',
-            'geodir_location_switcher_menu_sub_ul_class_filter' => '',
-            'geodir_location_switcher_menu_sub_li_class_filter' => '',
-            'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),
-            'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',
-            'geodir_theme_compat_default_options' => '',
-            'geodir_theme_compat_code' => 'Multi_News',
-            'gd_theme_compat' => 'Twenty_Fifteen_custom'
-        );
-        geodir_update_options_compatibility_settings();
+		$_POST = array(
+			'geodir_wrapper_open_id' => '',
+			'geodir_wrapper_open_class' => 'main-container clearfix',
+			'geodir_wrapper_open_replace' => '',
+			'geodir_wrapper_close_replace' => '',
+			'geodir_wrapper_content_open_id' => '',
+			'geodir_wrapper_content_open_class' => '',
+			'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',
+			'geodir_wrapper_content_close_replace' => '</div></div></div>',
+			'geodir_article_open_id' => '',
+			'geodir_article_open_class' => '',
+			'geodir_article_open_replace' => '',
+			'geodir_article_close_replace' => '',
+			'geodir_sidebar_right_open_id' => '',
+			'geodir_sidebar_right_open_class' => '',
+			'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
+			'geodir_sidebar_right_close_replace' => '',
+			'geodir_sidebar_left_open_id' => '',
+			'geodir_sidebar_left_open_class' => '',
+			'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
+			'geodir_sidebar_left_close_replace' => '',
+			'geodir_main_content_open_id' => '',
+			'geodir_main_content_open_class' => '',
+			'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',
+			'geodir_main_content_close_replace' => '</div>',
+			'geodir_top_content_add' => '',
+			'geodir_before_main_content_add' => '',
+			'geodir_full_page_class_filter' => 'section full-width-section',
+			'geodir_before_widget_filter' => '',
+			'geodir_after_widget_filter' => '',
+			'geodir_before_title_filter' => '<div class="widget-title"><h2>',
+			'geodir_after_title_filter' => '</h2></div>',
+			'geodir_menu_li_class_filter' => '',
+			'geodir_sub_menu_ul_class_filter' => '',
+			'geodir_sub_menu_li_class_filter' => '',
+			'geodir_menu_a_class_filter' => '',
+			'geodir_sub_menu_a_class_filter' => '',
+			'geodir_location_switcher_menu_li_class_filter' => '',
+			'geodir_location_switcher_menu_a_class_filter' => '',
+			'geodir_location_switcher_menu_sub_ul_class_filter' => '',
+			'geodir_location_switcher_menu_sub_li_class_filter' => '',
+			'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),
+			'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',
+			'geodir_theme_compat_default_options' => '',
+			'geodir_theme_compat_code' => 'Multi_News',
+			'gd_theme_compat' => 'Twenty_Fifteen_custom'
+		);
+		geodir_update_options_compatibility_settings();
 
-        ob_start();
-        geodir_admin_panel();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains( 'gd-wrapper-main', $output );
+		ob_start();
+		geodir_admin_panel();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains( 'gd-wrapper-main', $output );
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         geodir_admin_panel();
         $output = ob_get_contents();
         ob_end_clean();
-        $this->assertContains( 'gd-wrapper-main', $output );
+        $this->assertContains('gd-wrapper-main', $output);
 
     }
 

tests/test-Register.php

Indentation +87 added lines, -87 removed lines

@@ -1,102 +1,102 @@
 <?php
 class Register extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(0);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(0);
+	}
 
-    public function test_register_empty_username() {
-        $errors = geodir_register_new_user(
-            '',
-            'hello@hi.com'
-        );
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_username', $errors["errors"] );
-        $this->assertContains( 'Please enter a username', $errors["errors"]["empty_username"][0] );
-    }
+	public function test_register_empty_username() {
+		$errors = geodir_register_new_user(
+			'',
+			'hello@hi.com'
+		);
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_username', $errors["errors"] );
+		$this->assertContains( 'Please enter a username', $errors["errors"]["empty_username"][0] );
+	}
 
-    public function test_register_invalid_username() {
-        $errors = geodir_register_new_user(
-            '@#$%^',
-            'hello@hi.com'
-        );
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'This username is invalid', $errors["errors"]["invalid_username"][0] );
-    }
+	public function test_register_invalid_username() {
+		$errors = geodir_register_new_user(
+			'@#$%^',
+			'hello@hi.com'
+		);
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
+		$this->assertContains( 'This username is invalid', $errors["errors"]["invalid_username"][0] );
+	}
 
-    public function test_register_invalid_email() {
-        $errors = geodir_register_new_user(
-            'hello',
-            'hello@@hi.com'
-        );
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
-        $this->assertContains( 'The email address isn&#8217;t correct', $errors["errors"]["invalid_email"][0] );
-    }
+	public function test_register_invalid_email() {
+		$errors = geodir_register_new_user(
+			'hello',
+			'hello@@hi.com'
+		);
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
+		$this->assertContains( 'The email address isn&#8217;t correct', $errors["errors"]["invalid_email"][0] );
+	}
 
-    public function test_register_empty_email() {
-        $errors = geodir_register_new_user(
-            'hello',
-            ''
-        );
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_email', $errors["errors"] );
-        $this->assertContains( 'Please type your e-mail address', $errors["errors"]["empty_email"][0] );
-    }
+	public function test_register_empty_email() {
+		$errors = geodir_register_new_user(
+			'hello',
+			''
+		);
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_email', $errors["errors"] );
+		$this->assertContains( 'Please type your e-mail address', $errors["errors"]["empty_email"][0] );
+	}
 
-    public function test_register_invalid_password() {
-        update_option('geodir_allow_cpass', 1);
-        $_REQUEST['user_pass'] = '12345';
-        $_REQUEST['user_pass2'] = '1234';
-        $_POST['user_fname'] = 'Test User';
-        $errors = geodir_register_new_user(
-            'hello',
-            'hello@hi.com'
-        );
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'pass_match', $errors["errors"] );
-        $this->assertContains( 'Passwords do not match', $errors["errors"]["pass_match"][0] );
+	public function test_register_invalid_password() {
+		update_option('geodir_allow_cpass', 1);
+		$_REQUEST['user_pass'] = '12345';
+		$_REQUEST['user_pass2'] = '1234';
+		$_POST['user_fname'] = 'Test User';
+		$errors = geodir_register_new_user(
+			'hello',
+			'hello@hi.com'
+		);
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'pass_match', $errors["errors"] );
+		$this->assertContains( 'Passwords do not match', $errors["errors"]["pass_match"][0] );
 
-        $_REQUEST['user_pass'] = '12345';
-        $_REQUEST['user_pass2'] = '12345';
-        $errors = geodir_register_new_user(
-            'hello',
-            'hello@hi.com'
-        );
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'pass_match', $errors["errors"] );
-        $this->assertContains( 'Password must be 7 characters or more', $errors["errors"]["pass_match"][0] );
-    }
+		$_REQUEST['user_pass'] = '12345';
+		$_REQUEST['user_pass2'] = '12345';
+		$errors = geodir_register_new_user(
+			'hello',
+			'hello@hi.com'
+		);
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'pass_match', $errors["errors"] );
+		$this->assertContains( 'Password must be 7 characters or more', $errors["errors"]["pass_match"][0] );
+	}
 
-    public function test_register_success() {
-        $_POST['user_fname'] = 'Test User';
-        $data = geodir_register_new_user(
-            'hello',
-            'hello@hi.com'
-        );
-        $this->assertInternalType("int", $data[0]);
-    }
+	public function test_register_success() {
+		$_POST['user_fname'] = 'Test User';
+		$data = geodir_register_new_user(
+			'hello',
+			'hello@hi.com'
+		);
+		$this->assertInternalType("int", $data[0]);
+	}
 
-    public function testResetPassword()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
-    }
+	public function testResetPassword()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_password', $errors["errors"] );
+		$this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 
 }
 ?>
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -13,8 +13,8 @@ 
             'hello@hi.com'
         );
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_username', $errors["errors"] );
-        $this->assertContains( 'Please enter a username', $errors["errors"]["empty_username"][0] );
+        $this->assertArrayHasKey('empty_username', $errors["errors"]);
+        $this->assertContains('Please enter a username', $errors["errors"]["empty_username"][0]);
     }
 
     public function test_register_invalid_username() {
@@ -23,8 +23,8 @@ 
             'hello@hi.com'
         );
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'This username is invalid', $errors["errors"]["invalid_username"][0] );
+        $this->assertArrayHasKey('invalid_username', $errors["errors"]);
+        $this->assertContains('This username is invalid', $errors["errors"]["invalid_username"][0]);
     }
 
     public function test_register_invalid_email() {
@@ -33,8 +33,8 @@ 
             'hello@@hi.com'
         );
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
-        $this->assertContains( 'The email address isn’t correct', $errors["errors"]["invalid_email"][0] );
+        $this->assertArrayHasKey('invalid_email', $errors["errors"]);
+        $this->assertContains('The email address isn’t correct', $errors["errors"]["invalid_email"][0]);
     }
 
     public function test_register_empty_email() {
@@ -43,8 +43,8 @@ 
             ''
         );
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_email', $errors["errors"] );
-        $this->assertContains( 'Please type your e-mail address', $errors["errors"]["empty_email"][0] );
+        $this->assertArrayHasKey('empty_email', $errors["errors"]);
+        $this->assertContains('Please type your e-mail address', $errors["errors"]["empty_email"][0]);
     }
 
     public function test_register_invalid_password() {
@@ -57,8 +57,8 @@ 
             'hello@hi.com'
         );
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'pass_match', $errors["errors"] );
-        $this->assertContains( 'Passwords do not match', $errors["errors"]["pass_match"][0] );
+        $this->assertArrayHasKey('pass_match', $errors["errors"]);
+        $this->assertContains('Passwords do not match', $errors["errors"]["pass_match"][0]);
 
         $_REQUEST['user_pass'] = '12345';
         $_REQUEST['user_pass2'] = '12345';
@@ -67,8 +67,8 @@ 
             'hello@hi.com'
         );
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'pass_match', $errors["errors"] );
-        $this->assertContains( 'Password must be 7 characters or more', $errors["errors"]["pass_match"][0] );
+        $this->assertArrayHasKey('pass_match', $errors["errors"]);
+        $this->assertContains('Password must be 7 characters or more', $errors["errors"]["pass_match"][0]);
     }
 
     public function test_register_success() {
@@ -89,8 +89,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+        $this->assertArrayHasKey('empty_password', $errors["errors"]);
+        $this->assertContains('The password field is empty', $errors["errors"]["empty_password"][0]);
     }
 
     public function tearDown()

tests/lib/wordpress-tests-lib/wp-tests-config.php

Spacing +17 added lines, -17 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /* Path to the WordPress codebase you'd like to test. Add a backslash in the end. */
-define( 'ABSPATH', getenv( 'WP_CORE_DIR' ) . '/' );
+define('ABSPATH', getenv('WP_CORE_DIR').'/');
 
 // Test with multisite enabled
-define( 'WP_TESTS_MULTISITE', (bool) getenv( 'WP_MULTISITE' ) );
+define('WP_TESTS_MULTISITE', (bool) getenv('WP_MULTISITE'));
 
 // Force known bugs
 // define( 'WP_TESTS_FORCE_KNOWN_BUGS', true );
 
 // Test with WordPress debug mode on
-define( 'WP_DEBUG', true );
+define('WP_DEBUG', true);
 
 // ** MySQL settings ** //
 
@@ -21,21 +21,21 @@ 
 // These tests will DROP ALL TABLES in the database with the prefix named below.
 // DO NOT use a production database or one that is shared with something else.
 
-define( 'DB_NAME', 'wordpress_test' );
-define( 'DB_USER', 'root' );
-define( 'DB_PASSWORD', 'root' );
-define( 'DB_HOST', 'localhost' );
-define( 'DB_CHARSET', 'utf8' );
-define( 'DB_COLLATE', '' );
+define('DB_NAME', 'wordpress_test');
+define('DB_USER', 'root');
+define('DB_PASSWORD', 'root');
+define('DB_HOST', 'localhost');
+define('DB_CHARSET', 'utf8');
+define('DB_COLLATE', '');
 
-define( 'WP_TESTS_DOMAIN', 'example.org' );
-define( 'WP_TESTS_EMAIL', 'admin@example.org' );
-define( 'WP_TESTS_TITLE', 'Test Blog' );
+define('WP_TESTS_DOMAIN', 'example.org');
+define('WP_TESTS_EMAIL', 'admin@example.org');
+define('WP_TESTS_TITLE', 'Test Blog');
 
-define( 'WP_PHP_BINARY', 'php' );
+define('WP_PHP_BINARY', 'php');
 
-define( 'FS_CHMOD_DIR', ( 0755 & ~ umask() ) );
-define( 'FS_CHMOD_FILE', ( 0644 & ~ umask() ) );
+define('FS_CHMOD_DIR', (0755 & ~ umask()));
+define('FS_CHMOD_FILE', (0644 & ~ umask()));
 
-define( 'WPLANG', '' );
-$table_prefix  = 'wptests_';
\ No newline at end of file
+define('WPLANG', '');
+$table_prefix = 'wptests_';
\ No newline at end of file

tests/test-Check_Shortcodes.php

Indentation +136 added lines, -136 removed lines

@@ -1,141 +1,141 @@
 <?php
 class CheckShortcodes extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-
-    }
-
-    public function testHomeMapShortcode()
-    {
-        $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
-    }
-
-    public function testListingMapShortcode()
-    {
-        $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
-    }
-
-    public function testListingSliderShortcode()
-    {
-        $output = do_shortcode('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
-        $this->assertContains( 'geodir_widget_carousel', $output );
-    }
-
-    public function testLoginBoxShortcode()
-    {
-        $output = do_shortcode('[gd_login_box]');
-        $this->assertContains( 'geodir-loginbox-list', $output );
-    }
-
-    public function testPopPostCatShortcode()
-    {
-        global $geodir_post_type;
-        $geodir_post_type = 'gd_place';
-        $output = do_shortcode('[gd_popular_post_category category_limit=30]');
-        $this->assertContains( 'geodir-popular-cat-list', $output );
-    }
-
-    public function testPopPostViewShortcode()
-    {
-        $output = do_shortcode('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
-        $this->assertContains( 'geodir_category_list_view', $output );
-    }
-
-    public function testRecentReviewsShortcode()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $time = current_time('mysql');
-
-        $data = array(
-            'comment_post_ID' => $post_id,
-            'comment_author' => 'admin',
-            'comment_author_email' => 'admin@admin.com',
-            'comment_author_url' => 'http://wpgeodirectory.com',
-            'comment_content' => 'content here testtcc',
-            'comment_type' => '',
-            'comment_parent' => 0,
-            'user_id' => 1,
-            'comment_author_IP' => '127.0.0.1',
-            'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
-            'comment_date' => $time,
-            'comment_approved' => 1,
-        );
-
-        $comment_id = wp_insert_comment($data);
-
-        $_REQUEST['geodir_overallrating'] = 5.0;
-        geodir_save_rating($comment_id);
-
-        $output = do_shortcode('[gd_recent_reviews count=5]');
-        $this->assertContains( 'geodir_sc_recent_reviews', $output );
-    }
-
-    public function testRelatedListingsShortcode()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-            global $post;
-            $post =  geodir_get_post_info($post_id);
-            setup_postdata($post);
-            $output = do_shortcode('[gd_related_listings relate_to=category layout=3 add_location_filter=0 list_sort=featured character_count=0]');
-            $this->assertContains( 'geodir_location_listing', $output );
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-    }
-
-    public function testListingsShortcode()
-    {
-        $output = do_shortcode('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
-        $this->assertContains( 'geodir-sc-gd-listings', $output );
-    }
-
-    public function texstBestOfWidgetShortcode()
-    {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
-        include_once($template);
-
-        $output = do_shortcode('[gd_bestof_widget title="widget title" post_type=gd_hotel post_limit=5 categ_limit=6 character_count=50 use_viewing_post_type=true add_location_filter=true tab_layout=bestof-tabs-as-dropdown]');
-        $this->assertContains( 'geodir_bestof_widget', $output );
-    }
-
-    public function testAddListingShortcode()
-    {
-        $_REQUEST['listing_type'] = 'gd_place';
-        $output = do_shortcode('[gd_add_listing listing_type=gd_place login_msg="Please register and login to submit listings" show_login=true]');
-        $this->assertContains( 'geodir-add-listing-submit', $output );
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+
+	}
+
+	public function testHomeMapShortcode()
+	{
+		$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
+		$this->assertContains( 'geodir-map-home-page', $output );
+	}
+
+	public function testListingMapShortcode()
+	{
+		$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
+		$this->assertContains( 'geodir-map-listing-page', $output );
+	}
+
+	public function testListingSliderShortcode()
+	{
+		$output = do_shortcode('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
+		$this->assertContains( 'geodir_widget_carousel', $output );
+	}
+
+	public function testLoginBoxShortcode()
+	{
+		$output = do_shortcode('[gd_login_box]');
+		$this->assertContains( 'geodir-loginbox-list', $output );
+	}
+
+	public function testPopPostCatShortcode()
+	{
+		global $geodir_post_type;
+		$geodir_post_type = 'gd_place';
+		$output = do_shortcode('[gd_popular_post_category category_limit=30]');
+		$this->assertContains( 'geodir-popular-cat-list', $output );
+	}
+
+	public function testPopPostViewShortcode()
+	{
+		$output = do_shortcode('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
+		$this->assertContains( 'geodir_category_list_view', $output );
+	}
+
+	public function testRecentReviewsShortcode()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$time = current_time('mysql');
+
+		$data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'admin',
+			'comment_author_email' => 'admin@admin.com',
+			'comment_author_url' => 'http://wpgeodirectory.com',
+			'comment_content' => 'content here testtcc',
+			'comment_type' => '',
+			'comment_parent' => 0,
+			'user_id' => 1,
+			'comment_author_IP' => '127.0.0.1',
+			'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
+			'comment_date' => $time,
+			'comment_approved' => 1,
+		);
+
+		$comment_id = wp_insert_comment($data);
+
+		$_REQUEST['geodir_overallrating'] = 5.0;
+		geodir_save_rating($comment_id);
+
+		$output = do_shortcode('[gd_recent_reviews count=5]');
+		$this->assertContains( 'geodir_sc_recent_reviews', $output );
+	}
+
+	public function testRelatedListingsShortcode()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+			global $post;
+			$post =  geodir_get_post_info($post_id);
+			setup_postdata($post);
+			$output = do_shortcode('[gd_related_listings relate_to=category layout=3 add_location_filter=0 list_sort=featured character_count=0]');
+			$this->assertContains( 'geodir_location_listing', $output );
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+	}
+
+	public function testListingsShortcode()
+	{
+		$output = do_shortcode('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
+		$this->assertContains( 'geodir-sc-gd-listings', $output );
+	}
+
+	public function texstBestOfWidgetShortcode()
+	{
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
+		include_once($template);
+
+		$output = do_shortcode('[gd_bestof_widget title="widget title" post_type=gd_hotel post_limit=5 categ_limit=6 character_count=50 use_viewing_post_type=true add_location_filter=true tab_layout=bestof-tabs-as-dropdown]');
+		$this->assertContains( 'geodir_bestof_widget', $output );
+	}
+
+	public function testAddListingShortcode()
+	{
+		$_REQUEST['listing_type'] = 'gd_place';
+		$output = do_shortcode('[gd_add_listing listing_type=gd_place login_msg="Please register and login to submit listings" show_login=true]');
+		$this->assertContains( 'geodir-add-listing-submit', $output );
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -11,25 +11,25 @@ 
     public function testHomeMapShortcode()
     {
         $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
+        $this->assertContains('geodir-map-home-page', $output);
     }
 
     public function testListingMapShortcode()
     {
         $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
+        $this->assertContains('geodir-map-listing-page', $output);
     }
 
     public function testListingSliderShortcode()
     {
         $output = do_shortcode('[gd_listing_slider post_number=5 category=3 slideshow=true show_featured_only=true]');
-        $this->assertContains( 'geodir_widget_carousel', $output );
+        $this->assertContains('geodir_widget_carousel', $output);
     }
 
     public function testLoginBoxShortcode()
     {
         $output = do_shortcode('[gd_login_box]');
-        $this->assertContains( 'geodir-loginbox-list', $output );
+        $this->assertContains('geodir-loginbox-list', $output);
     }
 
     public function testPopPostCatShortcode()
@@ -37,13 +37,13 @@ 
         global $geodir_post_type;
         $geodir_post_type = 'gd_place';
         $output = do_shortcode('[gd_popular_post_category category_limit=30]');
-        $this->assertContains( 'geodir-popular-cat-list', $output );
+        $this->assertContains('geodir-popular-cat-list', $output);
     }
 
     public function testPopPostViewShortcode()
     {
         $output = do_shortcode('[gd_popular_post_view category=3 layout=5 add_location_filter=true character_count=0 show_featured_only=true]');
-        $this->assertContains( 'geodir_category_list_view', $output );
+        $this->assertContains('geodir_category_list_view', $output);
     }
 
     public function testRecentReviewsShortcode()
@@ -54,9 +54,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -85,7 +85,7 @@ 
         geodir_save_rating($comment_id);
 
         $output = do_shortcode('[gd_recent_reviews count=5]');
-        $this->assertContains( 'geodir_sc_recent_reviews', $output );
+        $this->assertContains('geodir_sc_recent_reviews', $output);
     }
 
     public function testRelatedListingsShortcode()
@@ -96,15 +96,15 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
             global $post;
-            $post =  geodir_get_post_info($post_id);
+            $post = geodir_get_post_info($post_id);
             setup_postdata($post);
             $output = do_shortcode('[gd_related_listings relate_to=category layout=3 add_location_filter=0 list_sort=featured character_count=0]');
-            $this->assertContains( 'geodir_location_listing', $output );
+            $this->assertContains('geodir_location_listing', $output);
         endwhile;
 
         $this->assertTrue(is_int($post_id));
@@ -114,23 +114,23 @@ 
     public function testListingsShortcode()
     {
         $output = do_shortcode('[gd_listings post_type="gd_place" category="1,3" post_number="10" list_sort="high_review"]');
-        $this->assertContains( 'geodir-sc-gd-listings', $output );
+        $this->assertContains('geodir-sc-gd-listings', $output);
     }
 
     public function texstBestOfWidgetShortcode()
     {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_bestof_widget.php';
         include_once($template);
 
         $output = do_shortcode('[gd_bestof_widget title="widget title" post_type=gd_hotel post_limit=5 categ_limit=6 character_count=50 use_viewing_post_type=true add_location_filter=true tab_layout=bestof-tabs-as-dropdown]');
-        $this->assertContains( 'geodir_bestof_widget', $output );
+        $this->assertContains('geodir_bestof_widget', $output);
     }
 
     public function testAddListingShortcode()
     {
         $_REQUEST['listing_type'] = 'gd_place';
         $output = do_shortcode('[gd_add_listing listing_type=gd_place login_msg="Please register and login to submit listings" show_login=true]');
-        $this->assertContains( 'geodir-add-listing-submit', $output );
+        $this->assertContains('geodir-add-listing-submit', $output);
     }
 
     public function tearDown()

tests/test-Author_Page.php

Indentation +35 added lines, -35 removed lines

@@ -1,53 +1,53 @@
 <?php
 class AuthorPage extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testAuthorPage()
-    {
-        global $current_user;
+	public function testAuthorPage()
+	{
+		global $current_user;
 
-        $user_id = $current_user->ID;
+		$user_id = $current_user->ID;
 
 
 
-        // Add listing
+		// Add listing
 
-        $args = array(
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title 2',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $post_id = geodir_save_listing($args, true);
+		$args = array(
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title 2',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$post_id = geodir_save_listing($args, true);
 
-        $this->assertTrue(is_int($post_id));
+		$this->assertTrue(is_int($post_id));
 
-        $count = count_user_posts( $user_id, "gd_place"  );
+		$count = count_user_posts( $user_id, "gd_place"  );
 
-        $this->assertTrue(is_int((int) $count));
+		$this->assertTrue(is_int((int) $count));
 
 
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
         $this->assertTrue(is_int($post_id));
 
-        $count = count_user_posts( $user_id, "gd_place"  );
+        $count = count_user_posts($user_id, "gd_place");
 
         $this->assertTrue(is_int((int) $count));
 

geodirectory-templates/listing-detail.php

Indentation +30 added lines, -30 removed lines

@@ -32,12 +32,12 @@ 
 

 ###### SIDEBAR ON LEFT ######

 if (get_option('geodir_detail_sidebar_left_section')) {

-    /**

-     * Adds the details page sidebar to the details template page.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_detail_sidebar');

+	/**

+	 * Adds the details page sidebar to the details template page.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_detail_sidebar');

 }

 

 ###### MAIN CONTENT WRAPPERS OPEN ######

@@ -63,29 +63,29 @@ 
 // this call the main page content

 global $preview;

 if (have_posts() && !$preview) {

-    the_post();

-    global $post, $post_images;

-    /**

-     * Calls the details page main content on the details template page.

-     *

-     * @since 1.1.0

-     * @param object $post The current post object.

-     */

-    do_action('geodir_details_main_content', $post);

+	the_post();

+	global $post, $post_images;

+	/**

+	 * Calls the details page main content on the details template page.

+	 *

+	 * @since 1.1.0

+	 * @param object $post The current post object.

+	 */

+	do_action('geodir_details_main_content', $post);

 } elseif ($preview) {

-    /**

-     * Called on the details page if the page is being previewed.

-     *

-     * This sets the value of `$post` to the preview values before the main content is called.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

-    if (defined( 'GD_TESTING_MODE' )) {

-        global $post;

-    }

-    /** This action is documented in geodirectory-templates/listing-detail.php */

-    do_action('geodir_details_main_content', $post);

+	/**

+	 * Called on the details page if the page is being previewed.

+	 *

+	 * This sets the value of `$post` to the preview values before the main content is called.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

+	if (defined( 'GD_TESTING_MODE' )) {

+		global $post;

+	}

+	/** This action is documented in geodirectory-templates/listing-detail.php */

+	do_action('geodir_details_main_content', $post);

 }

 

 

@@ -107,8 +107,8 @@ 
 

 ###### SIDEBAR ON RIGHT ######

 if (!get_option('geodir_detail_sidebar_left_section')) {

-    /** This action is documented in geodirectory-templates/listing-detail.php */

-    do_action('geodir_detail_sidebar');

+	/** This action is documented in geodirectory-templates/listing-detail.php */

+	do_action('geodir_detail_sidebar');

 }

 

 

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
  * @param string $itemtype The itemtype value of the HTML element.

  * @see 'geodir_article_close'

  */

-do_action('geodir_article_open', 'details-page', 'post-' . get_the_ID(), get_post_class(), '');

+do_action('geodir_article_open', 'details-page', 'post-'.get_the_ID(), get_post_class(), '');

 

 ###### MAIN CONTENT ######

 // this call the main page content

@@ -81,7 +81,7 @@ 
      * @since 1.1.0

      */

     do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

-    if (defined( 'GD_TESTING_MODE' )) {

+    if (defined('GD_TESTING_MODE')) {

         global $post;

     }

     /** This action is documented in geodirectory-templates/listing-detail.php */

geodirectory-functions/custom_fields_functions.php

Doc Comments +3 added lines, -3 removed lines

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

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns video.

+ * @return string Returns video.

  */

 function geodir_get_video($post_id)

 {

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

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns special offers.

+ * @return string Returns special offers.

  */

 function geodir_get_special_offers($post_id)

 {

@@ -3491,7 +3491,7 @@ 
      *

      * @since 1.0.0

      * @package GeoDirectory

-     * @return mixed|void Returns max upload file size.

+     * @return string|null Returns max upload file size.

      */

     function geodir_max_upload_size()

     {

Indentation +2884 added lines, -2884 removed lines

@@ -10,52 +10,52 @@ 
 global $wpdb, $table_prefix;

 

 if (!function_exists('geodir_column_exist')) {

-    /**

-     * Check table column exist or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $db The table name.

-     * @param string $column The column name.

-     * @return bool If column exists returns true. Otherwise false.

-     */

-    function geodir_column_exist($db, $column)

-    {

-        global $wpdb;

-        $exists = false;

-        $columns = $wpdb->get_col("show columns from $db");

-        foreach ($columns as $c) {

-            if ($c == $column) {

-                $exists = true;

-                break;

-            }

-        }

-        return $exists;

-    }

+	/**

+	 * Check table column exist or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $db The table name.

+	 * @param string $column The column name.

+	 * @return bool If column exists returns true. Otherwise false.

+	 */

+	function geodir_column_exist($db, $column)

+	{

+		global $wpdb;

+		$exists = false;

+		$columns = $wpdb->get_col("show columns from $db");

+		foreach ($columns as $c) {

+			if ($c == $column) {

+				$exists = true;

+				break;

+			}

+		}

+		return $exists;

+	}

 }

 

 if (!function_exists('geodir_add_column_if_not_exist')) {

-    /**

-     * Add column if table column not exist.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $db The table name.

-     * @param string $column The column name.

-     * @param string $column_attr The column attributes.

-     */

-    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

-    {

-        global $wpdb;

-        $result = 0;// no rows affected

-        if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

-        }

-        return $result;

-    }

+	/**

+	 * Add column if table column not exist.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $db The table name.

+	 * @param string $column The column name.

+	 * @param string $column_attr The column attributes.

+	 */

+	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

+	{

+		global $wpdb;

+		$result = 0;// no rows affected

+		if (!geodir_column_exist($db, $column)) {

+			if (!empty($db) && !empty($column))

+				$result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+		}

+		return $result;

+	}

 }

 

 /**

@@ -72,702 +72,702 @@ 
  */

 function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none')

 {

-    global $wpdb, $geodir_post_custom_fields_cache;

-

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

-

-    if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

-        return $geodir_post_custom_fields_cache[$cache_stored];

-    }

-

-    $default_query = '';

-

-    if ($default == 'default')

-        $default_query = " and is_default IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query = " and is_default = '0' ";

-

-    if ($fields_location == 'detail') {

-        $default_query = " and show_on_detail='1' ";

-    } elseif ($fields_location == 'listing') {

-        $default_query = " and show_on_listing='1' ";

-    }

-

-    $post_meta_info = $wpdb->get_results(

-        $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

-            array($post_type)

-        )

-    );

-

-

-    $return_arr = array();

-    if ($post_meta_info) {

-

-        foreach ($post_meta_info as $post_meta_info_obj) {

-

-            $custom_fields = array(

-                "name" => $post_meta_info_obj->htmlvar_name,

-                "label" => $post_meta_info_obj->clabels,

-                "default" => $post_meta_info_obj->default_value,

-                "type" => $post_meta_info_obj->field_type,

-                "desc" => $post_meta_info_obj->admin_desc);

-

-            if ($post_meta_info_obj->field_type) {

-                $options = explode(',', $post_meta_info_obj->option_values);

-                $custom_fields["options"] = $options;

-            }

-

-            foreach ($post_meta_info_obj as $key => $val) {

-                $custom_fields[$key] = $val;

-            }

-

-            $pricearr = array();

-            $pricearr = explode(',', $post_meta_info_obj->packages);

-

-            if ($package_id != '' && in_array($package_id, $pricearr)) {

-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

-            } elseif ($package_id == '') {

-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

-            }

-        }

-    }

-    $geodir_post_custom_fields_cache[$cache_stored] = $return_arr;

-

-    if (has_filter('geodir_filter_geodir_post_custom_fields')) {

-        /**

-         * Filter the post custom fields array.

-         *

-         * @since 1.0.0

-         *

-         * @param array $return_arr Post custom fields array.

-         * @param int|string $package_id The package ID.

-         * @param string $post_type Optional. The wordpress post type.

-         * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.

-         */

-        $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);

-    }

-

-    return $return_arr;

+	global $wpdb, $geodir_post_custom_fields_cache;

+

+	$cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+

+	if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

+		return $geodir_post_custom_fields_cache[$cache_stored];

+	}

+

+	$default_query = '';

+

+	if ($default == 'default')

+		$default_query = " and is_default IN ('1') ";

+	elseif ($default == 'custom')

+		$default_query = " and is_default = '0' ";

+

+	if ($fields_location == 'detail') {

+		$default_query = " and show_on_detail='1' ";

+	} elseif ($fields_location == 'listing') {

+		$default_query = " and show_on_listing='1' ";

+	}

+

+	$post_meta_info = $wpdb->get_results(

+		$wpdb->prepare(

+			"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+			array($post_type)

+		)

+	);

+

+

+	$return_arr = array();

+	if ($post_meta_info) {

+

+		foreach ($post_meta_info as $post_meta_info_obj) {

+

+			$custom_fields = array(

+				"name" => $post_meta_info_obj->htmlvar_name,

+				"label" => $post_meta_info_obj->clabels,

+				"default" => $post_meta_info_obj->default_value,

+				"type" => $post_meta_info_obj->field_type,

+				"desc" => $post_meta_info_obj->admin_desc);

+

+			if ($post_meta_info_obj->field_type) {

+				$options = explode(',', $post_meta_info_obj->option_values);

+				$custom_fields["options"] = $options;

+			}

+

+			foreach ($post_meta_info_obj as $key => $val) {

+				$custom_fields[$key] = $val;

+			}

+

+			$pricearr = array();

+			$pricearr = explode(',', $post_meta_info_obj->packages);

+

+			if ($package_id != '' && in_array($package_id, $pricearr)) {

+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

+			} elseif ($package_id == '') {

+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

+			}

+		}

+	}

+	$geodir_post_custom_fields_cache[$cache_stored] = $return_arr;

+

+	if (has_filter('geodir_filter_geodir_post_custom_fields')) {

+		/**

+		 * Filter the post custom fields array.

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param array $return_arr Post custom fields array.

+		 * @param int|string $package_id The package ID.

+		 * @param string $post_type Optional. The wordpress post type.

+		 * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.

+		 */

+		$return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);

+	}

+

+	return $return_arr;

 }

 

 if (!function_exists('geodir_custom_field_adminhtml')) {

-    /**

-     * Adds admin html for custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $field_type The form field type.

-     * @param object|int $result_str The custom field results object or row id.

-     * @param string $field_ins_upd When set to "submit" displays form.

-     * @param bool $default when set to true field will be for admin use only.

-     */

-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

-    {

-        global $wpdb;

-        $cf = $result_str;

-        if (!is_object($cf)) {

-

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

-

-        } else {

-            $field_info = $cf;

-            $result_str = $cf->id;

-        }

-        /**

-         * Contains custom field html.

-         *

-         * @since 1.0.0

-         */

-        include('custom_field_html.php');

-

-    }

+	/**

+	 * Adds admin html for custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $field_type The form field type.

+	 * @param object|int $result_str The custom field results object or row id.

+	 * @param string $field_ins_upd When set to "submit" displays form.

+	 * @param bool $default when set to true field will be for admin use only.

+	 */

+	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+	{

+		global $wpdb;

+		$cf = $result_str;

+		if (!is_object($cf)) {

+

+			$field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+

+		} else {

+			$field_info = $cf;

+			$result_str = $cf->id;

+		}

+		/**

+		 * Contains custom field html.

+		 *

+		 * @since 1.0.0

+		 */

+		include('custom_field_html.php');

+

+	}

 }

 

 if (!function_exists('geodir_custom_field_delete')) {

-    /**

-     * Delete custom field using field id.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param string $field_id The custom field ID.

-     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

-     */

-    function geodir_custom_field_delete($field_id = '') {

-        global $wpdb, $plugin_prefix;

-

-        if ($field_id != '') {

-            $cf = trim($field_id, '_');

-

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

-

-                $post_type = $field->post_type;

-                $htmlvar_name = $field->htmlvar_name;

-

-                if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

-                }

-

-                /**

-                 * Called after a custom field is deleted.

-                 *

-                 * @since 1.0.0

-                 * @param string $cf The fields ID.

-                 * @param string $field->htmlvar_name The html variable name for the field.

-                 * @param string $post_type The post type the field belongs to.

-                 */

-                do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

-

-                if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

-                } else {

-                    if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

-                    }

-                }

-

-                return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

-    }

+	/**

+	 * Delete custom field using field id.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param string $field_id The custom field ID.

+	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

+	 */

+	function geodir_custom_field_delete($field_id = '') {

+		global $wpdb, $plugin_prefix;

+

+		if ($field_id != '') {

+			$cf = trim($field_id, '_');

+

+			if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

+				$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+

+				$post_type = $field->post_type;

+				$htmlvar_name = $field->htmlvar_name;

+

+				if ($post_type != '' && $htmlvar_name != '') {

+					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+				}

+

+				/**

+				 * Called after a custom field is deleted.

+				 *

+				 * @since 1.0.0

+				 * @param string $cf The fields ID.

+				 * @param string $field->htmlvar_name The html variable name for the field.

+				 * @param string $post_type The post type the field belongs to.

+				 */

+				do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

+

+				if ($field->field_type == 'address') {

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+				} else {

+					if ($field->field_type != 'fieldset') {

+						$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+					}

+				}

+

+				return $field_id;

+			} else

+				return 0;

+		} else

+			return 0;

+	}

 }

 

 if (!function_exists('geodir_custom_field_save')) {

-    /**

-     * Save or Update custom fields into the database.

-     *

-     * @since 1.0.0

-     * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param array $request_field {

-     *    Attributes of the request field array.

-     *

-     *    @type string $action Ajax Action name. Default "geodir_ajax_action".

-     *    @type string $manage_field_type Field type Default "custom_fields".

-     *    @type string $create_field Create field Default "true".

-     *    @type string $field_ins_upd Field ins upd Default "submit".

-     *    @type string $_wpnonce WP nonce value.

-     *    @type string $listing_type Listing type Example "gd_place".

-     *    @type string $field_type Field type Example "radio".

-     *    @type string $field_id Field id Example "12".

-     *    @type string $data_type Data type Example "VARCHAR".

-     *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.

-     *    @type array $show_on_pkg Package list to display this field.

-     *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.

-     *    @type string $site_title Section title which you wish to display in frontend.

-     *    @type string $admin_desc Section description which will appear in frontend.

-     *    @type string $htmlvar_name Html variable name. This should be a unique name.

-     *    @type string $clabels Section Title which will appear in backend.

-     *    @type string $default_value The default value (for "link" this will be used as the link text).

-     *    @type string $sort_order The display order of this field in backend. e.g. 5.

-     *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.

-     *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.

-     *    @type string $is_required Use "1" to set field as required.

-     *    @type string $required_msg Enter text for error message if field required and have not full fill requirment.

-     *    @type string $show_on_listing Want to show this on listing page?.

-     *    @type string $show_on_detail Want to show this in More Info tab on detail page?.

-     *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.

-     *    @type string $option_values Option Values should be separated by comma.

-     *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.

-     *    @type string $css_class Enter custom css class for field custom style.

-     *

-     * }

-     * @param bool $default Not yet implemented.

-     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

-     */

-    function geodir_custom_field_save($request_field = array(), $default = false)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $old_html_variable = '';

-

-        $data_type = trim($request_field['data_type']);

-

-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

-

-        // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

-            $request_field['data_type'] = 'VARCHAR';

-        }

-

-        $cf = trim($result_str, '_');

-

-

-        /*-------- check dublicate validation --------*/

-

-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-        $post_type = $request_field['listing_type'];

-

-        if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

-        }

-

-        $check_html_variable = $wpdb->get_var(

-            $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

-                array($cf, $cehhtmlvar_name, $post_type)

-            )

-        );

-

-

-        if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {

-

-            if ($cf != '') {

-

-                $post_meta_info = $wpdb->get_row(

-                    $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

-                        array($cf)

-                    )

-                );

-

-            }

-

-            if (!empty($post_meta_info)) {

-                $post_val = $post_meta_info;

-                $old_html_variable = $post_val->htmlvar_name;

-

-            }

-

-

-

-            if ($post_type == '') $post_type = 'gd_place';

+	/**

+	 * Save or Update custom fields into the database.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param array $request_field {

+	 *    Attributes of the request field array.

+	 *

+	 *    @type string $action Ajax Action name. Default "geodir_ajax_action".

+	 *    @type string $manage_field_type Field type Default "custom_fields".

+	 *    @type string $create_field Create field Default "true".

+	 *    @type string $field_ins_upd Field ins upd Default "submit".

+	 *    @type string $_wpnonce WP nonce value.

+	 *    @type string $listing_type Listing type Example "gd_place".

+	 *    @type string $field_type Field type Example "radio".

+	 *    @type string $field_id Field id Example "12".

+	 *    @type string $data_type Data type Example "VARCHAR".

+	 *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.

+	 *    @type array $show_on_pkg Package list to display this field.

+	 *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.

+	 *    @type string $site_title Section title which you wish to display in frontend.

+	 *    @type string $admin_desc Section description which will appear in frontend.

+	 *    @type string $htmlvar_name Html variable name. This should be a unique name.

+	 *    @type string $clabels Section Title which will appear in backend.

+	 *    @type string $default_value The default value (for "link" this will be used as the link text).

+	 *    @type string $sort_order The display order of this field in backend. e.g. 5.

+	 *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.

+	 *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.

+	 *    @type string $is_required Use "1" to set field as required.

+	 *    @type string $required_msg Enter text for error message if field required and have not full fill requirment.

+	 *    @type string $show_on_listing Want to show this on listing page?.

+	 *    @type string $show_on_detail Want to show this in More Info tab on detail page?.

+	 *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.

+	 *    @type string $option_values Option Values should be separated by comma.

+	 *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.

+	 *    @type string $css_class Enter custom css class for field custom style.

+	 *

+	 * }

+	 * @param bool $default Not yet implemented.

+	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

+	 */

+	function geodir_custom_field_save($request_field = array(), $default = false)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$old_html_variable = '';

+

+		$data_type = trim($request_field['data_type']);

+

+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

+

+		// some servers fail if a POST value is VARCHAR so we change it.

+		if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+			$request_field['data_type'] = 'VARCHAR';

+		}

+

+		$cf = trim($result_str, '_');

+

+

+		/*-------- check dublicate validation --------*/

+

+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+		$post_type = $request_field['listing_type'];

+

+		if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

+			$cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+		}

+

+		$check_html_variable = $wpdb->get_var(

+			$wpdb->prepare(

+				"select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+				array($cf, $cehhtmlvar_name, $post_type)

+			)

+		);

+

+

+		if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {

+

+			if ($cf != '') {

+

+				$post_meta_info = $wpdb->get_row(

+					$wpdb->prepare(

+						"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+						array($cf)

+					)

+				);

+

+			}

+

+			if (!empty($post_meta_info)) {

+				$post_val = $post_meta_info;

+				$old_html_variable = $post_val->htmlvar_name;

+

+			}

+

+

+

+			if ($post_type == '') $post_type = 'gd_place';

 

 

-            $detail_table = $plugin_prefix . $post_type . '_detail';

+			$detail_table = $plugin_prefix . $post_type . '_detail';

 

-            $admin_title = $request_field['admin_title'];

-            $site_title = $request_field['site_title'];

-            $data_type = $request_field['data_type'];

-            $field_type = $request_field['field_type'];

-            $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-            $admin_desc = $request_field['admin_desc'];

-            $clabels = $request_field['clabels'];

-            $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';

-            $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';

-            $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';

-            $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';

-            $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';

-            $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';

-            $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';

-            $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';

-            $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';

-            $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';

-            $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type

-            $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';

-            $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';

-            $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';

-            $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

+			$admin_title = $request_field['admin_title'];

+			$site_title = $request_field['site_title'];

+			$data_type = $request_field['data_type'];

+			$field_type = $request_field['field_type'];

+			$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+			$admin_desc = $request_field['admin_desc'];

+			$clabels = $request_field['clabels'];

+			$default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';

+			$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';

+			$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';

+			$is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';

+			$required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';

+			$css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';

+			$field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';

+			$show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';

+			$show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';

+			$show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';

+			$decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type

+			$decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';

+			$validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';

+			$validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';

+			$for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

-            if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

-            }

+			if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

+				$htmlvar_name = 'geodir_' . $htmlvar_name;

+			}

 

-            $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+			$option_values = '';

+			if (isset($request_field['option_values']))

+				$option_values = $request_field['option_values'];

 

-            $cat_sort = '';

-            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort']))

-                $cat_sort = implode(",", $request_field['cat_sort']);

+			$cat_sort = '';

+			if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort']))

+				$cat_sort = implode(",", $request_field['cat_sort']);

 

-            $cat_filter = '';

-            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter']))

-                $cat_filter = implode(",", $request_field['cat_filter']);

+			$cat_filter = '';

+			if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter']))

+				$cat_filter = implode(",", $request_field['cat_filter']);

 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

-                $package_info = array();

+			if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

+				$price_pkg = implode(",", $request_field['show_on_pkg']);

+			else {

+				$package_info = array();

 

-                $package_info = geodir_post_package_info($package_info, '', $post_type);

-                $price_pkg = $package_info->pid;

-            }

+				$package_info = geodir_post_package_info($package_info, '', $post_type);

+				$price_pkg = $package_info->pid;

+			}

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+			if (isset($request_field['extra']) && !empty($request_field['extra']))

+				$extra_fields = $request_field['extra'];

 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+			if (isset($request_field['is_default']) && $request_field['is_default'] != '')

+				$is_default = $request_field['is_default'];

+			else

+				$is_default = '0';

 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+			if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

+				$is_admin = $request_field['is_admin'];

+			else

+				$is_admin = '0';

 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+			if ($is_active == '') $is_active = 1;

+			if ($is_required == '') $is_required = 0;

 

 

-            if ($sort_order == '') {

+			if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+				$last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

-            }

+				$sort_order = (int)$last_order + 1;

+			}

 

-            $default_value_add = '';

+			$default_value_add = '';

 

 

-            if (!empty($post_meta_info)) {

-                switch ($field_type):

+			if (!empty($post_meta_info)) {

+				switch ($field_type):

 

-                    case 'address':

+					case 'address':

 

-                        if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

-                        }

-                        $old_prefix = $old_html_variable . '_';

+						if ($htmlvar_name != '') {

+							$prefix = $htmlvar_name . '_';

+						}

+						$old_prefix = $old_html_variable . '_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

 

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

 

-                        $wpdb->query($meta_field_add);

+						$wpdb->query($meta_field_add);

 

-                        if ($extra_fields != '') {

+						if ($extra_fields != '') {

 

-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

+									geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

 

-                                }

+								}

 

 

-                            }

+							}

 

 

-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$wpdb->query($meta_field_add);

+								} else {

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+								}

 

-                            }

-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

+							}

+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

 

-                                if ($is_column) {

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

 

-                                }

+								}

 

-                            }

-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+							}

+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

 

-                                if ($is_column) {

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

 

-                                }

+								}

 

-                            }

-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

+							}

+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

-                                if ($is_column) {

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

-                                    $meta_field_add = "VARCHAR( 20 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "VARCHAR( 20 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

 

-                                }

+								}

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

-                                    $meta_field_add = "VARCHAR( 20 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "VARCHAR( 20 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

+

+									geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+								}

+

+							}

+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

-                                }

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

 

-                            }

-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$meta_field_add = "VARCHAR( 15 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+								}

 

-                                    $meta_field_add = "VARCHAR( 15 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

-                                }

+							}

+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

 

-                            }

-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

+

+									$wpdb->query($meta_field_add);

+

+								} else {

+

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+

+									$meta_field_add = "VARCHAR( 3 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

+

+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+								}

+

+							}

+							// show lat lng

+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+									$meta_field_add .= " DEFAULT '1'";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$wpdb->query($meta_field_add);

+								} else {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

 

-                                    $wpdb->query($meta_field_add);

+									$meta_field_add = "VARCHAR( 3 ) NULL";

+									$meta_field_add .= " DEFAULT '1'";

 

-                                } else {

+									geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+								}

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+							}

+						}// end extra

 

-                                    $meta_field_add = "VARCHAR( 3 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+						break;

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

-                                }

+					case 'checkbox':

+					case 'multiselect':

+					case 'select':

+					case 'taxonomy':

 

-                            }

-                            // show lat lng

-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+						$op_size = '500';

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

-                                    $meta_field_add .= " DEFAULT '1'";

+						// only make the field as big as it needs to be.

+						if(isset($option_values) && $option_values && $field_type=='select'){

+							$option_values_arr = explode(',',$option_values);

+							if(is_array($option_values_arr)){

+								$op_max = 0;

+								foreach($option_values_arr as $op_val){

+									if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+								}

+								if($op_max){$op_size =$op_max; }

+							}

+						}elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+							if(strlen($option_values)){

+								$op_size =  strlen($option_values);

+							}

+						}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 3 ) NULL";

-                                    $meta_field_add .= " DEFAULT '1'";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

-                                }

+						$alter_result = $wpdb->query($meta_field_add);

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

 

-                            }

-                        }// end extra

+						if (isset($request_field['cat_display_type']))

+							$extra_fields = $request_field['cat_display_type'];

 

-                        break;

+						if (isset($request_field['multi_display_type']))

+							$extra_fields = $request_field['multi_display_type'];

 

-                    case 'checkbox':

-                    case 'multiselect':

-                    case 'select':

-                    case 'taxonomy':

 

-                        $op_size = '500';

+						break;

 

-                        // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

-                                $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

-                                }

-                                if($op_max){$op_size =$op_max; }

-                            }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

-                            }

-                        }

+					case 'textarea':

+					case 'html':

+					case 'url':

+					case 'file':

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+						$alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

+						if (isset($request_field['advanced_editor']))

+							$extra_fields = $request_field['advanced_editor'];

 

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

+						break;

 

-                        $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

+					case 'fieldset':

+						// Nothig happend for fieldset

+						break;

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

+					default:

+						if ($data_type != 'VARCHAR' && $data_type != '') {

+							if ($data_type == 'FLOAT' && $decimal_point > 0) {

+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+							} else {

+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+							}

 

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

+							if (is_numeric($default_value) && $default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+							}

+						} else {

+							$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+							if ($default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+							}

+						}

 

+						$alter_result = $wpdb->query($default_value_add);

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

+						break;

+				endswitch;

 

-                        break;

+				$extra_field_query = '';

+				if (!empty($extra_fields)) {

+					$extra_field_query = serialize($extra_fields);

+				}

 

-                    case 'textarea':

-                    case 'html':

-                    case 'url':

-                    case 'file':

+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

-

-                        break;

+				$wpdb->query(

 

-                    case 'fieldset':

-                        // Nothig happend for fieldset

-                        break;

+					$wpdb->prepare(

 

-                    default:

-                        if ($data_type != 'VARCHAR' && $data_type != '') {

-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

-                            } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

-                            }

-

-                            if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

-                            if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        }

-

-                        $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

-                        break;

-                endswitch;

-

-                $extra_field_query = '';

-                if (!empty($extra_fields)) {

-                    $extra_field_query = serialize($extra_fields);

-                }

-

-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

-

-                $wpdb->query(

-

-                    $wpdb->prepare(

-

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+						"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -799,308 +799,308 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

-                    )

+						array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+					)

 

-                );

+				);

 

-                $lastid = trim($cf);

+				$lastid = trim($cf);

 

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+				$wpdb->query(

+					$wpdb->prepare(

+						"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

-                        array($site_title, $post_type, $htmlvar_name)

-                    )

-                );

-

-

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

-

-

-                /**

-                 * Called after all custom fields are saved for a post.

-                 *

-                 * @since 1.0.0

-                 * @param int $lastid The post ID.

-                 */

-                do_action('geodir_after_custom_fields_updated', $lastid);

-

-            } else {

-

-                switch ($field_type):

-

-                    case 'address':

-

-                        $data_type = '';

-

-                        if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

-                        }

-                        $old_prefix = $old_html_variable;

-

-                        //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";

-

-                        $meta_field_add = "VARCHAR( 254 ) NULL";

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

-

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

-                        //$wpdb->query($meta_field_add);

-

-

-                        if (!empty($extra_fields)) {

+						array($site_title, $post_type, $htmlvar_name)

+					)

+				);

+

+

+				if ($cat_sort == '')

+					$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+

+

+				/**

+				 * Called after all custom fields are saved for a post.

+				 *

+				 * @since 1.0.0

+				 * @param int $lastid The post ID.

+				 */

+				do_action('geodir_after_custom_fields_updated', $lastid);

+

+			} else {

+

+				switch ($field_type):

+

+					case 'address':

+

+						$data_type = '';

+

+						if ($htmlvar_name != '') {

+							$prefix = $htmlvar_name . '_';

+						}

+						$old_prefix = $old_html_variable;

+

+						//$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";

+

+						$meta_field_add = "VARCHAR( 254 ) NULL";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

+

+						geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+						//$wpdb->query($meta_field_add);

+

+

+						if (!empty($extra_fields)) {

+

+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+								$meta_field_add = "VARCHAR( 15 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+								$meta_field_add = "VARCHAR( 20 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

 

-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

-                                $meta_field_add = "VARCHAR( 15 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

-                                $meta_field_add = "VARCHAR( 20 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 20 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 15 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 3 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            // show lat lng

-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 3 ) NULL";

-                                $meta_field_add .= " DEFAULT '1'";

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                        }

-

-                        break;

-

-                    case 'checkbox':

-                        $data_type = 'TINYINT';

-

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

-                            $meta_field_add .= " DEFAULT '1'";

-                        }

-

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                    case 'multiselect':

-                    case 'select':

-                        $data_type = 'VARCHAR';

-                        $op_size = '500';

-

-                        // only make the field as big as it needs to be.

-                        if (isset($option_values) && $option_values && $field_type == 'select') {

-                            $option_values_arr = explode(',', $option_values);

-

-                            if (is_array($option_values_arr)) {

-                                $op_max = 0;

-

-                                foreach ($option_values_arr as $op_val) {

-                                    if (strlen($op_val) && strlen($op_val) > $op_max) {

-                                        $op_max = strlen($op_val);

-                                    }

-                                }

-

-                                if ($op_max) {

-                                    $op_size = $op_max;

-                                }

-                            }

-                        } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

-                            if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

-                            }

-

-                            if (isset($request_field['multi_display_type'])) {

-                                $extra_fields = $request_field['multi_display_type'];

-                            }

-                        }

-

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

-

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                    case 'textarea':

-                    case 'html':

-                    case 'url':

-                    case 'file':

-

-                        $data_type = 'TEXT';

-

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

-

-                        $meta_field_add = $data_type . " NULL ";

-                        /*if($default_value != '')

+								$meta_field_add = "VARCHAR( 20 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+

+								$meta_field_add = "VARCHAR( 15 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+

+								$meta_field_add = "VARCHAR( 3 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							// show lat lng

+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+

+								$meta_field_add = "VARCHAR( 3 ) NULL";

+								$meta_field_add .= " DEFAULT '1'";

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+						}

+

+						break;

+

+					case 'checkbox':

+						$data_type = 'TINYINT';

+

+						$meta_field_add = $data_type . "( 1 ) NOT NULL ";

+						if ((int)$default_value === 1) {

+							$meta_field_add .= " DEFAULT '1'";

+						}

+

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+					case 'multiselect':

+					case 'select':

+						$data_type = 'VARCHAR';

+						$op_size = '500';

+

+						// only make the field as big as it needs to be.

+						if (isset($option_values) && $option_values && $field_type == 'select') {

+							$option_values_arr = explode(',', $option_values);

+

+							if (is_array($option_values_arr)) {

+								$op_max = 0;

+

+								foreach ($option_values_arr as $op_val) {

+									if (strlen($op_val) && strlen($op_val) > $op_max) {

+										$op_max = strlen($op_val);

+									}

+								}

+

+								if ($op_max) {

+									$op_size = $op_max;

+								}

+							}

+						} elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+							if (strlen($option_values)) {

+								$op_size =  strlen($option_values);

+							}

+

+							if (isset($request_field['multi_display_type'])) {

+								$extra_fields = $request_field['multi_display_type'];

+							}

+						}

+

+						$meta_field_add = $data_type . "( $op_size ) NULL ";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

+

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+					case 'textarea':

+					case 'html':

+					case 'url':

+					case 'file':

+

+						$data_type = 'TEXT';

+

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+

+						$meta_field_add = $data_type . " NULL ";

+						/*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    case 'datepicker':

+					case 'datepicker':

 

-                        $data_type = 'DATE';

+						$data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+						$meta_field_add = $data_type . " NULL ";

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    case 'time':

+					case 'time':

 

-                        $data_type = 'TIME';

+						$data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+						$meta_field_add = $data_type . " NULL ";

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    default:

+					default:

 

-                        if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+						if ($data_type != 'VARCHAR' && $data_type != '') {

+							$meta_field_add = $data_type . " NULL ";

 

-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

-                            }

+							if ($data_type == 'FLOAT' && $decimal_point > 0) {

+								$meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+							}

 

-                            if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        } else {

-                            $meta_field_add = " VARCHAR( 254 ) NULL ";

+							if (is_numeric($default_value) && $default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+								$meta_field_add .= " DEFAULT '" . $default_value . "'";

+							}

+						} else {

+							$meta_field_add = " VARCHAR( 254 ) NULL ";

 

-                            if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        }

+							if ($default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+								$meta_field_add .= " DEFAULT '" . $default_value . "'";

+							}

+						}

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                endswitch;

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+				endswitch;

 

-                $extra_field_query = '';

-                if (!empty($extra_fields)) {

-                    $extra_field_query = serialize($extra_fields);

-                }

+				$extra_field_query = '';

+				if (!empty($extra_fields)) {

+					$extra_field_query = serialize($extra_fields);

+				}

 

-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

 

-                $wpdb->query(

+				$wpdb->query(

 

-                    $wpdb->prepare(

+					$wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+						"insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1131,26 +1131,26 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+						array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

 

-                    )

+					)

 

-                );

+				);

 

-                $lastid = $wpdb->insert_id;

+				$lastid = $wpdb->insert_id;

 

-                $lastid = trim($lastid);

+				$lastid = trim($lastid);

 

-            }

+			}

 

-            return (int)$lastid;

+			return (int)$lastid;

 

 

-        } else {

-            return 'HTML Variable Name should be a unique name';

-        }

+		} else {

+			return 'HTML Variable Name should be a unique name';

+		}

 

-    }

+	}

 }

 

 /**

@@ -1165,30 +1165,30 @@ 
 function godir_set_field_order($field_ids = array())

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $count = 0;

-    if (!empty($field_ids)):

-        $post_meta_info = false;

-        foreach ($field_ids as $id) {

+	$count = 0;

+	if (!empty($field_ids)):

+		$post_meta_info = false;

+		foreach ($field_ids as $id) {

 

-            $cf = trim($id, '_');

+			$cf = trim($id, '_');

 

-            $post_meta_info = $wpdb->query(

-                $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+			$post_meta_info = $wpdb->query(

+				$wpdb->prepare(

+					"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 															sort_order=%d 

 															where id= %d",

-                    array($count, $cf)

-                )

-            );

-            $count++;

-        }

-

-        return $post_meta_info;

-    else:

-        return false;

-    endif;

+					array($count, $cf)

+				)

+			);

+			$count++;

+		}

+

+		return $post_meta_info;

+	else:

+		return false;

+	endif;

 }

 

 

@@ -1208,140 +1208,140 @@ 
  * @param string $post_type Optional. The wordpress post type.

  */

 function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {

-    global $is_default, $mapzoom, $gd_session;

-

-    $show_editors = array();

-    $listing_type = $post_type;

-

-    $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

-

-    $fieldset_id = '';

-    $fieldset_field_class = 'gd-fieldset-details';

-    foreach ($custom_fields as $key => $val) {

-        $val = stripslashes_deep($val); // strip slashes from labels

-        $name = $val['name'];

-        $site_title = $val['site_title'];

-        $type = $val['type'];

-        $admin_desc = $val['desc'];

-        $option_values = $val['option_values'];

-        $is_required = $val['is_required'];

-        $is_default = $val['is_default'];

-        $is_admin = $val['is_admin'];

-        $required_msg = $val['required_msg'];

-        $extra_fields = unserialize($val['extra_fields']);

-        $value = '';

-

-        /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

-        if ($for_admin_use && !is_super_admin()) {

-            continue;

-        }

-

-        if (is_admin()) {

-            global $post;

-

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

-        }

-

-        if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

-            $post = $gd_ses_listing;

-            $value = isset($post[$name]) ? $post[$name] : '';

-        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $value = geodir_get_post_meta($_REQUEST['pid'], $name, true);

-        } else {

-            if ($value == '') {

-                $value = $val['default'];

-            }

-        }

-

-        /**

-         * Called before the custom fields info is output for submitting a post.

-         *

-         * Used dynamic hook type geodir_before_custom_form_field_$name.

-         *

-         * @since 1.0.0

-         * @param string $listing_type The post post type.

-         * @param int $package_id The price package ID for the post.

-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

-         * @see 'geodir_after_custom_form_field_$name'

-         */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

-

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

-            $fieldset_id = (int)$val['id'];

-            $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

-            ?>

+	global $is_default, $mapzoom, $gd_session;

+

+	$show_editors = array();

+	$listing_type = $post_type;

+

+	$custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

+

+	$fieldset_id = '';

+	$fieldset_field_class = 'gd-fieldset-details';

+	foreach ($custom_fields as $key => $val) {

+		$val = stripslashes_deep($val); // strip slashes from labels

+		$name = $val['name'];

+		$site_title = $val['site_title'];

+		$type = $val['type'];

+		$admin_desc = $val['desc'];

+		$option_values = $val['option_values'];

+		$is_required = $val['is_required'];

+		$is_default = $val['is_default'];

+		$is_admin = $val['is_admin'];

+		$required_msg = $val['required_msg'];

+		$extra_fields = unserialize($val['extra_fields']);

+		$value = '';

+

+		/* field available to site admin only for edit */

+		$for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+		if ($for_admin_use && !is_super_admin()) {

+			continue;

+		}

+

+		if (is_admin()) {

+			global $post;

+

+			if (isset($_REQUEST['post']))

+				$_REQUEST['pid'] = $_REQUEST['post'];

+		}

+

+		if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

+			$post = $gd_ses_listing;

+			$value = isset($post[$name]) ? $post[$name] : '';

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$value = geodir_get_post_meta($_REQUEST['pid'], $name, true);

+		} else {

+			if ($value == '') {

+				$value = $val['default'];

+			}

+		}

+

+		/**

+		 * Called before the custom fields info is output for submitting a post.

+		 *

+		 * Used dynamic hook type geodir_before_custom_form_field_$name.

+		 *

+		 * @since 1.0.0

+		 * @param string $listing_type The post post type.

+		 * @param int $package_id The price package ID for the post.

+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

+		 * @see 'geodir_after_custom_form_field_$name'

+		 */

+		do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+

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

+			$fieldset_id = (int)$val['id'];

+			$fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

+			?>

             <h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

                 <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?></h5>

             <?php

-        } else if ($type == 'address') {

-            $prefix = $name . '_';

-

-            ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');

-            ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');

-            ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');

-            ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');

-

-            $address = '';

-            $zip = '';

-            $mapview = '';

-            $mapzoom = '';

-            $lat = '';

-            $lng = '';

-

-            if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

-                $post = $gd_ses_listing;

-                $address = $post[$prefix . 'address'];

-                $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';

-                $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';

-                $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';

-                $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';

-                $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';

-            } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {

-                $post_info = (array)$post_info;

-

-                $address = $post_info[$prefix . 'address'];

-                $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';

-                $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';

-                $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';

-                $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';

-                $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';

-            }

-

-            $location = geodir_get_default_location();

-            if (empty($city)) $city = isset($location->city) ? $location->city : '';

-            if (empty($region)) $region = isset($location->region) ? $location->region : '';

-            if (empty($country)) $country = isset($location->country) ? $location->country : '';

-

-            $lat_lng_blank = false;

-            if (empty($lat) && empty($lng)) {

-                $lat_lng_blank = true;

-            }

-

-            if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';

-            if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';

-

-            /**

-             * Filter the default latitude.

-             *

-             * @since 1.0.0

-             *

-             * @param float $lat Default latitude.

-             * @param bool $is_admin For admin use only?.

-             */

-            $lat = apply_filters('geodir_default_latitude', $lat, $is_admin);

-            /**

-             * Filter the default longitude.

-             *

-             * @since 1.0.0

-             *

-             * @param float $lat Default longitude.

-             * @param bool $is_admin For admin use only?.

-             */

-            $lng = apply_filters('geodir_default_longitude', $lng, $is_admin);

-

-            ?>

+		} else if ($type == 'address') {

+			$prefix = $name . '_';

+

+			($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');

+			($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');

+			($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');

+			($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');

+

+			$address = '';

+			$zip = '';

+			$mapview = '';

+			$mapzoom = '';

+			$lat = '';

+			$lng = '';

+

+			if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

+				$post = $gd_ses_listing;

+				$address = $post[$prefix . 'address'];

+				$zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';

+				$lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';

+				$lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';

+				$mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';

+				$mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';

+			} else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {

+				$post_info = (array)$post_info;

+

+				$address = $post_info[$prefix . 'address'];

+				$zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';

+				$lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';

+				$lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';

+				$mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';

+				$mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';

+			}

+

+			$location = geodir_get_default_location();

+			if (empty($city)) $city = isset($location->city) ? $location->city : '';

+			if (empty($region)) $region = isset($location->region) ? $location->region : '';

+			if (empty($country)) $country = isset($location->country) ? $location->country : '';

+

+			$lat_lng_blank = false;

+			if (empty($lat) && empty($lng)) {

+				$lat_lng_blank = true;

+			}

+

+			if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';

+			if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';

+

+			/**

+			 * Filter the default latitude.

+			 *

+			 * @since 1.0.0

+			 *

+			 * @param float $lat Default latitude.

+			 * @param bool $is_admin For admin use only?.

+			 */

+			$lat = apply_filters('geodir_default_latitude', $lat, $is_admin);

+			/**

+			 * Filter the default longitude.

+			 *

+			 * @since 1.0.0

+			 *

+			 * @param float $lat Default longitude.

+			 * @param bool $is_admin For admin use only?.

+			 */

+			$lng = apply_filters('geodir_default_longitude', $lng, $is_admin);

+

+			?>

 

             <div id="geodir_<?php echo $prefix . 'address';?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

@@ -1360,17 +1360,17 @@ 
 

 

             <?php

-            /**

-             * Called after the address input on the add listings.

-             *

-             * This is used by the location manage to add further locations info etc.

-             *

-             * @since 1.0.0

-             * @param array $val The array of setting for the custom field. {@see geodir_custom_field_save()}.

-             */

-            do_action('geodir_address_extra_listing_fields', $val);

-

-            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>

+			/**

+			 * Called after the address input on the add listings.

+			 *

+			 * This is used by the location manage to add further locations info etc.

+			 *

+			 * @since 1.0.0

+			 * @param array $val The array of setting for the custom field. {@see geodir_custom_field_save()}.

+			 */

+			do_action('geodir_address_extra_listing_fields', $val);

+

+			if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>

 

                 <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"

                      class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

@@ -1391,22 +1391,22 @@ 
 

                 <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                     <?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");

-                    if ($lat_lng_blank) {

-                        $lat = '';

-                        $lng = '';

-                    }

-                    ?>

+					/**

+					 * Contains add listing page map functions.

+					 *

+					 * @since 1.0.0

+					 */

+					include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");

+					if ($lat_lng_blank) {

+						$lat = '';

+						$lng = '';

+					}

+					?>

                     <span class="geodir_message_note"><?php echo GET_MAP_MSG; ?></span>

                 </div>

                 <?php

-                /* show lat lng */

-                $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

+				/* show lat lng */

+				$style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

                 <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

                      class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

@@ -1447,27 +1447,27 @@ 
                                                             class="gd-checkbox"

                                                             name="<?php echo $prefix . 'mapview'; ?>"

                                                             id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {

-                            echo 'checked="checked"';

-                        } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>

+							echo 'checked="checked"';

+						} ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>

                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"

                                                              class="gd-checkbox"

                                                              name="<?php echo $prefix . 'mapview'; ?>"

                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {

-                            echo 'checked="checked"';

-                        } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>

+							echo 'checked="checked"';

+						} ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>

 

                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

                                                             name="<?php echo $prefix . 'mapview'; ?>"

                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {

-                            echo 'checked="checked"';

-                        } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>

+							echo 'checked="checked"';

+						} ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>

 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

                                                             name="<?php echo $prefix . 'mapview'; ?>"

                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {

-                            echo 'checked="checked"';

-                        } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>

+							echo 'checked="checked"';

+						} ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>

 

 

                 </div>

@@ -1475,31 +1475,31 @@ 
 

             <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>

                 <input type="hidden" value="<?php if (isset($mapzoom)) {

-                    echo esc_attr($mapzoom);

-                } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>

+					echo esc_attr($mapzoom);

+				} ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>

             <?php }?>

         <?php } elseif ($type == 'text') {

 

-            //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

-            //print_r($val);

-            //validation

-            if(isset($val['validation_pattern']) && $val['validation_pattern']){

-                $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

-

-            // validation message

-            if(isset($val['validation_msg']) && $val['validation_msg']){

-                $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

-            ?>

+			//number and float validation $validation_pattern

+			if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

+			elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+			//print_r($val);

+			//validation

+			if(isset($val['validation_pattern']) && $val['validation_pattern']){

+				$validation = 'pattern="'.$val['validation_pattern'].'"';

+			}else{$validation='';}

+

+			// validation message

+			if(isset($val['validation_msg']) && $val['validation_msg']){

+				$validation_msg = 'title="'.$val['validation_msg'].'"';

+			}else{$validation_msg='';}

+			?>

 

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

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

@@ -1511,15 +1511,15 @@ 
             </div>

 

         <?php } elseif ($type == 'email') {

-            if ($value == $val['default']) {

-                $value = '';

-            }?>

+			if ($value == $val['default']) {

+				$value = '';

+			}?>

 

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

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

@@ -1531,15 +1531,15 @@ 
             </div>

 

         <?php } elseif ($type == 'phone') {

-            if ($value == $val['default']) {

-                $value = '';

-            } ?>

+			if ($value == $val['default']) {

+				$value = '';

+			} ?>

 

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

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

@@ -1551,15 +1551,15 @@ 
             </div>

 

         <?php } elseif ($type == 'url') {

-            if ($value == $val['default']) {

-                $value = '';

-            }?>

+			if ($value == $val['default']) {

+				$value = '';

+			}?>

 

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

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

@@ -1578,23 +1578,23 @@ 
                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

                 <?php if ($option_values) {

-                    $option_values = geodir_string_values_to_options($option_values, true);

+					$option_values = geodir_string_values_to_options($option_values, true);

 

-                    if (!empty($option_values)) {

-                        foreach ($option_values as $option_value) {

-                            if (empty($option_value['optgroup'])) {

-                                ?>

+					if (!empty($option_values)) {

+						foreach ($option_values as $option_value) {

+							if (empty($option_value['optgroup'])) {

+								?>

                                 <span class="gd-radios"><input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?></span>

                                 <?php

-                            }

-                        }

-                    }

-                }

-                ?>

+							}

+						}

+					}

+				}

+				?>

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

@@ -1607,16 +1607,16 @@ 
                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

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

-                    $value = '0';

-                }?>

+					$value = '0';

+				}?>

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

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

-                    echo 'checked="checked"';

-                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type;?>" type="checkbox"

+					echo 'checked="checked"';

+				}?>  value="1" class="gd-checkbox" field_type="<?php echo $type;?>" type="checkbox"

                      onchange="if(this.checked){jQuery('#<?php echo $name;?>').val('1');} else{ jQuery('#<?php echo $name;?>').val('0');}"/>

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

                 <?php if ($is_required) { ?>

@@ -1625,31 +1625,31 @@ 
             </div>

 

         <?php } elseif ($type == 'textarea') {

-            ?>

+			?>

 

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label><?php

 

 

-                if (is_array($extra_fields) && in_array('1', $extra_fields)) {

+				if (is_array($extra_fields) && in_array('1', $extra_fields)) {

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

+					$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

 

                 <div class="editor" field_id="<?php echo $name;?>" field_type="editor">

                     <?php wp_editor(stripslashes($value), $name, $editor_settings); ?>

                     </div><?php

 

-                } else {

+				} else {

 

-                    ?><textarea field_type="<?php echo $type;?>" class="geodir_textarea" name="<?php echo $name;?>"

+					?><textarea field_type="<?php echo $type;?>" class="geodir_textarea" name="<?php echo $name;?>"

                                 id="<?php echo $name;?>"><?php echo stripslashes($value);?></textarea><?php

 

-                }?>

+				}?>

 

 

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

@@ -1663,28 +1663,28 @@ 
                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

                 <?php

-                $option_values_arr = geodir_string_values_to_options($option_values, true);

-                $select_options = '';

-                if (!empty($option_values_arr)) {

-                    foreach ($option_values_arr as $option_row) {

-                        if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {

-                            $option_label = isset($option_row['label']) ? $option_row['label'] : '';

-

-                            $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

-                        } else {

-                            $option_label = isset($option_row['label']) ? $option_row['label'] : '';

-                            $option_value = isset($option_row['value']) ? $option_row['value'] : '';

-                            $selected = $option_value == $value ? 'selected="selected"' : '';

-

-                            $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

-                        }

-                    }

-                }

-                ?>

+				$option_values_arr = geodir_string_values_to_options($option_values, true);

+				$select_options = '';

+				if (!empty($option_values_arr)) {

+					foreach ($option_values_arr as $option_row) {

+						if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {

+							$option_label = isset($option_row['label']) ? $option_row['label'] : '';

+

+							$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

+						} else {

+							$option_label = isset($option_row['label']) ? $option_row['label'] : '';

+							$option_value = isset($option_row['value']) ? $option_row['value'] : '';

+							$selected = $option_value == $value ? 'selected="selected"' : '';

+

+							$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

+						}

+					}

+				}

+				?>

                 <select field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                         class="geodir_textfield textfield_x chosen_select"

                         data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"

@@ -1696,17 +1696,17 @@ 
             </div>

 

             <?php

-        } else if ($type == 'multiselect') {

-            $multi_display = 'select';

-            if (!empty($val['extra_fields'])) {

-                $multi_display = unserialize($val['extra_fields']);

-            }

-            ?>

+		} else if ($type == 'multiselect') {

+			$multi_display = 'select';

+			if (!empty($val['extra_fields'])) {

+				$multi_display = unserialize($val['extra_fields']);

+			}

+			?>

             <div id="<?php echo $name; ?>_row"

                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <input type="hidden" name="gd_field_<?php echo $name; ?>" value="1"/>

@@ -1717,55 +1717,55 @@ 
                             data-placeholder="<?php _e('Select', 'geodirectory'); ?>"

                             option-ajaxchosen="false">

                         <?php

-                        } else {

-                            echo '<ul class="gd_multi_choice">';

-                        }

-

-                        $option_values_arr = geodir_string_values_to_options($option_values, true);

-                        $select_options = '';

-                        if (!empty($option_values_arr)) {

-                            foreach ($option_values_arr as $option_row) {

-                                if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {

-                                    $option_label = isset($option_row['label']) ? $option_row['label'] : '';

-

-                                    if ($multi_display == 'select') {

-                                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

-                                    } else {

-                                        $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';

-                                    }

-                                } else {

-                                    $option_label = isset($option_row['label']) ? $option_row['label'] : '';

-                                    $option_value = isset($option_row['value']) ? $option_row['value'] : '';

-                                    $selected = $option_value == $value ? 'selected="selected"' : '';

-                                    $selected = '';

-                                    $checked = '';

-

-                                    if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {

-                                        if (!is_array($value)) {

-                                            $value_array = explode(',', $value);

-                                        } else {

-                                            $value_array = $value;

-                                        }

-

-                                        if (is_array($value_array)) {

-                                            if (in_array($option_value, $value_array)) {

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

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

-                                            }

-                                        }

-                                    }

-

-                                    if ($multi_display == 'select') {

-                                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

-                                    } else {

-                                        $select_options .= '<li><input name="' . $name . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';

-                                    }

-                                }

-                            }

-                        }

-                        echo $select_options;

-

-                        if ($multi_display == 'select') { ?></select></div>

+						} else {

+							echo '<ul class="gd_multi_choice">';

+						}

+

+						$option_values_arr = geodir_string_values_to_options($option_values, true);

+						$select_options = '';

+						if (!empty($option_values_arr)) {

+							foreach ($option_values_arr as $option_row) {

+								if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {

+									$option_label = isset($option_row['label']) ? $option_row['label'] : '';

+

+									if ($multi_display == 'select') {

+										$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

+									} else {

+										$select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';

+									}

+								} else {

+									$option_label = isset($option_row['label']) ? $option_row['label'] : '';

+									$option_value = isset($option_row['value']) ? $option_row['value'] : '';

+									$selected = $option_value == $value ? 'selected="selected"' : '';

+									$selected = '';

+									$checked = '';

+

+									if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {

+										if (!is_array($value)) {

+											$value_array = explode(',', $value);

+										} else {

+											$value_array = $value;

+										}

+

+										if (is_array($value_array)) {

+											if (in_array($option_value, $value_array)) {

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

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

+											}

+										}

+									}

+

+									if ($multi_display == 'select') {

+										$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

+									} else {

+										$select_options .= '<li><input name="' . $name . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';

+									}

+								}

+							}

+						}

+						echo $select_options;

+

+						if ($multi_display == 'select') { ?></select></div>

             <?php } else { ?></ul><?php } ?>

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

@@ -1773,14 +1773,14 @@ 
                 <?php } ?>

             </div>

             <?php

-        } else if ($type == 'html') {

-            ?>

+		} else if ($type == 'html') {

+			?>

 

             <div id="<?php echo $name; ?>_row"

                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

@@ -1798,44 +1798,44 @@ 
             </div>

         <?php } elseif ($type == 'datepicker') {

 

-            if ($extra_fields['date_format'] == '')

-                $extra_fields['date_format'] = 'yy-mm-dd';

+			if ($extra_fields['date_format'] == '')

+				$extra_fields['date_format'] = 'yy-mm-dd';

 

-            $date_format = $extra_fields['date_format'];

-            $jquery_date_format  = $date_format;

+			$date_format = $extra_fields['date_format'];

+			$jquery_date_format  = $date_format;

 

 

-            // check if we need to change the format or not

-            $date_format_len = strlen(str_replace(' ', '', $date_format));

-            if($date_format_len>5){// if greater then 5 then it's the old style format.

+			// check if we need to change the format or not

+			$date_format_len = strlen(str_replace(' ', '', $date_format));

+			if($date_format_len>5){// if greater then 5 then it's the old style format.

 

-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                $replace = array('d','j','l','m','n','F','Y');//PHP date format

+				$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

+				$replace = array('d','j','l','m','n','F','Y');//PHP date format

 

-                $date_format = str_replace($search, $replace, $date_format);

-            }else{

-                $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );

-            }

+				$date_format = str_replace($search, $replace, $date_format);

+			}else{

+				$jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );

+			}

 

-            if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty

-            if($value && !isset($_REQUEST['backandedit'])) {

-                $time = strtotime($value);

-                $value = date_i18n($date_format, $time);

-            }

+			if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty

+			if($value && !isset($_REQUEST['backandedit'])) {

+				$time = strtotime($value);

+				$value = date_i18n($date_format, $time);

+			}

             

-            ?>

+			?>

             <script type="text/javascript">

 

                 jQuery(function () {

 

                     jQuery("#<?php echo $name;?>").datepicker({changeMonth: true, changeYear: true <?php

-                        /**

-                         * Used to add extra option to datepicker per custom field.

-                         *

-                         * @since 1.5.7

-                         * @param string $name The custom field name.

-                         */

-                        echo apply_filters("gd_datepicker_extra_{$name}",'');?>});

+						/**

+						 * Used to add extra option to datepicker per custom field.

+						 *

+						 * @since 1.5.7

+						 * @param string $name The custom field name.

+						 */

+						echo apply_filters("gd_datepicker_extra_{$name}",'');?>});

 

                     jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');

 

@@ -1851,7 +1851,7 @@ 
                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

 

@@ -1866,9 +1866,9 @@ 
 

         <?php } elseif ($type == 'time') {

 

-            if ($value != '')

-                $value = date('H:i', strtotime($value));

-            ?>

+			if ($value != '')

+				$value = date('H:i', strtotime($value));

+			?>

             <script type="text/javascript">

                 jQuery(document).ready(function () {

 

@@ -1884,7 +1884,7 @@ 
                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

                 <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

@@ -1897,110 +1897,110 @@ 
             </div>

 

         <?php } elseif ($type == 'taxonomy') {

-            if ($value == $val['default']) {

-                $value = '';

-            } ?>

+			if ($value == $val['default']) {

+				$value = '';

+			} ?>

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

-                    echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

+					echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

                     <?php if ($is_required) echo '<span>*</span>';?>

                 </label>

 

                 <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

                     <?php

-                    global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;

+					global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;

 

-                    $exclude_cats = array();

+					$exclude_cats = array();

 

-                    if ($is_admin == '1') {

+					if ($is_admin == '1') {

 

-                        $post_type = get_post_type();

+						$post_type = get_post_type();

 

-                        $package_info = array();

+						$package_info = array();

 

-                        $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);

+						$package_info = (array)geodir_post_package_info($package_info, $post, $post_type);

 

-                        if (!empty($package_info)) {

+						if (!empty($package_info)) {

 

-                            if (isset($package_info['cat']) && $package_info['cat'] != '') {

+							if (isset($package_info['cat']) && $package_info['cat'] != '') {

 

-                                $exclude_cats = explode(',', $package_info['cat']);

+								$exclude_cats = explode(',', $package_info['cat']);

 

-                            }

-                        }

-                    }

+							}

+						}

+					}

 

-                    $cat_display = unserialize($val['extra_fields']);

+					$cat_display = unserialize($val['extra_fields']);

 

-                    if (isset($_REQUEST['backandedit']) && (is_array($post_cat[$name]) && !empty($post_cat[$name]))) {

+					if (isset($_REQUEST['backandedit']) && (is_array($post_cat[$name]) && !empty($post_cat[$name]))) {

 

-                        $post_cat = implode(",", $post_cat[$name]);

+						$post_cat = implode(",", $post_cat[$name]);

 

-                    } else {

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

-                            $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);

-                    }

+					} else {

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

+							$post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);

+					}

 

 

-                    global $geodir_addon_list;

-                    if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

+					global $geodir_addon_list;

+					if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

 

-                        $catadd_limit = $wpdb->get_var(

-                            $wpdb->prepare(

-                                "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",

-                                array($package_id)

-                            )

-                        );

+						$catadd_limit = $wpdb->get_var(

+							$wpdb->prepare(

+								"SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",

+								array($package_id)

+							)

+						);

 

 

-                    } else {

-                        $catadd_limit = 0;

-                    }

+					} else {

+						$catadd_limit = 0;

+					}

 

 

-                    if ($cat_display != '' && $cat_display != 'ajax_chained') {

+					if ($cat_display != '' && $cat_display != 'ajax_chained') {

 

-                        $required_limit_msg = '';

-                        if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {

+						$required_limit_msg = '';

+						if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {

 

-                            $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');

+							$required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');

 

-                        } else {

-                            $required_limit_msg = $required_msg;

-                        }

+						} else {

+							$required_limit_msg = $required_msg;

+						}

 

-                        echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';

+						echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';

 

 

-                        if ($cat_display == 'select' || $cat_display == 'multiselect') {

+						if ($cat_display == 'select' || $cat_display == 'multiselect') {

 

-                            $cat_display == '';

-                            $multiple = '';

-                            if ($cat_display == 'multiselect')

-                                $multiple = 'multiple="multiple"';

+							$cat_display == '';

+							$multiple = '';

+							if ($cat_display == 'multiselect')

+								$multiple = 'multiple="multiple"';

 

-                            echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

+							echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

 

 

-                            if ($cat_display == 'select')

-                                echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';

+							if ($cat_display == 'select')

+								echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';

 

-                        }

+						}

 

-                        echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);

+						echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);

 

-                        if ($cat_display == 'select' || $cat_display == 'multiselect')

-                            echo '</select>';

+						if ($cat_display == 'select' || $cat_display == 'multiselect')

+							echo '</select>';

 

-                    } else {

+					} else {

 

-                        echo geodir_custom_taxonomy_walker2($name, $catadd_limit);

+						echo geodir_custom_taxonomy_walker2($name, $catadd_limit);

 

-                    }

+					}

 

-                    ?>

+					?>

                 </div>

 

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

@@ -2015,46 +2015,46 @@ 
 

 

 

-            // adjust values here

-            $file_id = $name; // 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

+			$file_id = $name; // 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

 

-            if ($value != '') {

+			if ($value != '') {

 

-                $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.

+				$file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.

 

-            } else

-                $file_value = '';

+			} else

+				$file_value = '';

 

-            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])

-                $file_multiple = true; // allow multiple files upload

-            else

-                $file_multiple = false;

+			if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])

+				$file_multiple = true; // allow multiple files upload

+			else

+				$file_multiple = false;

 

-            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])

-                $file_image_limit = $extra_fields['image_limit'];

-            else

-                $file_image_limit = 1;

+			if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])

+				$file_image_limit = $extra_fields['image_limit'];

+			else

+				$file_image_limit = 1;

 

-            $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+			$file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-            $file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+			$file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-            if (!empty($file_value)) {

-                $curImages = explode(',', $file_value);

-                if (!empty($curImages))

-                    $file_totImg = count($curImages);

-            }

+			if (!empty($file_value)) {

+				$curImages = explode(',', $file_value);

+				if (!empty($curImages))

+					$file_totImg = count($curImages);

+			}

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

-            $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

+			$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

 

-            ?>

+			?>

             <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>

 				 <?php if($file_image_limit!=0 && $file_image_limit==1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('image with this package').')</small>';} ?>

 				 <?php if($file_image_limit!=0 && $file_image_limit>1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('images with this package').')</small>';} ?>

 				 <?php if($file_image_limit==0){echo '<br /><small>('.__('You can upload unlimited images with this package').')</small>';} ?>

 			</h5>   <?php */

-            ?>

+			?>

 

             <div id="<?php echo $name;?>_row"

                  class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

@@ -2062,7 +2062,7 @@ 
                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+						echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2074,17 +2074,17 @@ 
                     <?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

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

-                               echo esc_attr($file_totImg);

-                           } else {

-                               echo '0';

-                           } ?>"/>

+							   echo esc_attr($file_totImg);

+						   } else {

+							   echo '0';

+						   } ?>"/>

 

                     <div style="float:left; width:55%;">

                         <div

                             class="plupload-upload-uic hide-if-no-js <?php if ($file_multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

                             id="<?php echo $file_id; ?>plupload-upload-ui" style="float:left; width:30%;">

                             <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */

-                            ?>

+							?>

                             <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"

                                    value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"

                                    class="geodir_button" style="margin-top:10px;"/>

@@ -2103,7 +2103,7 @@ 
                             style=" clear:inherit; margin-top:0; margin-left:15px; padding-top:10px; float:left; width:50%;">

                         </div>

                         <?php /*?><span id="upload-msg" ><?php _e('Please drag &amp; drop the images to rearrange the order');?></span><?php */

-                        ?>

+						?>

 

                         <span id="<?php echo $file_id; ?>upload-error" style="display:none"></span>

 

@@ -2117,178 +2117,178 @@ 
 

 

         <?php }

-        /**

-         * Called after the custom fields info is output for submitting a post.

-         *

-         * Used dynamic hook type geodir_after_custom_form_field_$name.

-         *

-         * @since 1.0.0

-         * @param string $listing_type The post post type.

-         * @param int $package_id The price package ID for the post.

-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

-         * @see 'geodir_before_custom_form_field_$name'

-         */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

-

-    }

+		/**

+		 * Called after the custom fields info is output for submitting a post.

+		 *

+		 * Used dynamic hook type geodir_after_custom_form_field_$name.

+		 *

+		 * @since 1.0.0

+		 * @param string $listing_type The post post type.

+		 * @param int $package_id The price package ID for the post.

+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

+		 * @see 'geodir_before_custom_form_field_$name'

+		 */

+		do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+

+	}

 

 }

 

 

 if (!function_exists('geodir_get_field_infoby')) {

-    /**

-     * Get custom field using key and value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $key The key you want to look for.

-     * @param string $value The value of the key you want to look for.

-     * @param string $geodir_post_type The post type.

-     * @return bool|mixed Returns field info when available. otherwise returns false.

-     */

-    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

-    {

-

-        global $wpdb;

-

-        $filter = $wpdb->get_row(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

-                array($geodir_post_type)

-            )

-        );

-

-        if ($filter) {

-            return $filter;

-        } else {

-            return false;

-        }

-

-    }

+	/**

+	 * Get custom field using key and value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $key The key you want to look for.

+	 * @param string $value The value of the key you want to look for.

+	 * @param string $geodir_post_type The post type.

+	 * @return bool|mixed Returns field info when available. otherwise returns false.

+	 */

+	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

+	{

+

+		global $wpdb;

+

+		$filter = $wpdb->get_row(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+				array($geodir_post_type)

+			)

+		);

+

+		if ($filter) {

+			return $filter;

+		} else {

+			return false;

+		}

+

+	}

 }

 

 

 if (!function_exists('geodir_show_listing_info')) {

-    /**

-     * Show listing info depending on field location.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Custom fields option values added to db translation.

-     *              Changes to display url fields title.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

-     * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

-     *

-     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

-     * @return string Returns listing info html.

-     */

-    function geodir_show_listing_info($fields_location = '') {

-        global $post, $preview, $wpdb, $send_to_friend;

-

-        $payment_info = array();

-        $package_info = array();

-

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

-        $post_package_id = $package_info->pid;

-        $p_type = (geodir_get_current_posttype()) ? geodir_get_current_posttype() : $post->post_type;

-        $send_to_friend = false;

-

-        ob_start();

-        $fields_info = geodir_post_custom_fields($post_package_id, 'default', $p_type, $fields_location);

-

-        if (!empty($fields_info)) {

-            $post = stripslashes_deep($post); // strip slashes

+	/**

+	 * Show listing info depending on field location.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Custom fields option values added to db translation.

+	 *              Changes to display url fields title.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

+	 * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

+	 *

+	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

+	 * @return string Returns listing info html.

+	 */

+	function geodir_show_listing_info($fields_location = '') {

+		global $post, $preview, $wpdb, $send_to_friend;

+

+		$payment_info = array();

+		$package_info = array();

+

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

+		$post_package_id = $package_info->pid;

+		$p_type = (geodir_get_current_posttype()) ? geodir_get_current_posttype() : $post->post_type;

+		$send_to_friend = false;

+

+		ob_start();

+		$fields_info = geodir_post_custom_fields($post_package_id, 'default', $p_type, $fields_location);

+

+		if (!empty($fields_info)) {

+			$post = stripslashes_deep($post); // strip slashes

             

-            //echo '<div class="geodir-company_info field-group">';

-            $field_set_start = 0;

+			//echo '<div class="geodir-company_info field-group">';

+			$field_set_start = 0;

 

 

-            if ($fields_location == 'detail')

+			if ($fields_location == 'detail')

 

-                $i = 1;

-            foreach ($fields_info as $type) {

-                $type = stripslashes_deep($type); // strip slashes

-                $html = '';

-                $html_var = '';

-                $field_icon = '';

+				$i = 1;

+			foreach ($fields_info as $type) {

+				$type = stripslashes_deep($type); // strip slashes

+				$html = '';

+				$html_var = '';

+				$field_icon = '';

 

-                $variables_array = array();

+				$variables_array = array();

 

-                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                    continue;

-                }

+				if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+					continue;

+				}

 

-                if ($type['type'] != 'fieldset'):

-                    $variables_array['post_id'] = $post->ID;

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

-                    $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

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

-                endif;

+				if ($type['type'] != 'fieldset'):

+					$variables_array['post_id'] = $post->ID;

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

+					$variables_array['value'] = '';

+					if (isset($post->{$type['htmlvar_name']}))

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

+				endif;

 

-                //if($type['field_icon'])

+				//if($type['field_icon'])

 

-                if (strpos($type['field_icon'], 'http') !== false) {

-                    $field_icon = ' background: url(' . $type['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

-                } elseif (strpos($type['field_icon'], 'fa fa-') !== false) {

-                    $field_icon = '<i class="' . $type['field_icon'] . '"></i>';

-                }

-                //else{$field_icon = $type['field_icon'];}

+				if (strpos($type['field_icon'], 'http') !== false) {

+					$field_icon = ' background: url(' . $type['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+				} elseif (strpos($type['field_icon'], 'fa fa-') !== false) {

+					$field_icon = '<i class="' . $type['field_icon'] . '"></i>';

+				}

+				//else{$field_icon = $type['field_icon'];}

 

 

-                switch ($type['type']) {

+				switch ($type['type']) {

 

-                    case 'fieldset':

+					case 'fieldset':

 

-                        $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($type['site_title']);

+						$fieldset_class = 'fieldset-'.sanitize_title_with_dashes($type['site_title']);

 

-                        if ($field_set_start == 1) {

-                            echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

-                        } else {

-                            echo '<h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

-                            $field_set_start = 1;

-                        }

+						if ($field_set_start == 1) {

+							echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+						} else {

+							echo '<h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+							$field_set_start = 1;

+						}

 

-                        break;

+						break;

 

-                    case 'address':

+					case 'address':

 

-                        $html_var = $type['htmlvar_name'] . '_address';

+						$html_var = $type['htmlvar_name'] . '_address';

 

-                        if ($type['extra_fields']) {

+						if ($type['extra_fields']) {

 

-                            $extra_fields = unserialize($type['extra_fields']);

+							$extra_fields = unserialize($type['extra_fields']);

 

-                            $addition_fields = '';

+							$addition_fields = '';

 

-                            if (!empty($extra_fields)) {

-                                /**

-                                 * Filter "show city in address" value.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                $show_city_in_address = apply_filters('geodir_show_city_in_address', false);

-                                if (isset($extra_fields['show_city']) && $extra_fields['show_city'] && $show_city_in_address) {

-                                    $field = $type['htmlvar_name'] . '_city';

-                                    if ($post->{$field}) {

-                                        $addition_fields .= ', ' . $post->{$field};

-                                    }

-                                }

+							if (!empty($extra_fields)) {

+								/**

+								 * Filter "show city in address" value.

+								 *

+								 * @since 1.0.0

+								 */

+								$show_city_in_address = apply_filters('geodir_show_city_in_address', false);

+								if (isset($extra_fields['show_city']) && $extra_fields['show_city'] && $show_city_in_address) {

+									$field = $type['htmlvar_name'] . '_city';

+									if ($post->{$field}) {

+										$addition_fields .= ', ' . $post->{$field};

+									}

+								}

 

 

-                                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                    $field = $type['htmlvar_name'] . '_zip';

-                                    if ($post->{$field}) {

-                                        $addition_fields .= ', ' . $post->{$field};

-                                    }

-                                }

+								if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+									$field = $type['htmlvar_name'] . '_zip';

+									if ($post->{$field}) {

+										$addition_fields .= ', ' . $post->{$field};

+									}

+								}

 

-                            }

+							}

 

-                        }

-                        /*if($type['extra_fields'])

+						}

+						/*if($type['extra_fields'])

 						{

 							

 							$extra_fields = unserialize($type['extra_fields']);

@@ -2337,1034 +2337,1034 @@ 
 						

 						}*/

 

-                        if ($post->{$html_var}):

+						if ($post->{$html_var}):

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-home"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"  itemscope itemtype="http://schema.org/PostalAddress">';

+							$html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

+							$html .= '</span>';

+

+							if ($preview) {

+								$html .= $post->{$html_var} . $addition_fields . '</p></div>';

+							} else {

+								if ($post->post_address) {

+									$html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';

+								}

+								if ($post->post_city) {

+									$html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';

+								}

+								if ($post->post_region) {

+									$html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';

+								}

+								if ($post->post_zip) {

+									$html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';

+								}

+								if ($post->post_country) {

+									$html .= '<span itemprop="addressCountry">' . __($post->post_country, 'geodirectory') . '</span><br>';

+								}

+								$html .= '</div>';

+							}

+

+

+						endif;

+

+						$variables_array['value'] = $post->{$html_var};

+

+						break;

+

+					case 'url':

+

+						$html_var = $type['htmlvar_name'];

+

+						if ($post->{$type['htmlvar_name']}):

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+

+								if ($type['name'] == 'geodir_facebook') {

+									$field_icon_af = '<i class="fa fa-facebook-square"></i>';

+								} elseif ($type['name'] == 'geodir_twitter') {

+									$field_icon_af = '<i class="fa fa-twitter-square"></i>';

+								} else {

+									$field_icon_af = '<i class="fa fa-link"></i>';

+								}

+

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

+

+

+							$website = !empty($a_url['url']) ? $a_url['url'] : '';

+							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

+							if(!empty($type['default_value'])){$title = $type['default_value'];}

+							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-home"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

 

-                                $i++;

-                            }

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"  itemscope itemtype="http://schema.org/PostalAddress">';

-                            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span>';

+								$i++;

+							}

+

+

+							// all search engines that use the nofollow value exclude links that use it from their ranking calculation

+							$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';

+							/**

+							 * Filter custom field website name.

+							 *

+							 * @since 1.0.0

+							 *

+							 * @param string $title Website Title.

+							 * @param string $website Website URL.

+							 * @param int $post->ID Post ID.

+							 */

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';

+

+						endif;

+

+						break;

+

+					case 'phone':

+

+						$html_var = $type['htmlvar_name'];

+

+						if ($post->{$type['htmlvar_name']}):

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-phone"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .

+								$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

+							$html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$type['htmlvar_name']}) . '">' . $post->{$type['htmlvar_name']} . '</a></div>';

+

+						endif;

+

+						break;

+

+					case 'time':

+

+						$html_var = $type['htmlvar_name'];

+

+						if ($post->{$type['htmlvar_name']}):

+

+							$value = '';

+							if ($post->{$type['htmlvar_name']} != '')

+								//$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

+								$value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-clock-o"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

+							$html .= '</span>' . $value . '</div>';

+

+						endif;

+

+						break;

+

+					case 'datepicker':

+

+						if ($post->{$type['htmlvar_name']}):

+

+							$date_format = geodir_default_date_format();

+							if ($type['extra_fields'] != '') {

+								$date_format = unserialize($type['extra_fields']);

+								$date_format = $date_format['date_format'];

+							}

+							// check if we need to change the format or not

+							$date_format_len = strlen(str_replace(' ', '', $date_format));

+							if($date_format_len>5){// if greater then 4 then it's the old style format.

+

+								$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

+								$replace = array('d','j','l','m','n','F','Y');//PHP date format

+

+								$date_format = str_replace($search, $replace, $date_format);

+

+								$post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

+							}else{

+								$post_htmlvar_value = $post->{$type['htmlvar_name']};

+							}

+

+							if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']}!="0000-00-00") {

+								$value = date_i18n($date_format, strtotime($post_htmlvar_value));

+							}else{

+								continue;

+							}

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-calendar"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . $value . '</div>';

+

+						endif;

+

+						break;

+

+					case 'text':

+

+						$html_var = $type['htmlvar_name'];

+

+						if (isset($post->{$type['htmlvar_name']}) && $post->{$type['htmlvar_name']} != '' && $type['htmlvar_name'] == 'geodir_timing'):

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-clock-o"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

+							$html .= '</span>' . $post->{$type['htmlvar_name']} . '</div>';

+

+						elseif (isset($post->{$type['htmlvar_name']}) && $post->{$type['htmlvar_name']}):

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . $post->{$type['htmlvar_name']} . '</div>';

+

+						endif;

+

+						break;

+

+					case 'radio':

+

+						$html_var = $type['htmlvar_name'];

+						if(!isset($post->{$type['htmlvar_name']})){continue;}

+						$html_val = __($post->{$type['htmlvar_name']}, 'geodirectory');

+						if ($post->{$type['htmlvar_name']} != ''):

+

+							if ($post->{$type['htmlvar_name']} == 'f' || $post->{$type['htmlvar_name']} == '0') {

+								$html_val = __('No', 'geodirectory');

+							} else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

+								$html_val = __('Yes', 'geodirectory');

+							} else {

+								if (!empty($type['option_values'])) {

+									$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+

+									if (!empty($cf_option_values)) {

+										foreach ($cf_option_values as $cf_option_value) {

+											if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

+												$html_val = $cf_option_value['label'];

+											}

+										}

+									}

+								}

+							}

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

 

-                            if ($preview) {

-                                $html .= $post->{$html_var} . $addition_fields . '</p></div>';

-                            } else {

-                                if ($post->post_address) {

-                                    $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';

-                                }

-                                if ($post->post_city) {

-                                    $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';

-                                }

-                                if ($post->post_region) {

-                                    $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';

-                                }

-                                if ($post->post_zip) {

-                                    $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';

-                                }

-                                if ($post->post_country) {

-                                    $html .= '<span itemprop="addressCountry">' . __($post->post_country, 'geodirectory') . '</span><br>';

-                                }

-                                $html .= '</div>';

-                            }

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

 

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

 

-                        endif;

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . $html_val . '</div>';

+						endif;

+

+						break;

+

+					case 'checkbox':

+

+						$html_var = $type['htmlvar_name'];

+

+						if ((int)$post->{$html_var} == 1):

+

+							if ($post->{$type['htmlvar_name']} == '1'):

+								$html_val = __('Yes', 'geodirectory');

+							else:

+								$html_val = __('No', 'geodirectory');

+							endif;

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . $html_val . '</div>';

+						endif;

+

+						break;

+

+					case 'select':

+

+						$html_var = $type['htmlvar_name'];

+						if(!isset($post->{$type['htmlvar_name']})){continue;}

+						if ($post->{$type['htmlvar_name']}):

+							$field_value = __($post->{$type['htmlvar_name']}, 'geodirectory');

+

+							if (!empty($type['option_values'])) {

+								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+

+								if (!empty($cf_option_values)) {

+									foreach ($cf_option_values as $cf_option_value) {

+										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

+											//$field_value = $cf_option_value['label']; // no longer needed here.

+										}

+									}

+								}

+							}

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . $field_value . '</div>';

+						endif;

+

+						break;

+

+

+					case 'multiselect':

+

+						$html_var = $type['htmlvar_name'];

+

+						if (!empty($post->{$type['htmlvar_name']})):

+

+							if (is_array($post->{$type['htmlvar_name']})) {

+								$post->{$type['htmlvar_name']} = implode(', ', $post->{$type['htmlvar_name']});

+							}

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$field_values = explode(',', trim($post->{$type['htmlvar_name']}, ","));

 

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

+							$option_values = array();

+							if (!empty($type['option_values'])) {

+								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 

-                        break;

+								if (!empty($cf_option_values)) {

+									foreach ($cf_option_values as $cf_option_value) {

+										if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

+											$option_values[] = $cf_option_value['label'];

+										}

+									}

+								}

+							}

 

-                    case 'url':

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

 

-                        $html_var = $type['htmlvar_name'];

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

 

-                        if ($post->{$type['htmlvar_name']}):

+								$i++;

+							}

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>';

 

-                                if ($type['name'] == 'geodir_facebook') {

-                                    $field_icon_af = '<i class="fa fa-facebook-square"></i>';

-                                } elseif ($type['name'] == 'geodir_twitter') {

-                                    $field_icon_af = '<i class="fa fa-twitter-square"></i>';

-                                } else {

-                                    $field_icon_af = '<i class="fa fa-link"></i>';

-                                }

+							if (count($option_values) > 1) {

+								$html .= '<ul>';

 

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+								foreach ($option_values as $val) {

+									$html .= '<li>' . $val . '</li>';

+								}

 

-                            $a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

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

+							} else {

+								$html .= $post->{$type['htmlvar_name']};

+							}

 

+							$html .= '</div>';

+						endif;

+						break;

+					case 'email':

+						$html_var = $type['htmlvar_name'];

+						if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

+							continue; // Remove Send Enquiry | Send To Friend from listings page

+						}

+

+						if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

+							$send_to_friend = true;

+							$b_send_inquiry = '';

+							$b_sendtofriend = '';

+

+							$html = '';

+							if (!$preview) {

+								$b_send_inquiry = 'b_send_inquiry';

+								$b_sendtofriend = 'b_sendtofriend';

+								$html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';

+							}

 

-                            $website = !empty($a_url['url']) ? $a_url['url'] : '';

-                            $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

-                            if(!empty($type['default_value'])){$title = $type['default_value'];}

-                            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-envelope"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

 

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+								$i++;

+							}

 

-                                $i++;

-                            }

+							$html .= '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

+							$seperator = '';

+							if ($post->{$type['htmlvar_name']}) {

+								$html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';

+								$seperator = ' | ';

+							}

 

+							if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {

+								$html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';

+							}

 

-                            // all search engines that use the nofollow value exclude links that use it from their ranking calculation

-                            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';

-                            /**

-                             * Filter custom field website name.

-                             *

-                             * @since 1.0.0

-                             *

-                             * @param string $title Website Title.

-                             * @param string $website Website URL.

-                             * @param int $post->ID Post ID.

-                             */

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';

+							$html .= '</span></div>';

 

-                        endif;

 

-                        break;

+							if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {

+								$html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';

+							} elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {

+								$html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';

+							} elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {

+								$html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';

+							}

 

-                    case 'phone':

+							/*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/

 

-                        $html_var = $type['htmlvar_name'];

+						} else {

 

-                        if ($post->{$type['htmlvar_name']}):

+							if ($post->{$type['htmlvar_name']}) {

+								if (strpos($field_icon, 'http') !== false) {

+									$field_icon_af = '';

+								} elseif ($field_icon == '') {

+									$field_icon_af = '<i class="fa fa-envelope"></i>';

+								} else {

+									$field_icon_af = $field_icon;

+									$field_icon = '';

+								}

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-phone"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+								$geodir_odd_even = '';

+								if ($fields_location == 'detail') {

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

+									$geodir_odd_even = 'geodir_more_info_odd';

+									if ($i % 2 == 0)

+										$geodir_odd_even = 'geodir_more_info_even';

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+									$i++;

+								}

 

-                                $i++;

-                            }

+								$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

+								$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+								$html .= '</span><span class="geodir-email-address-output">';

+								$email = $post->{$type['htmlvar_name']} ;

+								if($e_split = explode('@',$email)){

+									/**

+									 * Filter email custom field name output.

+									 *

+									 * @since 1.5.3

+									 *

+									 * @param string $email The email string being output.

+									 * @param array $type Custom field variables array.

+									 */

+									$email_name = apply_filters('geodir_email_field_name_output',$email,$type);

+									$html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

+								}else{

+									$html .=  $email;

+								}

+								$html .= '</span></div>';

+							}

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$type['htmlvar_name']}) . '">' . $post->{$type['htmlvar_name']} . '</a></div>';

+						}

 

-                        endif;

+						break;

 

-                        break;

 

-                    case 'time':

+					case 'file':

 

-                        $html_var = $type['htmlvar_name'];

+						$html_var = $type['htmlvar_name'];

 

-                        if ($post->{$type['htmlvar_name']}):

+						if (!empty($post->{$type['htmlvar_name']})):

 

-                            $value = '';

-                            if ($post->{$type['htmlvar_name']} != '')

-                                //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

-                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));

+							$files = explode(",", $post->{$type['htmlvar_name']});

+							if (!empty($files)):

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-clock-o"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+								$extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

+								$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

+								$file_paths = '';

+								foreach ($files as $file) {

+									if (!empty($file)) {

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+										// $filetype = wp_check_filetype($file);

 

-                                $i++;

-                            }

+										$image_name_arr = explode('/', $file);

+										$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

+										$filename = end($image_name_arr);

+										$img_name_arr = explode('.', $filename);

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span>' . $value . '</div>';

+										$arr_file_type = wp_check_filetype($filename);

+										if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+											continue;

+										}

 

-                        endif;

+										$uploaded_file_type = $arr_file_type['type'];

+										$uploaded_file_ext = $arr_file_type['ext'];

 

-                        break;

+										if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+											continue; // Invalid file type.

+										}

 

-                    case 'datepicker':

+										//$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

+										$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

 

-                        if ($post->{$type['htmlvar_name']}):

+										// If the uploaded file is image

+										if (in_array($uploaded_file_type, $image_file_types)) {

+											$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

+											$file_paths .= '<a href="'.$file.'">';

+											$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

+											$file_paths .= '</a>';

+											//$file_paths .= '<img src="'.$file.'"  />';	

+											$file_paths .= '</div>';

+										} else {

+											$ext_path = '_' . $html_var . '_';

+											$filename = explode($ext_path, $filename);

+											$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

+										}

+									}

+								}

 

-                            $date_format = geodir_default_date_format();

-                            if ($type['extra_fields'] != '') {

-                                $date_format = unserialize($type['extra_fields']);

-                                $date_format = $date_format['date_format'];

-                            }

-                            // check if we need to change the format or not

-                            $date_format_len = strlen(str_replace(' ', '', $date_format));

-                            if($date_format_len>5){// if greater then 4 then it's the old style format.

+								if (strpos($field_icon, 'http') !== false) {

+									$field_icon_af = '';

+								} elseif ($field_icon == '') {

+									$field_icon_af = '';

+								} else {

+									$field_icon_af = $field_icon;

+									$field_icon = '';

+								}

 

-                                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                                $replace = array('d','j','l','m','n','F','Y');//PHP date format

+								$geodir_odd_even = '';

+								if ($fields_location == 'detail') {

 

-                                $date_format = str_replace($search, $replace, $date_format);

+									$geodir_odd_even = 'geodir_more_info_odd';

+									if ($i % 2 == 0)

+										$geodir_odd_even = 'geodir_more_info_even';

 

-                                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

-                            }else{

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

-                            }

+									$i++;

+								}

 

-                            if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']}!="0000-00-00") {

-                                $value = date_i18n($date_format, strtotime($post_htmlvar_value));

-                            }else{

-                                continue;

-                            }

+								$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' geodir-custom-file-box ' . $type['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

+								$html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';

+								$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+								$html .= '</span>';

+								$html .= $file_paths . '</div></div>';

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-calendar"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+							endif;

+						endif;

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

+						break;

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+					case 'textarea':

+						$html_var = $type['htmlvar_name'];

 

-                                $i++;

-                            }

+						if (!empty($post->{$type['htmlvar_name']})) {

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $value . '</div>';

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

+

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

+

+								$i++;

+							}

 

-                        endif;

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . wpautop($post->{$type['htmlvar_name']}) . '</div>';

 

-                        break;

+						}

+						break;

 

-                    case 'text':

+					case 'html':

+						if (!empty($post->{$type['htmlvar_name']})) {

 

-                        $html_var = $type['htmlvar_name'];

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

 

-                        if (isset($post->{$type['htmlvar_name']}) && $post->{$type['htmlvar_name']} != '' && $type['htmlvar_name'] == 'geodir_timing'):

+							$geodir_odd_even = '';

+							if ($fields_location == 'detail') {

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-clock-o"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+								$geodir_odd_even = 'geodir_more_info_odd';

+								if ($i % 2 == 0)

+									$geodir_odd_even = 'geodir_more_info_even';

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

+								$i++;

+							}

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

+							$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+							$html .= '</span>' . wpautop($post->{$type['htmlvar_name']}) . '</div>';

+

+						}

+						break;

+					case 'taxonomy': {

+						$html_var = $type['htmlvar_name'];

+						if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {

+							$post_taxonomy = $post->post_type . 'category';

+							$field_value = $post->{$html_var};

+							$links = array();

+							$terms = array();

+							$termsOrdered = array();

+							if (!is_array($field_value)) {

+								$field_value = explode(",", trim($field_value, ","));

+							}

 

-                                $i++;

-                            }

+							$field_value = array_unique($field_value);

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span>' . $post->{$type['htmlvar_name']} . '</div>';

+							if (!empty($field_value)) {

+								foreach ($field_value as $term) {

+									$term = trim($term);

 

-                        elseif (isset($post->{$type['htmlvar_name']}) && $post->{$type['htmlvar_name']}):

+									if ($term != '') {

+										$term = get_term_by('id', $term, $html_var);

+										if (is_object($term)) {

+											$links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";

+											$terms[] = $term;

+										}

+									}

+								}

+								if (!empty($links)) {

+									// order alphabetically

+									asort($links);

+									foreach (array_keys($links) as $key) {

+										$termsOrdered[$key] = $terms[$key];

+									}

+									$terms = $termsOrdered;

+								}

+							}

+							$html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';

+

+							if ($html_value != '') {

+								if (strpos($field_icon, 'http') !== false) {

+									$field_icon_af = '';

+								} else if ($field_icon == '') {

+									$field_icon_af = '';

+								} else {

+									$field_icon_af = $field_icon;

+									$field_icon = '';

+								}

+

+								$geodir_odd_even = '';

+								if ($fields_location == 'detail') {

+									$geodir_odd_even = 'geodir_more_info_odd';

+									if ($i % 2 == 0) {

+										$geodir_odd_even = 'geodir_more_info_even';

+									}

+									$i++;

+								}

+

+								$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;

+								$html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+								$html .= '</span> ' . $html_value . '</div>';

+							}

+						}

+					}

+						break;

 

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+				}

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $post->{$type['htmlvar_name']} . '</div>';

+				if ($html):

 

-                        endif;

+					/**

+					 * Called before a custom fields is output on the frontend.

+					 *

+					 * @since 1.0.0

+					 * @param string $html_var The HTML variable name for the field.

+					 */

+					do_action("geodir_before_show_{$html_var}");

+					/**

+					 * Filter custom field output.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

 

-                        break;

+					/**

+					 * Called after a custom fields is output on the frontend.

+					 *

+					 * @since 1.0.0

+					 * @param string $html_var The HTML variable name for the field.

+					 */

+					do_action("geodir_after_show_{$html_var}");

 

-                    case 'radio':

+				endif;

 

-                        $html_var = $type['htmlvar_name'];

-                        if(!isset($post->{$type['htmlvar_name']})){continue;}

-                        $html_val = __($post->{$type['htmlvar_name']}, 'geodirectory');

-                        if ($post->{$type['htmlvar_name']} != ''):

-

-                            if ($post->{$type['htmlvar_name']} == 'f' || $post->{$type['htmlvar_name']} == '0') {

-                                $html_val = __('No', 'geodirectory');

-                            } else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

-                                $html_val = __('Yes', 'geodirectory');

-                            } else {

-                                if (!empty($type['option_values'])) {

-                                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

-

-                                    if (!empty($cf_option_values)) {

-                                        foreach ($cf_option_values as $cf_option_value) {

-                                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

-                                                $html_val = $cf_option_value['label'];

-                                            }

-                                        }

-                                    }

-                                }

-                            }

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+			}

 

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

+			//echo '</div>';

 

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+		}

 

-                                $i++;

-                            }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $html_val . '</div>';

-                        endif;

-

-                        break;

-

-                    case 'checkbox':

-

-                        $html_var = $type['htmlvar_name'];

-

-                        if ((int)$post->{$html_var} == 1):

+		return $html = ob_get_clean();

 

-                            if ($post->{$type['htmlvar_name']} == '1'):

-                                $html_val = __('Yes', 'geodirectory');

-                            else:

-                                $html_val = __('No', 'geodirectory');

-                            endif;

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $html_val . '</div>';

-                        endif;

-

-                        break;

-

-                    case 'select':

-

-                        $html_var = $type['htmlvar_name'];

-                        if(!isset($post->{$type['htmlvar_name']})){continue;}

-                        if ($post->{$type['htmlvar_name']}):

-                            $field_value = __($post->{$type['htmlvar_name']}, 'geodirectory');

-

-                            if (!empty($type['option_values'])) {

-                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

-

-                                if (!empty($cf_option_values)) {

-                                    foreach ($cf_option_values as $cf_option_value) {

-                                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

-                                            //$field_value = $cf_option_value['label']; // no longer needed here.

-                                        }

-                                    }

-                                }

-                            }

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $field_value . '</div>';

-                        endif;

-

-                        break;

-

-

-                    case 'multiselect':

-

-                        $html_var = $type['htmlvar_name'];

-

-                        if (!empty($post->{$type['htmlvar_name']})):

-

-                            if (is_array($post->{$type['htmlvar_name']})) {

-                                $post->{$type['htmlvar_name']} = implode(', ', $post->{$type['htmlvar_name']});

-                            }

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $field_values = explode(',', trim($post->{$type['htmlvar_name']}, ","));

-

-                            $option_values = array();

-                            if (!empty($type['option_values'])) {

-                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

-

-                                if (!empty($cf_option_values)) {

-                                    foreach ($cf_option_values as $cf_option_value) {

-                                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

-                                            $option_values[] = $cf_option_value['label'];

-                                        }

-                                    }

-                                }

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>';

-

-                            if (count($option_values) > 1) {

-                                $html .= '<ul>';

-

-                                foreach ($option_values as $val) {

-                                    $html .= '<li>' . $val . '</li>';

-                                }

-

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

-                            } else {

-                                $html .= $post->{$type['htmlvar_name']};

-                            }

-

-                            $html .= '</div>';

-                        endif;

-                        break;

-                    case 'email':

-                        $html_var = $type['htmlvar_name'];

-                        if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

-                            continue; // Remove Send Enquiry | Send To Friend from listings page

-                        }

-

-                        if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

-                            $send_to_friend = true;

-                            $b_send_inquiry = '';

-                            $b_sendtofriend = '';

-

-                            $html = '';

-                            if (!$preview) {

-                                $b_send_inquiry = 'b_send_inquiry';

-                                $b_sendtofriend = 'b_sendtofriend';

-                                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';

-                            }

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-envelope"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html .= '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

-                            $seperator = '';

-                            if ($post->{$type['htmlvar_name']}) {

-                                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';

-                                $seperator = ' | ';

-                            }

-

-                            if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {

-                                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';

-                            }

-

-                            $html .= '</span></div>';

-

-

-                            if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {

-                                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';

-                            } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {

-                                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';

-                            } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {

-                                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';

-                            }

-

-                            /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/

-

-                        } else {

-

-                            if ($post->{$type['htmlvar_name']}) {

-                                if (strpos($field_icon, 'http') !== false) {

-                                    $field_icon_af = '';

-                                } elseif ($field_icon == '') {

-                                    $field_icon_af = '<i class="fa fa-envelope"></i>';

-                                } else {

-                                    $field_icon_af = $field_icon;

-                                    $field_icon = '';

-                                }

-

-                                $geodir_odd_even = '';

-                                if ($fields_location == 'detail') {

-

-                                    $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

-

-                                    $i++;

-                                }

-

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                                $html .= '</span><span class="geodir-email-address-output">';

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

-                                if($e_split = explode('@',$email)){

-                                    /**

-                                     * Filter email custom field name output.

-                                     *

-                                     * @since 1.5.3

-                                     *

-                                     * @param string $email The email string being output.

-                                     * @param array $type Custom field variables array.

-                                     */

-                                    $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

-                                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

-                                }else{

-                                    $html .=  $email;

-                                }

-                                $html .= '</span></div>';

-                            }

-

-                        }

-

-                        break;

-

-

-                    case 'file':

-

-                        $html_var = $type['htmlvar_name'];

-

-                        if (!empty($post->{$type['htmlvar_name']})):

-

-                            $files = explode(",", $post->{$type['htmlvar_name']});

-                            if (!empty($files)):

-

-                                $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-                                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

-

-                                $file_paths = '';

-                                foreach ($files as $file) {

-                                    if (!empty($file)) {

-

-                                        // $filetype = wp_check_filetype($file);

-

-                                        $image_name_arr = explode('/', $file);

-                                        $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

-                                        $filename = end($image_name_arr);

-                                        $img_name_arr = explode('.', $filename);

-

-                                        $arr_file_type = wp_check_filetype($filename);

-                                        if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-                                            continue;

-                                        }

-

-                                        $uploaded_file_type = $arr_file_type['type'];

-                                        $uploaded_file_ext = $arr_file_type['ext'];

-

-                                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-                                            continue; // Invalid file type.

-                                        }

-

-                                        //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

-                                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

-

-                                        // If the uploaded file is image

-                                        if (in_array($uploaded_file_type, $image_file_types)) {

-                                            $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-                                            $file_paths .= '<a href="'.$file.'">';

-                                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

-                                            $file_paths .= '</a>';

-                                            //$file_paths .= '<img src="'.$file.'"  />';	

-                                            $file_paths .= '</div>';

-                                        } else {

-                                            $ext_path = '_' . $html_var . '_';

-                                            $filename = explode($ext_path, $filename);

-                                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

-                                        }

-                                    }

-                                }

-

-                                if (strpos($field_icon, 'http') !== false) {

-                                    $field_icon_af = '';

-                                } elseif ($field_icon == '') {

-                                    $field_icon_af = '';

-                                } else {

-                                    $field_icon_af = $field_icon;

-                                    $field_icon = '';

-                                }

-

-                                $geodir_odd_even = '';

-                                if ($fields_location == 'detail') {

-

-                                    $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

-

-                                    $i++;

-                                }

-

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' geodir-custom-file-box ' . $type['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                                $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                                $html .= '</span>';

-                                $html .= $file_paths . '</div></div>';

-

-                            endif;

-                        endif;

-

-                        break;

-

-                    case 'textarea':

-                        $html_var = $type['htmlvar_name'];

-

-                        if (!empty($post->{$type['htmlvar_name']})) {

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . wpautop($post->{$type['htmlvar_name']}) . '</div>';

-

-                        }

-                        break;

-

-                    case 'html':

-                        if (!empty($post->{$type['htmlvar_name']})) {

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = '';

-                            if ($fields_location == 'detail') {

-

-                                $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

-

-                                $i++;

-                            }

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . wpautop($post->{$type['htmlvar_name']}) . '</div>';

-

-                        }

-                        break;

-                    case 'taxonomy': {

-                        $html_var = $type['htmlvar_name'];

-                        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {

-                            $post_taxonomy = $post->post_type . 'category';

-                            $field_value = $post->{$html_var};

-                            $links = array();

-                            $terms = array();

-                            $termsOrdered = array();

-                            if (!is_array($field_value)) {

-                                $field_value = explode(",", trim($field_value, ","));

-                            }

-

-                            $field_value = array_unique($field_value);

-

-                            if (!empty($field_value)) {

-                                foreach ($field_value as $term) {

-                                    $term = trim($term);

-

-                                    if ($term != '') {

-                                        $term = get_term_by('id', $term, $html_var);

-                                        if (is_object($term)) {

-                                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";

-                                            $terms[] = $term;

-                                        }

-                                    }

-                                }

-                                if (!empty($links)) {

-                                    // order alphabetically

-                                    asort($links);

-                                    foreach (array_keys($links) as $key) {

-                                        $termsOrdered[$key] = $terms[$key];

-                                    }

-                                    $terms = $termsOrdered;

-                                }

-                            }

-                            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';

-

-                            if ($html_value != '') {

-                                if (strpos($field_icon, 'http') !== false) {

-                                    $field_icon_af = '';

-                                } else if ($field_icon == '') {

-                                    $field_icon_af = '';

-                                } else {

-                                    $field_icon_af = $field_icon;

-                                    $field_icon = '';

-                                }

-

-                                $geodir_odd_even = '';

-                                if ($fields_location == 'detail') {

-                                    $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0) {

-                                        $geodir_odd_even = 'geodir_more_info_even';

-                                    }

-                                    $i++;

-                                }

-

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                                $html .= '</span> ' . $html_value . '</div>';

-                            }

-                        }

-                    }

-                        break;

-

-                }

-

-                if ($html):

-

-                    /**

-                     * Called before a custom fields is output on the frontend.

-                     *

-                     * @since 1.0.0

-                     * @param string $html_var The HTML variable name for the field.

-                     */

-                    do_action("geodir_before_show_{$html_var}");

-                    /**

-                     * Filter custom field output.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

-

-                    /**

-                     * Called after a custom fields is output on the frontend.

-                     *

-                     * @since 1.0.0

-                     * @param string $html_var The HTML variable name for the field.

-                     */

-                    do_action("geodir_after_show_{$html_var}");

-

-                endif;

-

-            }

-

-            //echo '</div>';

-

-        }

-

-

-        return $html = ob_get_clean();

-

-    }

+	}

 }

 

 if (!function_exists('geodir_default_date_format')) {

-    /**

-     * Returns default date format.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return mixed|string|void Returns default date format.

-     */

-    function geodir_default_date_format()

-    {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

-    }

+	/**

+	 * Returns default date format.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return mixed|string|void Returns default date format.

+	 */

+	function geodir_default_date_format()

+	{

+		if ($format = get_option('date_format'))

+			return $format;

+		else

+			return 'dd-mm-yy';

+	}

 }

 

 if (!function_exists('geodir_get_formated_date')) {

-    /**

-     * Returns formatted date.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $date Date string to convert.

-     * @return bool|int|string Returns formatted date.

-     */

-    function geodir_get_formated_date($date)

-    {

-        return mysql2date(get_option('date_format'), $date);

-    }

+	/**

+	 * Returns formatted date.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $date Date string to convert.

+	 * @return bool|int|string Returns formatted date.

+	 */

+	function geodir_get_formated_date($date)

+	{

+		return mysql2date(get_option('date_format'), $date);

+	}

 }

 

 if (!function_exists('geodir_get_formated_time')) {

-    /**

-     * Returns formatted time.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $time Time string to convert.

-     * @return bool|int|string Returns formatted time.

-     */

-    function geodir_get_formated_time($time)

-    {

-        return mysql2date(get_option('time_format'), $time, $translate = true);

-    }

+	/**

+	 * Returns formatted time.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $time Time string to convert.

+	 * @return bool|int|string Returns formatted time.

+	 */

+	function geodir_get_formated_time($time)

+	{

+		return mysql2date(get_option('time_format'), $time, $translate = true);

+	}

 }

 

 

 if (!function_exists('geodir_save_post_file_fields')) {

-    /**

-     * Save post file fields

-     *

-     * @since 1.0.0

-     * @since 1.4.7 Added `$extra_fields` parameter.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @global object $current_user Current user object.

-     * @param int $post_id

-     * @param string $field_id

-     * @param array $post_image

-     * @param array $extra_fields Array of extra fields.

-     */

-    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

-    {

+	/**

+	 * Save post file fields

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.7 Added `$extra_fields` parameter.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @global object $current_user Current user object.

+	 * @param int $post_id

+	 * @param string $field_id

+	 * @param array $post_image

+	 * @param array $extra_fields Array of extra fields.

+	 */

+	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

+		global $wpdb, $plugin_prefix, $current_user;

 

-        $post_type = get_post_type($post_id);

-        //echo $field_id; exit;

-        $table = $plugin_prefix . $post_type . '_detail';

+		$post_type = get_post_type($post_id);

+		//echo $field_id; exit;

+		$table = $plugin_prefix . $post_type . '_detail';

 

-        $postcurr_images = array();

-        $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

-        $file_urls = '';

+		$postcurr_images = array();

+		$postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

+		$file_urls = '';

 

-        if (!empty($post_image)) {

+		if (!empty($post_image)) {

 

-            $invalid_files = array();

+			$invalid_files = array();

 

-            //Get and remove all old images of post from database to set by new order

-            $geodir_uploaddir = '';

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+			//Get and remove all old images of post from database to set by new order

+			$geodir_uploaddir = '';

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $geodir_uploadpath = $uploads['path'];

-            $geodir_uploadurl = $uploads['url'];

-            $sub_dir = $uploads['subdir'];

+			$geodir_uploadpath = $uploads['path'];

+			$geodir_uploadurl = $uploads['url'];

+			$sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

-            for ($m = 0; $m < count($post_image); $m++) {

+			for ($m = 0; $m < count($post_image); $m++) {

 

-                /* --------- start ------- */

+				/* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

-                    $curr_img_url = $post_image[$m];

-                    $image_name_arr = explode('/', $curr_img_url);

-                    $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

-                    $filename = end($image_name_arr);

-                    $img_name_arr = explode('.', $filename);

+					$curr_img_url = $post_image[$m];

+					$image_name_arr = explode('/', $curr_img_url);

+					$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

+					$filename = end($image_name_arr);

+					$img_name_arr = explode('.', $filename);

 

-                    $arr_file_type = wp_check_filetype($filename);

+					$arr_file_type = wp_check_filetype($filename);

 

-                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-                        continue;

-                    }

+					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+						continue;

+					}

 

-                    $uploaded_file_type = $arr_file_type['type'];

-                    $uploaded_file_ext = $arr_file_type['ext'];

+					$uploaded_file_type = $arr_file_type['type'];

+					$uploaded_file_ext = $arr_file_type['ext'];

 

-                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-                        continue; // Invalid file type.

-                    }

+					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+						continue; // Invalid file type.

+					}

 

-                    // Set an array containing a list of acceptable formats

-                    //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

+					// Set an array containing a list of acceptable formats

+					//$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-                    if (!function_exists('wp_handle_upload'))

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

+					if (!function_exists('wp_handle_upload'))

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

 

-                    if (!is_dir($geodir_uploadpath))

-                        mkdir($geodir_uploadpath);

+					if (!is_dir($geodir_uploadpath))

+						mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

-                    $explode_sub_dir = explode("/", $sub_dir);

-                    if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

-                    } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-                    }

+					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+					$explode_sub_dir = explode("/", $sub_dir);

+					if ($curr_img_dir == end($explode_sub_dir)) {

+						$img_path = $geodir_uploadpath . '/' . $filename;

+						$img_url = $geodir_uploadurl . '/' . $filename;

+					} else {

+						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+					}

 

-                    $uploaded_file = '';

-                    if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+					$uploaded_file = '';

+					if (file_exists($img_path))

+						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

 

-                    if ($curr_img_dir != $geodir_uploaddir) {

-                        if (file_exists($img_path))

-                            unlink($img_path);

-                    }

+					if ($curr_img_dir != $geodir_uploaddir) {

+						if (file_exists($img_path))

+							unlink($img_path);

+					}

 

-                    if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+					if (!empty($uploaded_file))

+						$file_urls = $geodir_uploadurl . '/' . $new_name;

 

-                } else {

-                    $file_urls = $post_image[$m];

-                }

-            }

+				} else {

+					$file_urls = $post_image[$m];

+				}

+			}

 

 

-        }

+		}

 

-        //Remove all old attachments and temp images

-        if (!empty($postcurr_images)) {

+		//Remove all old attachments and temp images

+		if (!empty($postcurr_images)) {

 

-            if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

-            }

-        }

+			if ($file_urls != $postcurr_images) {

+				$invalid_files[] = (object)array('src' => $postcurr_images);

+				$invalid_files = (object)$invalid_files;

+			}

+		}

 

-        geodir_save_post_meta($post_id, $field_id, $file_urls);

+		geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+		if (!empty($invalid_files))

+			geodir_remove_attachments($invalid_files);

 

-    }

+	}

 }

 

 

@@ -3379,76 +3379,76 @@ 
  */

 function geodir_custom_upload_mimes($existing_mimes = array())

 {

-    $existing_mimes['wif'] = 'text/plain';

-    $existing_mimes['jpg|jpeg'] = 'image/jpeg';

-    $existing_mimes['gif'] = 'image/gif';

-    $existing_mimes['png'] = 'image/png';

-    $existing_mimes['pdf'] = 'application/pdf';

-    $existing_mimes['txt'] = 'text/text';

-    $existing_mimes['csv'] = 'application/octet-stream';

-    $existing_mimes['doc'] = 'application/msword';

-    $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';

-    $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';

-    $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

-    return $existing_mimes;

+	$existing_mimes['wif'] = 'text/plain';

+	$existing_mimes['jpg|jpeg'] = 'image/jpeg';

+	$existing_mimes['gif'] = 'image/gif';

+	$existing_mimes['png'] = 'image/png';

+	$existing_mimes['pdf'] = 'application/pdf';

+	$existing_mimes['txt'] = 'text/text';

+	$existing_mimes['csv'] = 'application/octet-stream';

+	$existing_mimes['doc'] = 'application/msword';

+	$existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';

+	$existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';

+	$existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

+	return $existing_mimes;

 }

 

 if (!function_exists('geodir_plupload_action')) {

 

-    /**

-     * Get upload directory path details

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

-     * @return mixed Returns upload directory details as an array.

-     */

-    function geodir_upload_dir($upload)

-    {

-        global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

-        return $upload;

-    }

-

-    /**

-     * Handles place file and image upload.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_plupload_action()

-    {

-        // check ajax noonce

-        $imgid = $_POST["imgid"];

-

-        check_ajax_referer($imgid . 'pluploadan');

-

-        // handle custom file uploaddir

-        add_filter('upload_dir', 'geodir_upload_dir');

-

-        // change file orinetation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

-

-        // handle file upload

-        $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

-        // remove handle custom file uploaddir

-        remove_filter('upload_dir', 'geodir_upload_dir');

-

-        if(!isset($status['url']) && isset($status['error'])){

-            print_r($status);

-        }

-

-        // send the uploaded file url in response

-        if (isset($status['url'])) {

-            echo $status['url'];

-        } else {

-            echo 'x';

-        }

-        exit;

-    }

+	/**

+	 * Get upload directory path details

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

+	 * @return mixed Returns upload directory details as an array.

+	 */

+	function geodir_upload_dir($upload)

+	{

+		global $current_user;

+		$upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

+		$upload['path'] = $upload['basedir'] . $upload['subdir'];

+		$upload['url'] = $upload['baseurl'] . $upload['subdir'];

+		return $upload;

+	}

+

+	/**

+	 * Handles place file and image upload.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_plupload_action()

+	{

+		// check ajax noonce

+		$imgid = $_POST["imgid"];

+

+		check_ajax_referer($imgid . 'pluploadan');

+

+		// handle custom file uploaddir

+		add_filter('upload_dir', 'geodir_upload_dir');

+

+		// change file orinetation if needed

+		$fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+

+		// handle file upload

+		$status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

+		// remove handle custom file uploaddir

+		remove_filter('upload_dir', 'geodir_upload_dir');

+

+		if(!isset($status['url']) && isset($status['error'])){

+			print_r($status);

+		}

+

+		// send the uploaded file url in response

+		if (isset($status['url'])) {

+			echo $status['url'];

+		} else {

+			echo 'x';

+		}

+		exit;

+	}

 }

 

 /**

@@ -3463,17 +3463,17 @@ 
  */

 function geodir_get_video($post_id)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

 

-    if ($results) {

-        return $results[0]->geodir_video;

-    }

+	if ($results) {

+		return $results[0]->geodir_video;

+	}

 

 }

 

@@ -3489,40 +3489,40 @@ 
  */

 function geodir_get_special_offers($post_id)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

 

-    if ($results) {

-        return $results[0]->geodir_special_offers;

-    }

+	if ($results) {

+		return $results[0]->geodir_special_offers;

+	}

 

 }

 

 if (!function_exists('geodir_max_upload_size')) {

-    /**

-     * Get max upload file size

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return mixed|void Returns max upload file size.

-     */

-    function geodir_max_upload_size()

-    {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

-

-        if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

-        } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

-        }

-        /** Filter documented in geodirectory-functions/general_functions.php **/

-        return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

-    }

+	/**

+	 * Get max upload file size

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return mixed|void Returns max upload file size.

+	 */

+	function geodir_max_upload_size()

+	{

+		$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+

+		if ($max_filesize > 0 && $max_filesize < 1) {

+			$max_filesize = (int)($max_filesize * 1024) . 'kb';

+		} else {

+			$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+		}

+		/** Filter documented in geodirectory-functions/general_functions.php **/

+		return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

+	}

 }

 

 

@@ -3540,33 +3540,33 @@ 
  */

 function geodir_add_custom_sort_options($fields, $post_type)

 {

-    global $wpdb;

+	global $wpdb;

 

-    if ($post_type != '') {

+	if ($post_type != '') {

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        if (in_array($post_type, $all_postypes)) {

+		if (in_array($post_type, $all_postypes)) {

 

-            $custom_fields = $wpdb->get_results(

-                $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

-                    array($post_type)

-                ), 'ARRAY_A'

-            );

+			$custom_fields = $wpdb->get_results(

+				$wpdb->prepare(

+					"select post_type,data_type,field_type,site_title,htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+					array($post_type)

+				), 'ARRAY_A'

+			);

 

-            if (!empty($custom_fields)) {

+			if (!empty($custom_fields)) {

 

-                foreach ($custom_fields as $val) {

-                    $fields[] = $val;

-                }

-            }

+				foreach ($custom_fields as $val) {

+					$fields[] = $val;

+				}

+			}

 

-        }

+		}

 

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -3582,66 +3582,66 @@ 
 function geodir_get_custom_sort_options($post_type = '')

 {

 

-    global $wpdb;

-

-    if ($post_type != '') {

-

-        $all_postypes = geodir_get_posttypes();

-

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

-            return false;

-

-        $fields = array();

-

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'random',

-            'site_title' => 'Random',

-            'htmlvar_name' => 'post_title'

-        );

-

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'datetime',

-            'site_title' => __('Add date', 'geodirectory'),

-            'htmlvar_name' => 'post_date'

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'bigint',

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

-            'htmlvar_name' => 'comment_count'

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'float',

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

-            'htmlvar_name' => 'overall_rating'

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'text',

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

-            'htmlvar_name' => 'post_title'

-        );

-

-        /**

-         * Hook to add custom sort options.

-         *

-         * @since 1.0.0

-         * @param array $fields Unmodified sort options array.

-         * @param string $post_type Post type.

-         */

-        return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);

-

-    }

-

-    return false;

+	global $wpdb;

+

+	if ($post_type != '') {

+

+		$all_postypes = geodir_get_posttypes();

+

+		if (!in_array($post_type, $all_postypes))

+			return false;

+

+		$fields = array();

+

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'random',

+			'site_title' => 'Random',

+			'htmlvar_name' => 'post_title'

+		);

+

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'datetime',

+			'site_title' => __('Add date', 'geodirectory'),

+			'htmlvar_name' => 'post_date'

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'bigint',

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

+			'htmlvar_name' => 'comment_count'

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'float',

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

+			'htmlvar_name' => 'overall_rating'

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'text',

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

+			'htmlvar_name' => 'post_title'

+		);

+

+		/**

+		 * Hook to add custom sort options.

+		 *

+		 * @since 1.0.0

+		 * @param array $fields Unmodified sort options array.

+		 * @param string $post_type Post type.

+		 */

+		return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);

+

+	}

+

+	return false;

 }

 

 

@@ -3657,117 +3657,117 @@ 
 function godir_set_sort_field_order($field_ids = array())

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $count = 0;

-    if (!empty($field_ids)):

-        foreach ($field_ids as $id) {

+	$count = 0;

+	if (!empty($field_ids)):

+		foreach ($field_ids as $id) {

 

-            $cf = trim($id, '_');

+			$cf = trim($id, '_');

 

-            $post_meta_info = $wpdb->query(

-                $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+			$post_meta_info = $wpdb->query(

+				$wpdb->prepare(

+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 															sort_order=%d 

 															where id= %d",

-                    array($count, $cf)

-                )

-            );

-            $count++;

-        }

-

-        return $field_ids;

-    else:

-        return false;

-    endif;

+					array($count, $cf)

+				)

+			);

+			$count++;

+		}

+

+		return $field_ids;

+	else:

+		return false;

+	endif;

 }

 

 

 if (!function_exists('geodir_custom_sort_field_save')) {

-    /**

-     * Save or Update custom sort fields into the database.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param array $request_field {

-     *    Attributes of the Request field.

-     *

-     *    @type string $action Ajax action name.

-     *    @type string $manage_field_type Manage field type Default "sorting_options".

-     *    @type string $create_field Do you want to create this field?.

-     *    @type string $field_ins_upd Field created or updated?.

-     *    @type string $_wpnonce Nonce value.

-     *    @type string $listing_type The Post type.

-     *    @type string $field_type Field Type.

-     *    @type string $field_id Field ID.

-     *    @type string $data_type Data Type.

-     *    @type string $htmlvar_name HTML variable name.

-     *    @type string $site_title Section title which you wish to display in frontend.

-     *    @type string $is_default Is this default sorting?.

-     *    @type string $is_active If not active then the field will not be displayed anywhere.

-     *    @type string $sort_order Sort Order.

-     *

-     * }

-     * @param bool $default Not yet implemented.

-     * @return int Returns the last affected db table row id.

-     */

-    function geodir_custom_sort_field_save($request_field = array(), $default = false)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

-

-        $cf = trim($result_str, '_');

-

-        /*-------- check dublicate validation --------*/

-

-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-

-        $post_type = $request_field['listing_type'];

-        $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';

-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

-        $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';

-        $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-        $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;

-        $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;

-        $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';

-        $asc = isset($request_field['asc']) ? $request_field['asc'] : 0;

-        $desc = isset($request_field['desc']) ? $request_field['desc'] : 0;

-        $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';

-        $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';

-

-        $default_order = '';

-        if ($is_default != '') {

-            $default_order = $is_default;

-            $is_default = '1';

-        }

-

-

-        $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($cehhtmlvar_name, $post_type, $field_type)

-            )

-        );

-

-        if ($is_default == 1) {

-

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

-

-        }

-

-

-        if (!$check_html_variable) {

-

-            $wpdb->query(

-

-                $wpdb->prepare(

-

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+	/**

+	 * Save or Update custom sort fields into the database.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param array $request_field {

+	 *    Attributes of the Request field.

+	 *

+	 *    @type string $action Ajax action name.

+	 *    @type string $manage_field_type Manage field type Default "sorting_options".

+	 *    @type string $create_field Do you want to create this field?.

+	 *    @type string $field_ins_upd Field created or updated?.

+	 *    @type string $_wpnonce Nonce value.

+	 *    @type string $listing_type The Post type.

+	 *    @type string $field_type Field Type.

+	 *    @type string $field_id Field ID.

+	 *    @type string $data_type Data Type.

+	 *    @type string $htmlvar_name HTML variable name.

+	 *    @type string $site_title Section title which you wish to display in frontend.

+	 *    @type string $is_default Is this default sorting?.

+	 *    @type string $is_active If not active then the field will not be displayed anywhere.

+	 *    @type string $sort_order Sort Order.

+	 *

+	 * }

+	 * @param bool $default Not yet implemented.

+	 * @return int Returns the last affected db table row id.

+	 */

+	function geodir_custom_sort_field_save($request_field = array(), $default = false)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

+

+		$cf = trim($result_str, '_');

+

+		/*-------- check dublicate validation --------*/

+

+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+

+		$post_type = $request_field['listing_type'];

+		$data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';

+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

+		$site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';

+		$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+		$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;

+		$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;

+		$is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';

+		$asc = isset($request_field['asc']) ? $request_field['asc'] : 0;

+		$desc = isset($request_field['desc']) ? $request_field['desc'] : 0;

+		$asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';

+		$desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';

+

+		$default_order = '';

+		if ($is_default != '') {

+			$default_order = $is_default;

+			$is_default = '1';

+		}

+

+

+		$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($cehhtmlvar_name, $post_type, $field_type)

+			)

+		);

+

+		if ($is_default == 1) {

+

+			$wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+

+		}

+

+

+		if (!$check_html_variable) {

+

+			$wpdb->query(

+

+				$wpdb->prepare(

+

+					"insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -3782,23 +3782,23 @@ 
 				asc_title = %s,

 				desc_title = %s",

 

-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)

-                )

+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)

+				)

 

-            );

+			);

 

 

-            $lastid = $wpdb->insert_id;

+			$lastid = $wpdb->insert_id;

 

-            $lastid = trim($lastid);

+			$lastid = trim($lastid);

 

-        } else {

+		} else {

 

-            $wpdb->query(

+			$wpdb->query(

 

-                $wpdb->prepare(

+				$wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -3814,115 +3814,115 @@ 
 				desc_title = %s

 				where id = %d",

 

-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)

-                )

+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)

+				)

 

-            );

+			);

 

-            $lastid = trim($cf);

+			$lastid = trim($cf);

 

-        }

+		}

 

 

-        return (int)$lastid;

+		return (int)$lastid;

 

-    }

+	}

 }

 

 

 if (!function_exists('geodir_custom_sort_field_delete')) {

-    /**

-     * Delete a custom sort field using field id.

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param string $field_id The field ID.

-     * @return int|string Returns field id when successful deletion, else returns 0.

-     */

-    function geodir_custom_sort_field_delete($field_id = '')

-    {

-

-        global $wpdb, $plugin_prefix;

-        if ($field_id != '') {

-            $cf = trim($field_id, '_');

-

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

-

-            return $field_id;

-

-        } else

-            return 0;

-

-    }

+	/**

+	 * Delete a custom sort field using field id.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param string $field_id The field ID.

+	 * @return int|string Returns field id when successful deletion, else returns 0.

+	 */

+	function geodir_custom_sort_field_delete($field_id = '')

+	{

+

+		global $wpdb, $plugin_prefix;

+		if ($field_id != '') {

+			$cf = trim($field_id, '_');

+

+			$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+

+			return $field_id;

+

+		} else

+			return 0;

+

+	}

 }

 

 

 if (!function_exists('geodir_custom_sort_field_adminhtml')) {

-    /**

-     * Custom sort field admin html.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $field_type The form field type.

-     * @param object|int $result_str The custom field results object or row id.

-     * @param string $field_ins_upd When set to "submit" displays form.

-     * @param bool $default when set to true field will be for admin use only.

-     */

-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

-    {

-        global $wpdb;

-        $cf = $result_str;

-        if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

-        } else {

-            $field_info = $cf;

-            $result_str = $cf->id;

-        }

-

-        $field_info = stripslashes_deep($field_info); // strip slashes

-

-        if (!isset($field_info->post_type)) {

-            $post_type = sanitize_text_field($_REQUEST['listing_type']);

-        } else {

-            $post_type = $field_info->post_type;

-        }

-

-        $field_types = explode('-_-', $field_type);

-        $field_type = $field_types[0];

-        $htmlvar_name = isset($field_types[1]) ? $field_types[1] : '';

-

-        $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

-

-        if ($site_title == '') {

-            $fields = geodir_get_custom_sort_options($post_type);

-

-            foreach ($fields as $val) {

-                $val = stripslashes_deep($val); // strip slashes

-

-                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

-                    $site_title = isset($val['site_title']) ? $val['site_title'] : '';

-                }

-            }

-        }

-

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

-

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

-

-        ?>

+	/**

+	 * Custom sort field admin html.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $field_type The form field type.

+	 * @param object|int $result_str The custom field results object or row id.

+	 * @param string $field_ins_upd When set to "submit" displays form.

+	 * @param bool $default when set to true field will be for admin use only.

+	 */

+	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+	{

+		global $wpdb;

+		$cf = $result_str;

+		if (!is_object($cf)) {

+			$field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+		} else {

+			$field_info = $cf;

+			$result_str = $cf->id;

+		}

+

+		$field_info = stripslashes_deep($field_info); // strip slashes

+

+		if (!isset($field_info->post_type)) {

+			$post_type = sanitize_text_field($_REQUEST['listing_type']);

+		} else {

+			$post_type = $field_info->post_type;

+		}

+

+		$field_types = explode('-_-', $field_type);

+		$field_type = $field_types[0];

+		$htmlvar_name = isset($field_types[1]) ? $field_types[1] : '';

+

+		$site_title = '';

+		if ($site_title == '')

+			$site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+

+		if ($site_title == '') {

+			$fields = geodir_get_custom_sort_options($post_type);

+

+			foreach ($fields as $val) {

+				$val = stripslashes_deep($val); // strip slashes

+

+				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

+					$site_title = isset($val['site_title']) ? $val['site_title'] : '';

+				}

+			}

+		}

+

+		if ($htmlvar_name == '')

+			$htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+

+		$nonce = wp_create_nonce('custom_fields_' . $result_str);

+

+		?>

         <li class="text" id="licontainer_<?php echo $result_str;?>">

             <div class="title title<?php echo $result_str;?> gt-fieldset"

                  title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

                  ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

                 <?php

 

-                $nonce = wp_create_nonce('custom_fields_' . $result_str);

-                ?>

+				$nonce = wp_create_nonce('custom_fields_' . $result_str);

+				?>

 

                 <div title="<?php _e('Click to remove field', 'geodirectory');?>"

                      onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

@@ -3935,17 +3935,17 @@ 
 

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

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

-                     echo 'block;';

-                 } else {

-                     echo 'none;';

-                 } ?>">

+					 echo 'block;';

+				 } else {

+					 echo 'none;';

+				 } ?>">

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

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

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

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

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

-                    echo $field_info->data_type;

-                }?>"/>

+					echo $field_info->data_type;

+				}?>"/>

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

 

 

@@ -3960,19 +3960,19 @@ 
                             <td>

                                 <input type="checkbox" name="asc" id="asc"

                                        value="1" <?php if (isset($field_info->sort_asc) && $field_info->sort_asc == '1') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

 

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

                                        placeholder="<?php esc_attr_e('Ascending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->asc_title)) {

-                                           echo esc_attr($field_info->asc_title);

-                                       } ?>" style="width:45%;"/>

+										   echo esc_attr($field_info->asc_title);

+									   } ?>" style="width:45%;"/>

 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

-                                    echo 'checked="checked"';

-                                } ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

+									echo 'checked="checked"';

+								} ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

 

                                 <br/>

                                 <span><?php _e('Select if you want to show option in sort.', 'geodirectory'); ?></span>

@@ -3984,18 +3984,18 @@ 
                             <td>

                                 <input type="checkbox" name="desc" id="desc"

                                        value="1" <?php if (isset($field_info->sort_desc) && $field_info->sort_desc == '1') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

 

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

                                        placeholder="<?php esc_attr_e('Descending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->desc_title)) {

-                                           echo esc_attr($field_info->desc_title);

-                                       } ?>" style="width:45%;"/>

+										   echo esc_attr($field_info->desc_title);

+									   } ?>" style="width:45%;"/>

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

-                                    echo 'checked="checked"';

-                                } ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

+									echo 'checked="checked"';

+								} ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

                                 <br/>

                                 <span><?php _e('Select if you want to show option in sort.', 'geodirectory'); ?></span>

                             </td>

@@ -4018,8 +4018,8 @@ 
                             <td align="left">

                                 <input type="checkbox" name="is_default"

                                        value="<?php echo $field_type; ?>"  <?php if (isset($field_info->is_default) && $field_info->is_default == '1') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                                 <br/>

                                 <span><?php _e('If field is checked then the field will be use as default sort.', 'geodirectory'); ?></span>

                             </td>

@@ -4033,12 +4033,12 @@ 
                             <select name="is_active" id="is_active">

                                 <option

                                     value="1" <?php if (isset($field_info->is_active) && $field_info->is_active == '1') {

-                                    echo 'selected="selected"';

-                                }?>><?php _e('Yes', 'geodirectory');?></option>

+									echo 'selected="selected"';

+								}?>><?php _e('Yes', 'geodirectory');?></option>

                                 <option

                                     value="0" <?php if (isset($field_info->is_active) && $field_info->is_active == '0') {

-                                    echo 'selected="selected"';

-                                }?>><?php _e('No', 'geodirectory');?></option>

+									echo 'selected="selected"';

+								}?>><?php _e('No', 'geodirectory');?></option>

                             </select>

                             <br/>

                             <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory');?></span>

@@ -4049,8 +4049,8 @@ 
                         <td><strong><?php _e('Display order :', 'geodirectory');?></strong></td>

                         <td align="left"><input type="text" readonly="readonly" name="sort_order" id="sort_order"

                                                 value="<?php if (isset($field_info->sort_order)) {

-                                                    echo esc_attr($field_info->sort_order);

-                                                }?>" size="50"/>

+													echo esc_attr($field_info->sort_order);

+												}?>" size="50"/>

                             <br/>

                             <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory');?></span>

                         </td>

@@ -4073,38 +4073,38 @@ 
             </div>

         </li> <?php

 

-    }

+	}

 }

 

 if (!function_exists('check_field_visibility')) {

-    /**

-     * Check field visibility as per price package.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global array $geodir_addon_list List of active GeoDirectory extensions.

-     * @param int|string $package_id The package ID.

-     * @param string $field_name The field name.

-     * @param string $post_type Optional. The wordpress post type.

-     * @return bool Returns true when field visible, otherwise false.

-     */

-    function check_field_visibility($package_id, $field_name, $post_type)

-    {

-        global $wpdb, $geodir_addon_list;

-        if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

-            return true;

-        }

-        if (!$package_id || !$field_name || !$post_type) {

-            return true;

-        }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

-

-        if ($wpdb->get_var($sql)) {

-            return true;

-        }

-        return false;

-    }

+	/**

+	 * Check field visibility as per price package.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @param int|string $package_id The package ID.

+	 * @param string $field_name The field name.

+	 * @param string $post_type Optional. The wordpress post type.

+	 * @return bool Returns true when field visible, otherwise false.

+	 */

+	function check_field_visibility($package_id, $field_name, $post_type)

+	{

+		global $wpdb, $geodir_addon_list;

+		if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

+			return true;

+		}

+		if (!$package_id || !$field_name || !$post_type) {

+			return true;

+		}

+		$sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+

+		if ($wpdb->get_var($sql)) {

+			return true;

+		}

+		return false;

+	}

 }

 

 /**

@@ -4119,43 +4119,43 @@ 
  */

 function geodir_string_to_options($input = '', $translated = false)

 {

-    $return = array();

-    if ($input != '') {

-        $input = trim($input);

-        $input = rtrim($input, ",");

-        $input = ltrim($input, ",");

-        $input = trim($input);

-    }

-

-    $input_arr = explode(',', $input);

-

-    if (!empty($input_arr)) {

-        foreach ($input_arr as $input_str) {

-            $input_str = trim($input_str);

-

-            if (strpos($input_str, "/") !== false) {

-                $input_str = explode("/", $input_str, 2);

-                $label = trim($input_str[0]);

-                if ($translated && $label != '') {

-                    $label = __($label, 'geodirectory');

-                }

-                $label = ucfirst($label);

-                $value = trim($input_str[1]);

-            } else {

-                if ($translated && $input_str != '') {

-                    $input_str = __($input_str, 'geodirectory');

-                }

-                $label = ucfirst($input_str);

-                $value = $input_str;

-            }

-

-            if ($label != '') {

-                $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);

-            }

-        }

-    }

-

-    return $return;

+	$return = array();

+	if ($input != '') {

+		$input = trim($input);

+		$input = rtrim($input, ",");

+		$input = ltrim($input, ",");

+		$input = trim($input);

+	}

+

+	$input_arr = explode(',', $input);

+

+	if (!empty($input_arr)) {

+		foreach ($input_arr as $input_str) {

+			$input_str = trim($input_str);

+

+			if (strpos($input_str, "/") !== false) {

+				$input_str = explode("/", $input_str, 2);

+				$label = trim($input_str[0]);

+				if ($translated && $label != '') {

+					$label = __($label, 'geodirectory');

+				}

+				$label = ucfirst($label);

+				$value = trim($input_str[1]);

+			} else {

+				if ($translated && $input_str != '') {

+					$input_str = __($input_str, 'geodirectory');

+				}

+				$label = ucfirst($input_str);

+				$value = $input_str;

+			}

+

+			if ($label != '') {

+				$return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);

+			}

+		}

+	}

+

+	return $return;

 }

 

 /**

@@ -4170,51 +4170,51 @@ 
  */

 function geodir_string_values_to_options($option_values = '', $translated = false)

 {

-    $options = array();

-    if ($option_values == '') {

-        return NULL;

-    }

-

-    if (strpos($option_values, "{/optgroup}") !== false) {

-        $option_values_arr = explode("{/optgroup}", $option_values);

-

-        foreach ($option_values_arr as $optgroup) {

-            if (strpos($optgroup, "{optgroup}") !== false) {

-                $optgroup_arr = explode("{optgroup}", $optgroup);

-

-                $count = 0;

-                foreach ($optgroup_arr as $optgroup_str) {

-                    $count++;

-                    $optgroup_str = trim($optgroup_str);

-

-                    $optgroup_label = '';

-                    if (strpos($optgroup_str, "|") !== false) {

-                        $optgroup_str_arr = explode("|", $optgroup_str, 2);

-                        $optgroup_label = trim($optgroup_str_arr[0]);

-                        if ($translated && $optgroup_label != '') {

-                            $optgroup_label = __($optgroup_label, 'geodirectory');

-                        }

-                        $optgroup_label = ucfirst($optgroup_label);

-                        $optgroup_str = $optgroup_str_arr[1];

-                    }

-

-                    $optgroup3 = geodir_string_to_options($optgroup_str, $translated);

-

-                    if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {

-                        $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));

-                        $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));

-                        $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);

-                    }

-                    $options = array_merge($options, $optgroup3);

-                }

-            } else {

-                $optgroup1 = geodir_string_to_options($optgroup, $translated);

-                $options = array_merge($options, $optgroup1);

-            }

-        }

-    } else {

-        $options = geodir_string_to_options($option_values, $translated);

-    }

-

-    return $options;

+	$options = array();

+	if ($option_values == '') {

+		return NULL;

+	}

+

+	if (strpos($option_values, "{/optgroup}") !== false) {

+		$option_values_arr = explode("{/optgroup}", $option_values);

+

+		foreach ($option_values_arr as $optgroup) {

+			if (strpos($optgroup, "{optgroup}") !== false) {

+				$optgroup_arr = explode("{optgroup}", $optgroup);

+

+				$count = 0;

+				foreach ($optgroup_arr as $optgroup_str) {

+					$count++;

+					$optgroup_str = trim($optgroup_str);

+

+					$optgroup_label = '';

+					if (strpos($optgroup_str, "|") !== false) {

+						$optgroup_str_arr = explode("|", $optgroup_str, 2);

+						$optgroup_label = trim($optgroup_str_arr[0]);

+						if ($translated && $optgroup_label != '') {

+							$optgroup_label = __($optgroup_label, 'geodirectory');

+						}

+						$optgroup_label = ucfirst($optgroup_label);

+						$optgroup_str = $optgroup_str_arr[1];

+					}

+

+					$optgroup3 = geodir_string_to_options($optgroup_str, $translated);

+

+					if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {

+						$optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));

+						$optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));

+						$optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);

+					}

+					$options = array_merge($options, $optgroup3);

+				}

+			} else {

+				$optgroup1 = geodir_string_to_options($optgroup, $translated);

+				$options = array_merge($options, $optgroup1);

+			}

+		}

+	} else {

+		$options = geodir_string_to_options($option_values, $translated);

+	}

+

+	return $options;

 }
\ No newline at end of file

Spacing +471 added lines, -471 removed lines

@@ -49,7 +49,7 @@ 
     function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

-        $result = 0;// no rows affected

+        $result = 0; // no rows affected

         if (!geodir_column_exist($db, $column)) {

             if (!empty($db) && !empty($column))

                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

@@ -74,7 +74,7 @@ 
 {

     global $wpdb, $geodir_post_custom_fields_cache;

 

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+    $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location;

 

     if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

         return $geodir_post_custom_fields_cache[$cache_stored];

@@ -95,7 +95,7 @@ 
 

     $post_meta_info = $wpdb->get_results(

         $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

             array($post_type)

         )

     );

@@ -169,7 +169,7 @@ 
         $cf = $result_str;

         if (!is_object($cf)) {

 

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));

 

         } else {

             $field_info = $cf;

@@ -203,14 +203,14 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {

+                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

                 $htmlvar_name = $field->htmlvar_name;

 

                 if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

                 }

 

                 /**

@@ -224,18 +224,18 @@ 
                 do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

 

                 if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");

                 } else {

                     if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");

                     }

                 }

 

@@ -304,7 +304,7 @@ 
         $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

 

         // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {

             $request_field['data_type'] = 'VARCHAR';

         }

 

@@ -317,12 +317,12 @@ 
         $post_type = $request_field['listing_type'];

 

         if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+            $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name;

         }

 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ",

                 array($cf, $cehhtmlvar_name, $post_type)

             )

         );

@@ -334,7 +334,7 @@ 
 

                 $post_meta_info = $wpdb->get_row(

                     $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+                        "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d",

                         array($cf)

                     )

                 );

@@ -352,7 +352,7 @@ 
             if ($post_type == '') $post_type = 'gd_place';

 

 

-            $detail_table = $plugin_prefix . $post_type . '_detail';

+            $detail_table = $plugin_prefix.$post_type.'_detail';

 

             $admin_title = $request_field['admin_title'];

             $site_title = $request_field['site_title'];

@@ -378,7 +378,7 @@ 
             $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

             if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

+                $htmlvar_name = 'geodir_'.$htmlvar_name;

             }

 

             $option_values = '';

@@ -423,9 +423,9 @@ 
 

             if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

+                $sort_order = (int) $last_order + 1;

             }

 

             $default_value_add = '';

@@ -437,15 +437,15 @@ 
                     case 'address':

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

-                        $old_prefix = $old_html_variable . '_';

+                        $old_prefix = $old_html_variable.'_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $wpdb->query($meta_field_add);

@@ -454,12 +454,12 @@ 
 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -467,9 +467,9 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

 

                                 }

 

@@ -479,36 +479,36 @@ 
 

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -516,24 +516,24 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -541,128 +541,128 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

 

                                 }

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 15 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

                                 }

 

 

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

 

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

                                 }

 

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

                                     $wpdb->query($meta_field_add);

                                 } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 }

 

                             }

@@ -678,30 +678,30 @@ 
                         $op_size = '500';

 

                         // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

+                        if (isset($option_values) && $option_values && $field_type == 'select') {

+                            $option_values_arr = explode(',', $option_values);

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+                                foreach ($option_values_arr as $op_val) {

+                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }

                                 }

-                                if($op_max){$op_size =$op_max; }

+                                if ($op_max) {$op_size = $op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

+                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+                            if (strlen($option_values)) {

+                                $op_size = strlen($option_values);

                             }

                         }

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

 

                         if (isset($request_field['cat_display_type']))

@@ -718,9 +718,9 @@ 
                     case 'url':

                     case 'file':

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         if (isset($request_field['advanced_editor']))

                             $extra_fields = $request_field['advanced_editor'];

@@ -734,24 +734,24 @@ 
                     default:

                         if ($data_type != 'VARCHAR' && $data_type != '') {

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL";

                             } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+                            $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL";

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

                         $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         break;

                 endswitch;

@@ -767,7 +767,7 @@ 
 

                     $wpdb->prepare(

 

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -799,7 +799,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)

                     )

 

                 );

@@ -809,7 +809,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

                         array($site_title, $post_type, $htmlvar_name)

@@ -818,7 +818,7 @@ 
 

 

                 if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

 

 

                 /**

@@ -838,7 +838,7 @@ 
                         $data_type = '';

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

                         $old_prefix = $old_html_variable;

 

@@ -846,109 +846,109 @@ 
 

                         $meta_field_add = "VARCHAR( 254 ) NULL";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+                        geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add);

                         //$wpdb->query($meta_field_add);

 

 

                         if (!empty($extra_fields)) {

 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL";

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

 

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 $meta_field_add .= " DEFAULT '1'";

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                         }

@@ -958,8 +958,8 @@ 
                     case 'checkbox':

                         $data_type = 'TINYINT';

 

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

+                        $meta_field_add = $data_type."( 1 ) NOT NULL ";

+                        if ((int) $default_value === 1) {

                             $meta_field_add .= " DEFAULT '1'";

                         }

 

@@ -992,7 +992,7 @@ 
                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

+                                $op_size = strlen($option_values);

                             }

 

                             if (isset($request_field['multi_display_type'])) {

@@ -1000,9 +1000,9 @@ 
                             }

                         }

 

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

+                        $meta_field_add = $data_type."( $op_size ) NULL ";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

@@ -1017,9 +1017,9 @@ 
 

                         $data_type = 'TEXT';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

                         /*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

@@ -1034,9 +1034,9 @@ 
 

                         $data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1049,9 +1049,9 @@ 
 

                         $data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1063,22 +1063,22 @@ 
                     default:

 

                         if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+                            $meta_field_add = $data_type." NULL ";

 

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+                                $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL ";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

                             $meta_field_add = " VARCHAR( 254 ) NULL ";

 

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

@@ -1100,7 +1100,7 @@ 
 

                     $wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1131,7 +1131,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)

 

                     )

 

@@ -1143,7 +1143,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1176,7 +1176,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -1232,7 +1232,7 @@ 
         $value = '';

 

         /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;

         if ($for_admin_use && !is_super_admin()) {

             continue;

         }

@@ -1266,22 +1266,22 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_after_custom_form_field_$name'

          */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

         if ($type == 'fieldset') {

-            $fieldset_id = (int)$val['id'];

-            $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

+            $fieldset_id = (int) $val['id'];

+            $fieldset_field_class = 'gd-fieldset-'.$fieldset_id;

             ?>

-            <h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-                <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?></h5>

+            <h5 id="geodir_fieldset_<?php echo $fieldset_id; ?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id; ?>"><?php echo $site_title; ?>

+                <?php if ($admin_desc != '') echo '<small>( '.$admin_desc.' )</small>'; ?></h5>

             <?php

         } else if ($type == 'address') {

-            $prefix = $name . '_';

+            $prefix = $name.'_';

 

-            ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');

-            ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');

+            ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix.' address');

+            ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix.' zip/post code ');

             ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');

-            ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');

+            ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix.' mapview');

 

             $address = '';

             $zip = '';

@@ -1292,21 +1292,21 @@ 
 

             if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

                 $post = $gd_ses_listing;

-                $address = $post[$prefix . 'address'];

-                $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';

-                $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';

-                $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';

-                $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';

-                $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';

+                $address = $post[$prefix.'address'];

+                $zip = isset($post[$prefix.'zip']) ? $post[$prefix.'zip'] : '';

+                $lat = isset($post[$prefix.'latitude']) ? $post[$prefix.'latitude'] : '';

+                $lng = isset($post[$prefix.'longitude']) ? $post[$prefix.'longitude'] : '';

+                $mapview = isset($post[$prefix.'mapview']) ? $post[$prefix.'mapview'] : '';

+                $mapzoom = isset($post[$prefix.'mapzoom']) ? $post[$prefix.'mapzoom'] : '';

             } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {

-                $post_info = (array)$post_info;

-

-                $address = $post_info[$prefix . 'address'];

-                $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';

-                $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';

-                $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';

-                $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';

-                $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';

+                $post_info = (array) $post_info;

+

+                $address = $post_info[$prefix.'address'];

+                $zip = isset($post_info[$prefix.'zip']) ? $post_info[$prefix.'zip'] : '';

+                $lat = isset($post_info[$prefix.'latitude']) ? $post_info[$prefix.'latitude'] : '';

+                $lng = isset($post_info[$prefix.'longitude']) ? $post_info[$prefix.'longitude'] : '';

+                $mapview = isset($post_info[$prefix.'mapview']) ? $post_info[$prefix.'mapview'] : '';

+                $mapzoom = isset($post_info[$prefix.'mapzoom']) ? $post_info[$prefix.'mapzoom'] : '';

             }

 

             $location = geodir_get_default_location();

@@ -1343,16 +1343,16 @@ 
 

             ?>

 

-            <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="geodir_<?php echo $prefix.'address'; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

-                       id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'address'; ?>"

+                       id="<?php echo $prefix.'address'; ?>" class="geodir_textfield"

                        value="<?php echo esc_attr(stripslashes($address)); ?>"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1372,14 +1372,14 @@ 
 

             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>

 

-                <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"

-                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix.'zip'; ?>_row"

+                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label>

                         <?php _e($zip_title, 'geodirectory'); ?>

                         <?php /*if($is_required) echo '<span>*</span>';*/ ?>

                     </label>

-                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'zip'; ?>"

-                           id="<?php echo $prefix . 'zip'; ?>" class="geodir_textfield autofill"

+                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'zip'; ?>"

+                           id="<?php echo $prefix.'zip'; ?>" class="geodir_textfield autofill"

                            value="<?php echo esc_attr(stripslashes($zip)); ?>"/>

                     <?php /*if($is_required) {?>

 					<span class="geodir_message_error"><?php echo _e($required_msg,'geodirectory');?></span>

@@ -1389,14 +1389,14 @@ 
 

             <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>

 

-                <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix.'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <?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");

+                    include(geodir_plugin_path()."/geodirectory-functions/map-functions/map_on_add_listing_page.php");

                     if ($lat_lng_blank) {

                         $lat = '';

                         $lng = '';

@@ -1407,14 +1407,14 @@ 
                 <?php

                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

-                <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                <div id="geodir_<?php echo $prefix.'latitude'; ?>_row"

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

                     </label>

-                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"

-                           id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"

+                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'latitude'; ?>"

+                           id="<?php echo $prefix.'latitude'; ?>" class="geodir_textfield"

                            value="<?php echo esc_attr(stripslashes($lat)); ?>" size="25"/>

                     <span class="geodir_message_note"><?php echo GET_LATITUDE_MSG; ?></span>

                     <?php if ($is_required) { ?>

@@ -1422,14 +1422,14 @@ 
                     <?php } ?>

                 </div>

 

-                <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                <div id="geodir_<?php echo $prefix.'longitude'; ?>_row"

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

                     </label>

-                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"

-                           id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"

+                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'longitude'; ?>"

+                           id="<?php echo $prefix.'longitude'; ?>" class="geodir_textfield"

                            value="<?php echo esc_attr(stripslashes($lng)); ?>" size="25"/>

                     <span class="geodir_message_note"><?php echo GET_LOGNGITUDE_MSG; ?></span>

                     <?php if ($is_required) { ?>

@@ -1439,32 +1439,32 @@ 
             <?php } ?>

 

             <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>

-                <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix.'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label><?php _e($mapview_title, 'geodirectory'); ?></label>

 

 

                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

-                                                            name="<?php echo $prefix . 'mapview'; ?>"

-                                                            id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {

+                                                            name="<?php echo $prefix.'mapview'; ?>"

+                                                            id="<?php echo $prefix.'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {

                             echo 'checked="checked"';

                         } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>

                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"

                                                              class="gd-checkbox"

-                                                             name="<?php echo $prefix . 'mapview'; ?>"

+                                                             name="<?php echo $prefix.'mapview'; ?>"

                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {

                             echo 'checked="checked"';

                         } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>

 

                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

-                                                            name="<?php echo $prefix . 'mapview'; ?>"

+                                                            name="<?php echo $prefix.'mapview'; ?>"

                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {

                             echo 'checked="checked"';

                         } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>

 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

-                                                            name="<?php echo $prefix . 'mapview'; ?>"

+                                                            name="<?php echo $prefix.'mapview'; ?>"

                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {

                             echo 'checked="checked"';

                         } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>

@@ -1476,35 +1476,35 @@ 
             <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>

                 <input type="hidden" value="<?php if (isset($mapzoom)) {

                     echo esc_attr($mapzoom);

-                } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>

+                } ?>" name="<?php echo $prefix.'mapzoom'; ?>" id="<?php echo $prefix.'mapzoom'; ?>"/>

             <?php }?>

         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if (isset($val['data_type']) && $val['data_type'] == 'INT') {$type = 'number'; }

+            elseif (isset($val['data_type']) && $val['data_type'] == 'FLOAT') {$type = 'float'; }

             //print_r($val);

             //validation

-            if(isset($val['validation_pattern']) && $val['validation_pattern']){

+            if (isset($val['validation_pattern']) && $val['validation_pattern']) {

                 $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            } else {$validation = ''; }

 

             // validation message

-            if(isset($val['validation_msg']) && $val['validation_msg']){

+            if (isset($val['validation_msg']) && $val['validation_msg']) {

                 $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            } else {$validation_msg = ''; }

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1515,16 +1515,16 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1535,16 +1535,16 @@ 
                 $value = '';

             } ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1555,31 +1555,31 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"

                        oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"

                        onchange="try{setCustomValidity('')}catch(e){}"

                 />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'radio') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1588,14 +1588,14 @@ 
                         foreach ($option_values as $option_value) {

                             if (empty($option_value['optgroup'])) {

                                 ?>

-                                <span class="gd-radios"><input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?></span>

+                                <span class="gd-radios"><input name="<?php echo $name; ?>" id="<?php echo $name; ?>" <?php checked($value, $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type; ?>" type="radio" /><?php echo $option_value['label']; ?></span>

                                 <?php

                             }

                         }

                     }

                 }

                 ?>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1603,22 +1603,22 @@ 
 

         <?php } elseif ($type == 'checkbox') { ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

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

                     $value = '0';

                 }?>

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

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

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

                     echo 'checked="checked"';

-                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type;?>" type="checkbox"

-                     onchange="if(this.checked){jQuery('#<?php echo $name;?>').val('1');} else{ jQuery('#<?php echo $name;?>').val('0');}"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type; ?>" type="checkbox"

+                     onchange="if(this.checked){jQuery('#<?php echo $name; ?>').val('1');} else{ jQuery('#<?php echo $name; ?>').val('0');}"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1627,44 +1627,44 @@ 
         <?php } elseif ($type == 'textarea') {

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label><?php

 

 

                 if (is_array($extra_fields) && in_array('1', $extra_fields)) {

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

+                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

 

-                <div class="editor" field_id="<?php echo $name;?>" field_type="editor">

+                <div class="editor" field_id="<?php echo $name; ?>" field_type="editor">

                     <?php wp_editor(stripslashes($value), $name, $editor_settings); ?>

                     </div><?php

 

                 } else {

 

-                    ?><textarea field_type="<?php echo $type;?>" class="geodir_textarea" name="<?php echo $name;?>"

-                                id="<?php echo $name;?>"><?php echo stripslashes($value);?></textarea><?php

+                    ?><textarea field_type="<?php echo $type; ?>" class="geodir_textarea" name="<?php echo $name; ?>"

+                                id="<?php echo $name; ?>"><?php echo stripslashes($value); ?></textarea><?php

 

                 }?>

 

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'select') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1674,22 +1674,22 @@ 
                         if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {

                             $option_label = isset($option_row['label']) ? $option_row['label'] : '';

 

-                            $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

+                            $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';

                         } else {

                             $option_label = isset($option_row['label']) ? $option_row['label'] : '';

                             $option_value = isset($option_row['value']) ? $option_row['value'] : '';

                             $selected = $option_value == $value ? 'selected="selected"' : '';

 

-                            $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

+                            $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';

                         }

                     }

                 }

                 ?>

-                <select field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

+                <select field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

                         class="geodir_textfield textfield_x chosen_select"

-                        data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"

-                        option-ajaxchosen="false"><?php echo $select_options;?></select>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                        data-placeholder="<?php echo __('Choose', 'geodirectory').' '.$site_title.'&hellip;'; ?>"

+                        option-ajaxchosen="false"><?php echo $select_options; ?></select>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1703,7 +1703,7 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1729,9 +1729,9 @@ 
                                     $option_label = isset($option_row['label']) ? $option_row['label'] : '';

 

                                     if ($multi_display == 'select') {

-                                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

+                                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';

                                     } else {

-                                        $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';

+                                        $select_options .= $option_row['optgroup'] == 'start' ? '<li>'.$option_label.'</li>' : '';

                                     }

                                 } else {

                                     $option_label = isset($option_row['label']) ? $option_row['label'] : '';

@@ -1756,9 +1756,9 @@ 
                                     }

 

                                     if ($multi_display == 'select') {

-                                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

+                                        $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';

                                     } else {

-                                        $select_options .= '<li><input name="' . $name . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';

+                                        $select_options .= '<li><input name="'.$name.'[]" '.$checked.' value="'.esc_attr($option_value).'" class="gd-'.$multi_display.'" field_type="'.$multi_display.'" type="'.$multi_display.'" />&nbsp;'.$option_label.' </li>';

                                     }

                                 }

                             }

@@ -1777,7 +1777,7 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1802,23 +1802,23 @@ 
                 $extra_fields['date_format'] = 'yy-mm-dd';

 

             $date_format = $extra_fields['date_format'];

-            $jquery_date_format  = $date_format;

+            $jquery_date_format = $date_format;

 

 

             // check if we need to change the format or not

             $date_format_len = strlen(str_replace(' ', '', $date_format));

-            if($date_format_len>5){// if greater then 5 then it's the old style format.

+            if ($date_format_len > 5) {// if greater then 5 then it's the old style format.

 

-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                 $date_format = str_replace($search, $replace, $date_format);

-            }else{

-                $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );

+            } else {

+                $jquery_date_format = geodir_date_format_php_to_jqueryui($jquery_date_format);

             }

 

-            if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty

-            if($value && !isset($_REQUEST['backandedit'])) {

+            if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty

+            if ($value && !isset($_REQUEST['backandedit'])) {

                 $time = strtotime($value);

                 $value = date_i18n($date_format, $time);

             }

@@ -1828,37 +1828,37 @@ 
 

                 jQuery(function () {

 

-                    jQuery("#<?php echo $name;?>").datepicker({changeMonth: true, changeYear: true <?php

+                    jQuery("#<?php echo $name; ?>").datepicker({changeMonth: true, changeYear: true <?php

                         /**

                          * Used to add extra option to datepicker per custom field.

                          *

                          * @since 1.5.7

                          * @param string $name The custom field name.

                          */

-                        echo apply_filters("gd_datepicker_extra_{$name}",'');?>});

+                        echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});

 

-                    jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');

+                    jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format; ?>');

 

-                    <?php if(!empty($value)){?>

-                    jQuery("#<?php echo $name;?>").datepicker("setDate", "<?php echo $value;?>");

+                    <?php if (!empty($value)) {?>

+                    jQuery("#<?php echo $name; ?>").datepicker("setDate", "<?php echo $value; ?>");

                     <?php } ?>

 

                 });

 

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1872,25 +1872,25 @@ 
             <script type="text/javascript">

                 jQuery(document).ready(function () {

 

-                    jQuery('#<?php echo $name;?>').timepicker({

+                    jQuery('#<?php echo $name; ?>').timepicker({

                         showPeriod: true,

                         showLeadingZero: true,

                         showPeriod: true,

                     });

                 });

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

-                       id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input readonly="readonly" field_type="<?php echo $type; ?>" name="<?php echo $name; ?>"

+                       id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1900,15 +1900,15 @@ 
             if ($value == $val['default']) {

                 $value = '';

             } ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

+                <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

                     <?php

                     global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;

 

@@ -1920,7 +1920,7 @@ 
 

                         $package_info = array();

 

-                        $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);

+                        $package_info = (array) geodir_post_package_info($package_info, $post, $post_type);

 

                         if (!empty($package_info)) {

 

@@ -1949,7 +1949,7 @@ 
 

                         $catadd_limit = $wpdb->get_var(

                             $wpdb->prepare(

-                                "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",

+                                "SELECT cat_limit FROM ".GEODIR_PRICE_TABLE." WHERE pid = %d",

                                 array($package_id)

                             )

                         );

@@ -1965,13 +1965,13 @@ 
                         $required_limit_msg = '';

                         if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {

 

-                            $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');

+                            $required_limit_msg = __('Only select', 'geodirectory').' '.$catadd_limit.__(' categories for this package.', 'geodirectory');

 

                         } else {

                             $required_limit_msg = $required_msg;

                         }

 

-                        echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';

+                        echo '<input type="hidden" cat_limit="'.$catadd_limit.'" id="cat_limit" value="'.esc_attr($required_limit_msg).'" name="cat_limit['.$name.']"  />';

 

 

                         if ($cat_display == 'select' || $cat_display == 'multiselect') {

@@ -1981,11 +1981,11 @@ 
                             if ($cat_display == 'multiselect')

                                 $multiple = 'multiple="multiple"';

 

-                            echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

+                            echo '<select id="'.$name.'" '.$multiple.' type="'.$name.'" name="post_category['.$name.'][]" alt="'.$name.'" field_type="'.$cat_display.'" class="geodir_textfield textfield_x chosen_select" data-placeholder="'.__('Select Category', 'geodirectory').'">';

 

 

                             if ($cat_display == 'select')

-                                echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';

+                                echo '<option value="">'.__('Select Category', 'geodirectory').'</option>';

 

                         }

 

@@ -2003,7 +2003,7 @@ 
                     ?>

                 </div>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2045,8 +2045,8 @@ 
                     $file_totImg = count($curImages);

             }

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

-            $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? implode(",", $extra_fields['gd_file_types']) : '';

+            $display_file_types = $allowed_file_types != '' ? '.'.implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

             <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>

@@ -2056,13 +2056,13 @@ 
 			</h5>   <?php */

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2070,7 +2070,7 @@ 
                            id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>

                     <?php if ($allowed_file_types != '') { ?>

                         <input type="hidden" name="<?php echo $file_id; ?>_allowed_types"

-                               id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>

+                               id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>

                     <?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

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

@@ -2086,10 +2086,10 @@ 
                             <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */

                             ?>

                             <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"

-                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"

+                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"

                                    class="geodir_button" style="margin-top:10px;"/>

                             <span class="ajaxnonceplu"

-                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id . 'pluploadan'); ?>"></span>

+                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id.'pluploadan'); ?>"></span>

                             <?php if ($file_width && $file_height): ?>

                                 <span class="plupload-resize"></span>

                                 <span class="plupload-width" id="plupload-width<?php echo $file_width; ?>"></span>

@@ -2109,7 +2109,7 @@ 
 

                     </div>

                 </div>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory').' '.$display_file_types : ''); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2128,7 +2128,7 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_before_custom_form_field_$name'

          */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

     }

 

@@ -2154,7 +2154,7 @@ 
 

         $filter = $wpdb->get_row(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+                "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'",

                 array($geodir_post_type)

             )

         );

@@ -2216,7 +2216,7 @@ 
 

                 $variables_array = array();

 

-                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int) $type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

                     continue;

                 }

 

@@ -2231,9 +2231,9 @@ 
                 //if($type['field_icon'])

 

                 if (strpos($type['field_icon'], 'http') !== false) {

-                    $field_icon = ' background: url(' . $type['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+                    $field_icon = ' background: url('.$type['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

                 } elseif (strpos($type['field_icon'], 'fa fa-') !== false) {

-                    $field_icon = '<i class="' . $type['field_icon'] . '"></i>';

+                    $field_icon = '<i class="'.$type['field_icon'].'"></i>';

                 }

                 //else{$field_icon = $type['field_icon'];}

 

@@ -2245,9 +2245,9 @@ 
                         $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($type['site_title']);

 

                         if ($field_set_start == 1) {

-                            echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+                            echo '</div><div class="geodir-company_info field-group '.$type['htmlvar_name'].'"><h2 class="'.$fieldset_class.'">'.__($type['site_title'], 'geodirectory').'</h2>';

                         } else {

-                            echo '<h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+                            echo '<h2 class="'.$fieldset_class.'">'.__($type['site_title'], 'geodirectory').'</h2>';

                             $field_set_start = 1;

                         }

 

@@ -2255,7 +2255,7 @@ 
 

                     case 'address':

 

-                        $html_var = $type['htmlvar_name'] . '_address';

+                        $html_var = $type['htmlvar_name'].'_address';

 

                         if ($type['extra_fields']) {

 

@@ -2271,17 +2271,17 @@ 
                                  */

                                 $show_city_in_address = apply_filters('geodir_show_city_in_address', false);

                                 if (isset($extra_fields['show_city']) && $extra_fields['show_city'] && $show_city_in_address) {

-                                    $field = $type['htmlvar_name'] . '_city';

+                                    $field = $type['htmlvar_name'].'_city';

                                     if ($post->{$field}) {

-                                        $addition_fields .= ', ' . $post->{$field};

+                                        $addition_fields .= ', '.$post->{$field};

                                     }

                                 }

 

 

                                 if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                    $field = $type['htmlvar_name'] . '_zip';

+                                    $field = $type['htmlvar_name'].'_zip';

                                     if ($post->{$field}) {

-                                        $addition_fields .= ', ' . $post->{$field};

+                                        $addition_fields .= ', '.$post->{$field};

                                     }

                                 }

 

@@ -2358,28 +2358,28 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"  itemscope itemtype="http://schema.org/PostalAddress">';

-                            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"  itemscope itemtype="http://schema.org/PostalAddress">';

+                            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '&nbsp;';

                             $html .= '</span>';

 

                             if ($preview) {

-                                $html .= $post->{$html_var} . $addition_fields . '</p></div>';

+                                $html .= $post->{$html_var}.$addition_fields.'</p></div>';

                             } else {

                                 if ($post->post_address) {

-                                    $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';

+                                    $html .= '<span itemprop="streetAddress">'.$post->post_address.'</span><br>';

                                 }

                                 if ($post->post_city) {

-                                    $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';

+                                    $html .= '<span itemprop="addressLocality">'.$post->post_city.'</span><br>';

                                 }

                                 if ($post->post_region) {

-                                    $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';

+                                    $html .= '<span itemprop="addressRegion">'.$post->post_region.'</span><br>';

                                 }

                                 if ($post->post_zip) {

-                                    $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';

+                                    $html .= '<span itemprop="postalCode">'.$post->post_zip.'</span><br>';

                                 }

                                 if ($post->post_country) {

-                                    $html .= '<span itemprop="addressCountry">' . __($post->post_country, 'geodirectory') . '</span><br>';

+                                    $html .= '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span><br>';

                                 }

                                 $html .= '</div>';

                             }

@@ -2419,7 +2419,7 @@ 
 

                             $website = !empty($a_url['url']) ? $a_url['url'] : '';

                             $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

-                            if(!empty($type['default_value'])){$title = $type['default_value'];}

+                            if (!empty($type['default_value'])) {$title = $type['default_value']; }

                             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

 

@@ -2445,7 +2445,7 @@ 
                              * @param string $website Website URL.

                              * @param int $post->ID Post ID.

                              */

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';

 

                         endif;

 

@@ -2476,9 +2476,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$type['htmlvar_name']}) . '">' . $post->{$type['htmlvar_name']} . '</a></div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.

+                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '&nbsp;';

+                            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$type['htmlvar_name']}).'">'.$post->{$type['htmlvar_name']}.'</a></div>';

 

                         endif;

 

@@ -2514,9 +2514,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span>' . $value . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '&nbsp;';

+                            $html .= '</span>'.$value.'</div>';

 

                         endif;

 

@@ -2533,21 +2533,21 @@ 
                             }

                             // check if we need to change the format or not

                             $date_format_len = strlen(str_replace(' ', '', $date_format));

-                            if($date_format_len>5){// if greater then 4 then it's the old style format.

+                            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.

 

-                                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                                $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                                 $date_format = str_replace($search, $replace, $date_format);

 

-                                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

-                            }else{

+                                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

+                            } else {

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

                             }

 

-                            if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']}!="0000-00-00") {

+                            if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']} != "0000-00-00") {

                                 $value = date_i18n($date_format, strtotime($post_htmlvar_value));

-                            }else{

+                            } else {

                                 continue;

                             }

 

@@ -2570,9 +2570,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $value . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.$value.'</div>';

 

                         endif;

 

@@ -2603,9 +2603,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '&nbsp;';

-                            $html .= '</span>' . $post->{$type['htmlvar_name']} . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '&nbsp;';

+                            $html .= '</span>'.$post->{$type['htmlvar_name']}.'</div>';

 

                         elseif (isset($post->{$type['htmlvar_name']}) && $post->{$type['htmlvar_name']}):

 

@@ -2628,9 +2628,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $post->{$type['htmlvar_name']} . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.$post->{$type['htmlvar_name']}.'</div>';

 

                         endif;

 

@@ -2639,7 +2639,7 @@ 
                     case 'radio':

 

                         $html_var = $type['htmlvar_name'];

-                        if(!isset($post->{$type['htmlvar_name']})){continue;}

+                        if (!isset($post->{$type['htmlvar_name']})) {continue; }

                         $html_val = __($post->{$type['htmlvar_name']}, 'geodirectory');

                         if ($post->{$type['htmlvar_name']} != ''):

 

@@ -2680,9 +2680,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $html_val . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.$html_val.'</div>';

                         endif;

 

                         break;

@@ -2691,7 +2691,7 @@ 
 

                         $html_var = $type['htmlvar_name'];

 

-                        if ((int)$post->{$html_var} == 1):

+                        if ((int) $post->{$html_var} == 1):

 

                             if ($post->{$type['htmlvar_name']} == '1'):

                                 $html_val = __('Yes', 'geodirectory');

@@ -2718,9 +2718,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $html_val . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.$html_val.'</div>';

                         endif;

 

                         break;

@@ -2728,7 +2728,7 @@ 
                     case 'select':

 

                         $html_var = $type['htmlvar_name'];

-                        if(!isset($post->{$type['htmlvar_name']})){continue;}

+                        if (!isset($post->{$type['htmlvar_name']})) {continue; }

                         if ($post->{$type['htmlvar_name']}):

                             $field_value = __($post->{$type['htmlvar_name']}, 'geodirectory');

 

@@ -2763,9 +2763,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . $field_value . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.$field_value.'</div>';

                         endif;

 

                         break;

@@ -2815,15 +2815,15 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

                             $html .= '</span>';

 

                             if (count($option_values) > 1) {

                                 $html .= '<ul>';

 

                                 foreach ($option_values as $val) {

-                                    $html .= '<li>' . $val . '</li>';

+                                    $html .= '<li>'.$val.'</li>';

                                 }

 

                                 $html .= '</ul>';

@@ -2849,7 +2849,7 @@ 
                             if (!$preview) {

                                 $b_send_inquiry = 'b_send_inquiry';

                                 $b_sendtofriend = 'b_sendtofriend';

-                                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';

+                                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';

                             }

 

                             if (strpos($field_icon, 'http') !== false) {

@@ -2871,26 +2871,26 @@ 
                                 $i++;

                             }

 

-                            $html .= '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

+                            $html .= '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;

                             $seperator = '';

                             if ($post->{$type['htmlvar_name']}) {

-                                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';

+                                $html .= '<a href="javascript:void(0);" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';

                                 $seperator = ' | ';

                             }

 

                             if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {

-                                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';

+                                $html .= $seperator.'<a href="javascript:void(0);" class="'.$b_sendtofriend.'">'.SEND_TO_FRIEND.'</a>';

                             }

 

                             $html .= '</span></div>';

 

 

                             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {

-                                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';

+                                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';

                             } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {

-                                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';

+                                $html .= '<p class="sucess_msg">'.SEND_FRIEND_SUCCESS.'</p>';

                             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {

-                                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';

+                                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';

                             }

 

                             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/

@@ -2917,11 +2917,11 @@ 
                                     $i++;

                                 }

 

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+                                $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;

+                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

                                 $html .= '</span><span class="geodir-email-address-output">';

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

-                                if($e_split = explode('@',$email)){

+                                if ($e_split = explode('@', $email)) {

                                     /**

                                      * Filter email custom field name output.

                                      *

@@ -2930,10 +2930,10 @@ 
                                      * @param string $email The email string being output.

                                      * @param array $type Custom field variables array.

                                      */

-                                    $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

-                                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

-                                }else{

-                                    $html .=  $email;

+                                    $email_name = apply_filters('geodir_email_field_name_output', $email, $type);

+                                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

+                                } else {

+                                    $html .= $email;

                                 }

                                 $html .= '</span></div>';

                             }

@@ -2953,7 +2953,7 @@ 
                             if (!empty($files)):

 

                                 $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-                                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+                                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

                                 $file_paths = '';

                                 foreach ($files as $file) {

@@ -2990,9 +2990,9 @@ 
                                             //$file_paths .= '<img src="'.$file.'"  />';	

                                             $file_paths .= '</div>';

                                         } else {

-                                            $ext_path = '_' . $html_var . '_';

+                                            $ext_path = '_'.$html_var.'_';

                                             $filename = explode($ext_path, $filename);

-                                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

+                                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';

                                         }

                                     }

                                 }

@@ -3016,11 +3016,11 @@ 
                                     $i++;

                                 }

 

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' geodir-custom-file-box ' . $type['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

+                                $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' geodir-custom-file-box '.$type['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;

                                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

+                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

                                 $html .= '</span>';

-                                $html .= $file_paths . '</div></div>';

+                                $html .= $file_paths.'</div></div>';

 

                             endif;

                         endif;

@@ -3051,9 +3051,9 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . wpautop($post->{$type['htmlvar_name']}) . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.wpautop($post->{$type['htmlvar_name']}).'</div>';

 

                         }

                         break;

@@ -3080,16 +3080,16 @@ 
                                 $i++;

                             }

 

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                            $html .= '</span>' . wpautop($post->{$type['htmlvar_name']}) . '</div>';

+                            $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$type['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;

+                            $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                            $html .= '</span>'.wpautop($post->{$type['htmlvar_name']}).'</div>';

 

                         }

                         break;

                     case 'taxonomy': {

                         $html_var = $type['htmlvar_name'];

-                        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {

-                            $post_taxonomy = $post->post_type . 'category';

+                        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {

+                            $post_taxonomy = $post->post_type.'category';

                             $field_value = $post->{$html_var};

                             $links = array();

                             $terms = array();

@@ -3107,7 +3107,7 @@ 
                                     if ($term != '') {

                                         $term = get_term_by('id', $term, $html_var);

                                         if (is_object($term)) {

-                                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";

+                                            $links[] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";

                                             $terms[] = $term;

                                         }

                                     }

@@ -3121,7 +3121,7 @@ 
                                     $terms = $termsOrdered;

                                 }

                             }

-                            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';

+                            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';

 

                             if ($html_value != '') {

                                 if (strpos($field_icon, 'http') !== false) {

@@ -3142,9 +3142,9 @@ 
                                     $i++;

                                 }

 

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;

-                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

-                                $html .= '</span> ' . $html_value . '</div>';

+                                $html = '<div class="geodir_more_info '.$geodir_odd_even.' '.$type['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;

+                                $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory').': ' : '';

+                                $html .= '</span> '.$html_value.'</div>';

                             }

                         }

                     }

@@ -3264,7 +3264,7 @@ 
 

         $post_type = get_post_type($post_id);

         //echo $field_id; exit;

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

 

         $postcurr_images = array();

         $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

@@ -3283,13 +3283,13 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

                 /* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

                     $curr_img_url = $post_image[$m];

@@ -3315,24 +3315,24 @@ 
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

                     if (!function_exists('wp_handle_upload'))

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

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

 

                     if (!is_dir($geodir_uploadpath))

                         mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

                     if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

+                        $img_path = $geodir_uploadpath.'/'.$filename;

+                        $img_url = $geodir_uploadurl.'/'.$filename;

                     } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

+                        $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;

                     }

 

                     $uploaded_file = '';

                     if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                        $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);

 

                     if ($curr_img_dir != $geodir_uploaddir) {

                         if (file_exists($img_path))

@@ -3340,7 +3340,7 @@ 
                     }

 

                     if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                        $file_urls = $geodir_uploadurl.'/'.$new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3354,8 +3354,8 @@ 
         if (!empty($postcurr_images)) {

 

             if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

+                $invalid_files[] = (object) array('src' => $postcurr_images);

+                $invalid_files = (object) $invalid_files;

             }

         }

 

@@ -3407,9 +3407,9 @@ 
     function geodir_upload_dir($upload)

     {

         global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

+        $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID;

+        $upload['path'] = $upload['basedir'].$upload['subdir'];

+        $upload['url'] = $upload['baseurl'].$upload['subdir'];

         return $upload;

     }

 

@@ -3424,20 +3424,20 @@ 
         // check ajax noonce

         $imgid = $_POST["imgid"];

 

-        check_ajax_referer($imgid . 'pluploadan');

+        check_ajax_referer($imgid.'pluploadan');

 

         // handle custom file uploaddir

         add_filter('upload_dir', 'geodir_upload_dir');

 

         // change file orinetation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+        $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']);

 

         // handle file upload

         $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

         // remove handle custom file uploaddir

         remove_filter('upload_dir', 'geodir_upload_dir');

 

-        if(!isset($status['url']) && isset($status['error'])){

+        if (!isset($status['url']) && isset($status['error'])) {

             print_r($status);

         }

 

@@ -3467,9 +3467,9 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_video;

@@ -3493,9 +3493,9 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_special_offers;

@@ -3513,12 +3513,12 @@ 
      */

     function geodir_max_upload_size()

     {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

         if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

+            $max_filesize = (int) ($max_filesize * 1024).'kb';

         } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+            $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';

         }

         /** Filter documented in geodirectory-functions/general_functions.php **/

         return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

@@ -3550,7 +3550,7 @@ 
 

             $custom_fields = $wpdb->get_results(

                 $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+                    "select post_type,data_type,field_type,site_title,htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

                     array($post_type)

                 ), 'ARRAY_A'

             );

@@ -3667,7 +3667,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -3749,14 +3749,14 @@ 
 

         $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 ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ",

                 array($cehhtmlvar_name, $post_type, $field_type)

             )

         );

 

         if ($is_default == 1) {

 

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));

 

         }

 

@@ -3767,7 +3767,7 @@ 
 

                 $wpdb->prepare(

 

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -3798,7 +3798,7 @@ 
 

                 $wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -3824,7 +3824,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -3847,7 +3847,7 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));

 

             return $field_id;

 

@@ -3875,7 +3875,7 @@ 
         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));

         } else {

             $field_info = $cf;

             $result_str = $cf->id;

@@ -3912,41 +3912,41 @@ 
         if ($htmlvar_name == '')

             $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

 

         ?>

-        <li class="text" id="licontainer_<?php echo $result_str;?>">

-            <div class="title title<?php echo $result_str;?> gt-fieldset"

-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

+        <li class="text" id="licontainer_<?php echo $result_str; ?>">

+            <div class="title title<?php echo $result_str; ?> gt-fieldset"

+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"

+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

                 <?php

 

-                $nonce = wp_create_nonce('custom_fields_' . $result_str);

+                $nonce = wp_create_nonce('custom_fields_'.$result_str);

                 ?>

 

-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"

-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                      class="handlediv close"></div>

 

                 <b style="cursor:pointer;"

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

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

 

             </div>

 

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

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

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

                      echo 'block;';

                  } else {

                      echo 'none;';

                  } ?>">

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

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

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

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

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

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

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

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

                     echo $field_info->data_type;

                 }?>"/>

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

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

 

 

                 <table class="widefat post fixed" border="0" style="width:100%;">

@@ -3970,7 +3970,7 @@ 
                                        } ?>" style="width:45%;"/>

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

+                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {

                                     echo 'checked="checked"';

                                 } ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

 

@@ -3993,7 +3993,7 @@ 
                                            echo esc_attr($field_info->desc_title);

                                        } ?>" style="width:45%;"/>

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

+                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {

                                     echo 'checked="checked"';

                                 } ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

                                 <br/>

@@ -4028,42 +4028,42 @@ 
                     <?php } ?>

 

                     <tr>

-                        <td><strong><?php _e('Is active :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Is active :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <select name="is_active" id="is_active">

                                 <option

                                     value="1" <?php if (isset($field_info->is_active) && $field_info->is_active == '1') {

                                     echo 'selected="selected"';

-                                }?>><?php _e('Yes', 'geodirectory');?></option>

+                                }?>><?php _e('Yes', 'geodirectory'); ?></option>

                                 <option

                                     value="0" <?php if (isset($field_info->is_active) && $field_info->is_active == '0') {

                                     echo 'selected="selected"';

-                                }?>><?php _e('No', 'geodirectory');?></option>

+                                }?>><?php _e('No', 'geodirectory'); ?></option>

                             </select>

                             <br/>

-                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory');?></span>

+                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Display order :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display order :', 'geodirectory'); ?></strong></td>

                         <td align="left"><input type="text" readonly="readonly" name="sort_order" id="sort_order"

                                                 value="<?php if (isset($field_info->sort_order)) {

                                                     echo esc_attr($field_info->sort_order);

                                                 }?>" size="50"/>

                             <br/>

-                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory');?></span>

+                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

                         <td>&nbsp;</td>

                         <td align="left">

-                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory');?>"

-                                   onclick="save_sort_field('<?php echo $result_str;?>')"/>

+                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory'); ?>"

+                                   onclick="save_sort_field('<?php echo $result_str; ?>')"/>

 

-                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('Delete', 'geodirectory');?>"

-                                                                onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('Delete', 'geodirectory'); ?>"

+                                                                onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                 class="button_n"/></a>

 

                         </td>

@@ -4098,7 +4098,7 @@ 
         if (!$package_id || !$field_name || !$post_type) {

             return true;

         }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));

 

         if ($wpdb->get_var($sql)) {

             return true;

Braces +371 added lines, -186 removed lines

@@ -51,8 +51,9 @@ 
         global $wpdb;

         $result = 0;// no rows affected

         if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+            if (!empty($db) && !empty($column)) {
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
+            }
         }

         return $result;

     }

@@ -82,10 +83,11 @@ 
 

     $default_query = '';

 

-    if ($default == 'default')

-        $default_query = " and is_default IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query = " and is_default = '0' ";

+    if ($default == 'default') {
+            $default_query = " and is_default IN ('1') ";
+    } elseif ($default == 'custom') {
+            $default_query = " and is_default = '0' ";
+    }
 

     if ($fields_location == 'detail') {

         $default_query = " and show_on_detail='1' ";

@@ -240,10 +242,12 @@ 
                 }

 

                 return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

+            } else {
+                            return 0;
+            }
+        } else {
+                    return 0;
+        }
     }

 }

 

@@ -349,7 +353,9 @@ 
 

 

 

-            if ($post_type == '') $post_type = 'gd_place';

+            if ($post_type == '') {
+            	$post_type = 'gd_place';
+            }
 

 

             $detail_table = $plugin_prefix . $post_type . '_detail';

@@ -382,20 +388,23 @@ 
             }

 

             $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+            if (isset($request_field['option_values'])) {
+                            $option_values = $request_field['option_values'];
+            }
 

             $cat_sort = '';

-            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort']))

-                $cat_sort = implode(",", $request_field['cat_sort']);

+            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort'])) {
+                            $cat_sort = implode(",", $request_field['cat_sort']);
+            }
 

             $cat_filter = '';

-            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter']))

-                $cat_filter = implode(",", $request_field['cat_filter']);

+            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter'])) {
+                            $cat_filter = implode(",", $request_field['cat_filter']);
+            }
 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
+            } else {

                 $package_info = array();

 

                 $package_info = geodir_post_package_info($package_info, '', $post_type);

@@ -403,22 +412,29 @@ 
             }

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
+                            $extra_fields = $request_field['extra'];
+            }
 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
+                            $is_default = $request_field['is_default'];
+            } else {
+                            $is_default = '0';
+            }
 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
+                            $is_admin = $request_field['is_admin'];
+            } else {
+                            $is_admin = '0';
+            }
 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+            if ($is_active == '') {
+            	$is_active = 1;
+            }
+            if ($is_required == '') {
+            	$is_required = 0;
+            }
 

 

             if ($sort_order == '') {

@@ -687,7 +703,7 @@ 
                                 }

                                 if($op_max){$op_size =$op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+                        } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

                             if(strlen($option_values)){

                                 $op_size =  strlen($option_values);

                             }

@@ -704,11 +720,13 @@ 
                             return __('Column change failed, you may have too many columns.','geodirectory');

                         }

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

+                        if (isset($request_field['cat_display_type'])) {
+                                                    $extra_fields = $request_field['cat_display_type'];
+                        }
 

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

+                        if (isset($request_field['multi_display_type'])) {
+                                                    $extra_fields = $request_field['multi_display_type'];
+                        }
 

 

                         break;

@@ -722,8 +740,9 @@ 
                         if($alter_result===false){

                             return __('Column change failed, you may have too many columns.','geodirectory');

                         }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

+                        if (isset($request_field['advanced_editor'])) {
+                                                    $extra_fields = $request_field['advanced_editor'];
+                        }
 

                         break;

 

@@ -817,8 +836,9 @@ 
                 );

 

 

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                if ($cat_sort == '') {
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
+                }
 

 

                 /**

@@ -1186,8 +1206,10 @@ 
         }

 

         return $post_meta_info;

-    else:

-        return false;

+    else {
+    	:

+        return false;
+    }
     endif;

 }

 

@@ -1240,8 +1262,9 @@ 
         if (is_admin()) {

             global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

+            if (isset($_REQUEST['post'])) {
+                            $_REQUEST['pid'] = $_REQUEST['post'];
+            }
         }

 

         if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

@@ -1273,7 +1296,10 @@ 
             $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

             ?>

             <h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-                <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?></h5>

+                <?php if ($admin_desc != '') {
+	echo '<small>( ' . $admin_desc . ' )</small>';
+}
+?></h5>

             <?php

         } else if ($type == 'address') {

             $prefix = $name . '_';

@@ -1310,17 +1336,27 @@ 
             }

 

             $location = geodir_get_default_location();

-            if (empty($city)) $city = isset($location->city) ? $location->city : '';

-            if (empty($region)) $region = isset($location->region) ? $location->region : '';

-            if (empty($country)) $country = isset($location->country) ? $location->country : '';

+            if (empty($city)) {
+            	$city = isset($location->city) ? $location->city : '';
+            }
+            if (empty($region)) {
+            	$region = isset($location->region) ? $location->region : '';
+            }
+            if (empty($country)) {
+            	$country = isset($location->country) ? $location->country : '';
+            }
 

             $lat_lng_blank = false;

             if (empty($lat) && empty($lng)) {

                 $lat_lng_blank = true;

             }

 

-            if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';

-            if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';

+            if (empty($lat)) {
+            	$lat = isset($location->city_latitude) ? $location->city_latitude : '';
+            }
+            if (empty($lng)) {
+            	$lng = isset($location->city_longitude) ? $location->city_longitude : '';
+            }
 

             /**

              * Filter the default latitude.

@@ -1344,10 +1380,16 @@ 
             ?>

 

             <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

                 <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

                        id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

@@ -1408,10 +1450,16 @@ 
                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

                 <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

-                        <?php if ($is_required) echo '<span>*</span>'; ?>

+                        <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                     </label>

                     <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"

                            id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"

@@ -1423,10 +1471,16 @@ 
                 </div>

 

                 <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

-                        <?php if ($is_required) echo '<span>*</span>'; ?>

+                        <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                     </label>

                     <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"

                            id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"

@@ -1481,26 +1535,31 @@ 
         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';} elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

             //print_r($val);

             //validation

             if(isset($val['validation_pattern']) && $val['validation_pattern']){

                 $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            } else{$validation='';}

 

             // validation message

             if(isset($val['validation_msg']) && $val['validation_msg']){

                 $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            } else{$validation_msg='';}

             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

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

                        value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

@@ -1516,11 +1575,17 @@ 
             }?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

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

                        value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

@@ -1536,11 +1601,17 @@ 
             } ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

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

                        value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

@@ -1556,11 +1627,17 @@ 
             }?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

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

                        value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

@@ -1575,11 +1652,17 @@ 
 

         <?php } elseif ($type == 'radio') { ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

                 <?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1604,11 +1687,17 @@ 
         <?php } elseif ($type == 'checkbox') { ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

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

                     $value = '0';

@@ -1628,11 +1717,17 @@ 
             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label><?php

 

 

@@ -1660,11 +1755,17 @@ 
 

         <?php } elseif ($type == 'select') { ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1703,11 +1804,17 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>'; ?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

                 <input type="hidden" name="gd_field_<?php echo $name; ?>" value="1"/>

                 <?php if ($multi_display == 'select') { ?>

@@ -1777,11 +1884,17 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>'; ?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <?php $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

@@ -1798,8 +1911,9 @@ 
             </div>

         <?php } elseif ($type == 'datepicker') {

 

-            if ($extra_fields['date_format'] == '')

-                $extra_fields['date_format'] = 'yy-mm-dd';

+            if ($extra_fields['date_format'] == '') {
+                            $extra_fields['date_format'] = 'yy-mm-dd';
+            }
 

             $date_format = $extra_fields['date_format'];

             $jquery_date_format  = $date_format;

@@ -1813,7 +1927,7 @@ 
                 $replace = array('d','j','l','m','n','F','Y');//PHP date format

 

                 $date_format = str_replace($search, $replace, $date_format);

-            }else{

+            } else{

                 $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );

             }

 

@@ -1847,12 +1961,18 @@ 
 

             </script>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

 

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

@@ -1866,8 +1986,9 @@ 
 

         <?php } elseif ($type == 'time') {

 

-            if ($value != '')

-                $value = date('H:i', strtotime($value));

+            if ($value != '') {
+                            $value = date('H:i', strtotime($value));
+            }
             ?>

             <script type="text/javascript">

                 jQuery(document).ready(function () {

@@ -1880,12 +2001,18 @@ 
                 });

             </script>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

                 <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

                        id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

@@ -1901,11 +2028,17 @@ 
                 $value = '';

             } ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

@@ -1939,8 +2072,9 @@ 
                         $post_cat = implode(",", $post_cat[$name]);

 

                     } else {

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

-                            $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);

+                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                                                    $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                        }
                     }

 

 

@@ -1978,21 +2112,24 @@ 
 

                             $cat_display == '';

                             $multiple = '';

-                            if ($cat_display == 'multiselect')

-                                $multiple = 'multiple="multiple"';

+                            if ($cat_display == 'multiselect') {
+                                                            $multiple = 'multiple="multiple"';
+                            }
 

                             echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

 

 

-                            if ($cat_display == 'select')

-                                echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';

+                            if ($cat_display == 'select') {
+                                                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                            }
 

                         }

 

                         echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);

 

-                        if ($cat_display == 'select' || $cat_display == 'multiselect')

-                            echo '</select>';

+                        if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                                    echo '</select>';
+                        }
 

                     } else {

 

@@ -2022,18 +2159,23 @@ 
 

                 $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.

 

-            } else

-                $file_value = '';

+            } else {
+                            $file_value = '';
+            }
 

-            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])

-                $file_multiple = true; // allow multiple files upload

-            else

-                $file_multiple = false;

+            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple']) {
+                            $file_multiple = true;
+            }
+            // allow multiple files upload

+            else {
+                            $file_multiple = false;
+            }
 

-            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])

-                $file_image_limit = $extra_fields['image_limit'];

-            else

-                $file_image_limit = 1;

+            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit']) {
+                            $file_image_limit = $extra_fields['image_limit'];
+            } else {
+                            $file_image_limit = 1;
+            }
 

             $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

@@ -2041,8 +2183,9 @@ 
 

             if (!empty($file_value)) {

                 $curImages = explode(',', $file_value);

-                if (!empty($curImages))

-                    $file_totImg = count($curImages);

+                if (!empty($curImages)) {
+                                    $file_totImg = count($curImages);
+                }
             }

 

             $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

@@ -2057,12 +2200,18 @@ 
             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) {
+                        	echo '<span>*</span>';
+                        }
+                        ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2205,9 +2354,10 @@ 
             $field_set_start = 0;

 

 

-            if ($fields_location == 'detail')

-

-                $i = 1;

+            if ($fields_location == 'detail') {
+            

+                $i = 1;
+            }
             foreach ($fields_info as $type) {

                 $type = stripslashes_deep($type); // strip slashes

                 $html = '';

@@ -2224,8 +2374,9 @@ 
                     $variables_array['post_id'] = $post->ID;

                     $variables_array['label'] = __($type['site_title'], 'geodirectory');

                     $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

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

+                    if (isset($post->{$type['htmlvar_name']})) {
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
+                    }
                 endif;

 

                 //if($type['field_icon'])

@@ -2352,8 +2503,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2427,8 +2579,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2470,8 +2623,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2491,9 +2645,10 @@ 
                         if ($post->{$type['htmlvar_name']}):

 

                             $value = '';

-                            if ($post->{$type['htmlvar_name']} != '')

-                                //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

-                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));

+                            if ($post->{$type['htmlvar_name']} != '') {
+                                                            //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

+                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2508,8 +2663,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2541,13 +2697,13 @@ 
                                 $date_format = str_replace($search, $replace, $date_format);

 

                                 $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

-                            }else{

+                            } else{

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

                             }

 

                             if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']}!="0000-00-00") {

                                 $value = date_i18n($date_format, strtotime($post_htmlvar_value));

-                            }else{

+                            } else{

                                 continue;

                             }

 

@@ -2564,8 +2720,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2597,8 +2754,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2622,8 +2780,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2674,8 +2833,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2695,8 +2855,10 @@ 
 

                             if ($post->{$type['htmlvar_name']} == '1'):

                                 $html_val = __('Yes', 'geodirectory');

-                            else:

-                                $html_val = __('No', 'geodirectory');

+                            else {
+                            	:

+                                $html_val = __('No', 'geodirectory');
+                            }
                             endif;

 

                             if (strpos($field_icon, 'http') !== false) {

@@ -2712,8 +2874,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2757,8 +2920,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2809,8 +2973,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2865,8 +3030,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2911,8 +3077,9 @@ 
                                 if ($fields_location == 'detail') {

 

                                     $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

+                                    if ($i % 2 == 0) {
+                                                                            $geodir_odd_even = 'geodir_more_info_even';
+                                    }
 

                                     $i++;

                                 }

@@ -2932,7 +3099,7 @@ 
                                      */

                                     $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

                                     $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

-                                }else{

+                                } else{

                                     $html .=  $email;

                                 }

                                 $html .= '</span></div>';

@@ -3010,8 +3177,9 @@ 
                                 if ($fields_location == 'detail') {

 

                                     $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

+                                    if ($i % 2 == 0) {
+                                                                            $geodir_odd_even = 'geodir_more_info_even';
+                                    }
 

                                     $i++;

                                 }

@@ -3045,8 +3213,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -3074,8 +3243,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -3170,7 +3340,9 @@ 
                      * @param string $html Custom field unfiltered HTML.

                      * @param array $variables_array Custom field variables array.

                      */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+                    if ($html) {
+                    	echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
+                    }
 

                     /**

                      * Called after a custom fields is output on the frontend.

@@ -3204,10 +3376,11 @@ 
      */

     function geodir_default_date_format()

     {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

+        if ($format = get_option('date_format')) {
+                    return $format;
+        } else {
+                    return 'dd-mm-yy';
+        }
     }

 }

 

@@ -3314,11 +3487,13 @@ 
                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-                    if (!function_exists('wp_handle_upload'))

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

+                    if (!function_exists('wp_handle_upload')) {
+                                            require_once(ABSPATH . 'wp-admin/includes/file.php');
+                    }
 

-                    if (!is_dir($geodir_uploadpath))

-                        mkdir($geodir_uploadpath);

+                    if (!is_dir($geodir_uploadpath)) {
+                                            mkdir($geodir_uploadpath);
+                    }
 

                     $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

@@ -3331,16 +3506,19 @@ 
                     }

 

                     $uploaded_file = '';

-                    if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                    if (file_exists($img_path)) {
+                                            $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
+                    }
 

                     if ($curr_img_dir != $geodir_uploaddir) {

-                        if (file_exists($img_path))

-                            unlink($img_path);

+                        if (file_exists($img_path)) {
+                                                    unlink($img_path);
+                        }
                     }

 

-                    if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                    if (!empty($uploaded_file)) {
+                                            $file_urls = $geodir_uploadurl . '/' . $new_name;
+                    }
 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3361,8 +3539,9 @@ 
 

         geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
 

     }

 }

@@ -3588,8 +3767,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

         $fields = array();

 

@@ -3677,8 +3857,10 @@ 
         }

 

         return $field_ids;

-    else:

-        return false;

+    else {
+    	:

+        return false;
+    }
     endif;

 }

 

@@ -3851,8 +4033,9 @@ 
 

             return $field_id;

 

-        } else

-            return 0;

+        } else {
+                    return 0;
+        }
 

     }

 }

@@ -3894,8 +4077,9 @@ 
         $htmlvar_name = isset($field_types[1]) ? $field_types[1] : '';

 

         $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+        if ($site_title == '') {
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
+        }
 

         if ($site_title == '') {

             $fields = geodir_get_custom_sort_options($post_type);

@@ -3909,8 +4093,9 @@ 
             }

         }

 

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+        if ($htmlvar_name == '') {
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
+        }
 

         $nonce = wp_create_nonce('custom_fields_' . $result_str);