View GitHub Repository geodirectory

Schedule Inspection
Subscribe
Test Failed
Pull Request — master (#397)
by Kiran
52:50
created
Status
Category
Toggle Patches
geodirectory-admin/option-pages/design_settings_array.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -40,8 +40,9 @@
 
 block discarded – undo
40 40 
     $geodir_active_nav_locations = get_nav_menu_locations();
41 41 
     if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {
42 42 
         foreach ($geodir_active_nav_locations as $key => $theme_location) {
43 
-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))
44 
-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];
43 
+            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) {
44 
+                            $post_type_arr[$key] = $geodir_all_nav_locations[$key];
45 
+            }
45 46 
         }
46 47 
     }
47 48
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -142,7 +142,7 @@  discard block
 
 block discarded – undo
142 142 
     ),
143 143 
     array(
144 144 
         'name' => __('Resize image large size', 'geodirectory'),
145 
-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),
145 
+        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w').'x'.get_option('large_size_h')),
146 146 
         'id' => 'geodir_use_wp_media_large_size',
147 147 
         'type' => 'checkbox',
148 148 
         'std' => '0'

@@ -584,11 +584,11 @@  discard block
 
 block discarded – undo
584 584 
         'id' => 'geodir_default_rating_star_icon',
585 585 
         'type' => 'file',
586 586 
         'std' => '0',
587 
-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
587 
+        'value' => geodir_plugin_url().'/geodirectory-assets/images/stars.png'// Default value to show home top section
588 588 
     ),
589 589 
 	array(
590 590 
 		'name' => __('Enable Font Awesome', 'geodirectory'),
591 
-		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),
591 
+		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory'),
592 592 
 		'id' => 'geodir_reviewrating_enable_font_awesome',
593 593 
 		'type' => 'checkbox',
594 594 
 		'std' => '0'

@@ -1054,7 +1054,7 @@  discard block
 
 block discarded – undo
1054 1054 
         'name' => __('Google Maps API KEY', 'geodirectory'),
1055 1055 
         'desc' => sprintf(
1056 1056 
             __('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),
1057 
-            'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),
1057 
+            'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true', 'https://wpgeodirectory.com/docs/add-google-api-key/' ),
1058 1058 
         'tip' => '',
1059 1059 
         'id' => 'geodir_google_api_key',
1060 1060 
         'css' => 'min-width:300px;',

@@ -1129,7 +1129,7 @@  discard block
 
 block discarded – undo
1129 1129 
         'id' => 'geodir_default_marker_icon',
1130 1130 
         'type' => 'file',
1131 1131 
         'std' => '0',
1132 
-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1132 
+        'value' => geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1133 1133 
     ),
1134 1134 
     // add option that allows enable/disable map dragging to phone devices
1135 1135 
     array(
Please login to merge, or discard this patch.
Indentation   +933 added lines, -933 removed lines patch added patch discarded remove patch 
@@ -16,17 +16,17 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17 
 function geodir_theme_location_setting_fun()
18 18 
 {
19 
-    $post_type_arr = array();
20 
-    $geodir_all_nav_locations = get_registered_nav_menus();
21 
-    $geodir_active_nav_locations = get_nav_menu_locations();
22 
-    if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {
23 
-        foreach ($geodir_active_nav_locations as $key => $theme_location) {
24 
-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))
25 
-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];
26 
-        }
27 
-    }
28 
-
29 
-    return $post_type_arr;
19 
+	$post_type_arr = array();
20 
+	$geodir_all_nav_locations = get_registered_nav_menus();
21 
+	$geodir_active_nav_locations = get_nav_menu_locations();
22 
+	if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {
23 
+		foreach ($geodir_active_nav_locations as $key => $theme_location) {
24 
+			if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))
25 
+				$post_type_arr[$key] = $geodir_all_nav_locations[$key];
26 
+		}
27 
+	}
28 
+
29 
+	return $post_type_arr;
30 30 
 }
31 31
32 32 
 /**

@@ -37,536 +37,536 @@  discard block
 
 block discarded – undo
37 37 
  */
38 38 
 $geodir_settings['design_settings'] = apply_filters('geodir_design_settings', array(
39 39
40 
-    /* Home Layout Settings start */
41 
-    array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),
40 
+	/* Home Layout Settings start */
41 
+	array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),
42 42
43 43
44 
-    array('name' => __('Home Top Section Settings', 'geodirectory'),
45 
-        'type' => 'sectionstart',
46 
-        'desc' => '',
47 
-        'id' => 'geodir_home_top_section'),
44 
+	array('name' => __('Home Top Section Settings', 'geodirectory'),
45 
+		'type' => 'sectionstart',
46 
+		'desc' => '',
47 
+		'id' => 'geodir_home_top_section'),
48 48
49 
-    array(
50 
-        'name' => __('Home top section', 'geodirectory'),
51 
-        'desc' => __('Show the top section of home page', 'geodirectory'),
52 
-        'id' => 'geodir_show_home_top_section',
53 
-        'type' => 'checkbox',
54 
-        'std' => '1' // Default value to show home top section
55 
-    ),
49 
+	array(
50 
+		'name' => __('Home top section', 'geodirectory'),
51 
+		'desc' => __('Show the top section of home page', 'geodirectory'),
52 
+		'id' => 'geodir_show_home_top_section',
53 
+		'type' => 'checkbox',
54 
+		'std' => '1' // Default value to show home top section
55 
+	),
56 56
57 57
58 
-    array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),
58 
+	array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),
59 59
60 60
61 
-    array('name' => __('Home Page Layout Settings', 'geodirectory'),
62 
-        'type' => 'sectionstart',
63 
-        'desc' => '',
64 
-        'id' => 'geodir_home_layout'),
61 
+	array('name' => __('Home Page Layout Settings', 'geodirectory'),
62 
+		'type' => 'sectionstart',
63 
+		'desc' => '',
64 
+		'id' => 'geodir_home_layout'),
65 65
66 
-    array(
67 
-        'name' => __('Home right section', 'geodirectory'),
68 
-        'desc' => __('Show the right section of home page', 'geodirectory'),
69 
-        'id' => 'geodir_show_home_right_section',
70 
-        'type' => 'checkbox',
71 
-        'std' => '1' // Default value to show home top section
72 
-    ),
66 
+	array(
67 
+		'name' => __('Home right section', 'geodirectory'),
68 
+		'desc' => __('Show the right section of home page', 'geodirectory'),
69 
+		'id' => 'geodir_show_home_right_section',
70 
+		'type' => 'checkbox',
71 
+		'std' => '1' // Default value to show home top section
72 
+	),
73 73
74 
-    array(
75 
-        'name' => __('Width of home right section', 'geodirectory'),
76 
-        'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),
77 
-        'id' => 'geodir_width_home_right_section',
78 
-        'type' => 'text',
79 
-        'css' => 'min-width:300px;',
80 
-        'std' => '30' // Default value to show home top section
81 
-    ),
74 
+	array(
75 
+		'name' => __('Width of home right section', 'geodirectory'),
76 
+		'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),
77 
+		'id' => 'geodir_width_home_right_section',
78 
+		'type' => 'text',
79 
+		'css' => 'min-width:300px;',
80 
+		'std' => '30' // Default value to show home top section
81 
+	),
82 82
83 
-    array(
84 
-        'name' => __('Home content section', 'geodirectory'),
85 
-        'desc' => __('Show the content section of home page', 'geodirectory'),
86 
-        'id' => 'geodir_show_home_contant_section',
87 
-        'type' => 'checkbox',
88 
-        'std' => '1' // Default value to show home top section
89 
-    ),
83 
+	array(
84 
+		'name' => __('Home content section', 'geodirectory'),
85 
+		'desc' => __('Show the content section of home page', 'geodirectory'),
86 
+		'id' => 'geodir_show_home_contant_section',
87 
+		'type' => 'checkbox',
88 
+		'std' => '1' // Default value to show home top section
89 
+	),
90 90
91 
-    array(
92 
-        'name' => __('Width of home content section', 'geodirectory'),
93 
-        'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),
94 
-        'id' => 'geodir_width_home_contant_section',
95 
-        'type' => 'text',
96 
-        'css' => 'min-width:300px;',
97 
-        'std' => '63' // Default value to show home top section
98 
-    ),
91 
+	array(
92 
+		'name' => __('Width of home content section', 'geodirectory'),
93 
+		'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),
94 
+		'id' => 'geodir_width_home_contant_section',
95 
+		'type' => 'text',
96 
+		'css' => 'min-width:300px;',
97 
+		'std' => '63' // Default value to show home top section
98 
+	),
99 99
100 
-    array(
101 
-        'name' => __('Home left section', 'geodirectory'),
102 
-        'desc' => __('Show the left section of home page', 'geodirectory'),
103 
-        'id' => 'geodir_show_home_left_section',
104 
-        'type' => 'checkbox',
105 
-        'std' => '0' // Default value to show home top section
106 
-    ),
100 
+	array(
101 
+		'name' => __('Home left section', 'geodirectory'),
102 
+		'desc' => __('Show the left section of home page', 'geodirectory'),
103 
+		'id' => 'geodir_show_home_left_section',
104 
+		'type' => 'checkbox',
105 
+		'std' => '0' // Default value to show home top section
106 
+	),
107 107
108 
-    array(
109 
-        'name' => __('Width of home left section', 'geodirectory'),
110 
-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
111 
-        'id' => 'geodir_width_home_left_section',
112 
-        'type' => 'text',
113 
-        'css' => 'min-width:300px;',
114 
-        'std' => '30' // Default value to show home top section
115 
-    ),
108 
+	array(
109 
+		'name' => __('Width of home left section', 'geodirectory'),
110 
+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
111 
+		'id' => 'geodir_width_home_left_section',
112 
+		'type' => 'text',
113 
+		'css' => 'min-width:300px;',
114 
+		'std' => '30' // Default value to show home top section
115 
+	),
116 116
117 
-    array(
118 
-        'name' => __('Home bottom section', 'geodirectory'),
119 
-        'desc' => __('Show the bottom section of home page', 'geodirectory'),
120 
-        'id' => 'geodir_show_home_bottom_section',
121 
-        'type' => 'checkbox',
122 
-        'std' => '0' // Default value to show home top section
123 
-    ),
124 
-    array(
125 
-        'name' => __('Resize image large size', 'geodirectory'),
126 
-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),
127 
-        'id' => 'geodir_use_wp_media_large_size',
128 
-        'type' => 'checkbox',
129 
-        'std' => '0'
130 
-    ),
117 
+	array(
118 
+		'name' => __('Home bottom section', 'geodirectory'),
119 
+		'desc' => __('Show the bottom section of home page', 'geodirectory'),
120 
+		'id' => 'geodir_show_home_bottom_section',
121 
+		'type' => 'checkbox',
122 
+		'std' => '0' // Default value to show home top section
123 
+	),
124 
+	array(
125 
+		'name' => __('Resize image large size', 'geodirectory'),
126 
+		'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),
127 
+		'id' => 'geodir_use_wp_media_large_size',
128 
+		'type' => 'checkbox',
129 
+		'std' => '0'
130 
+	),
131 131
132 
-    array('type' => 'sectionend', 'id' => 'geodir_home_layout'),
132 
+	array('type' => 'sectionend', 'id' => 'geodir_home_layout'),
133 133
134 134
135 
-    /* Home Layout Settings end */
135 
+	/* Home Layout Settings end */
136 136
137 137
138 
-    /* Listing Layout Settings end */
138 
+	/* Listing Layout Settings end */
139 139
140 
-    array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),
140 
+	array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),
141 141
142 142
143 
-    array('name' => __('Listing Page Layout Settings', 'geodirectory'),
144 
-        'type' => 'sectionstart',
145 
-        'desc' => '',
146 
-        'id' => 'geodir_listing_layout'),
143 
+	array('name' => __('Listing Page Layout Settings', 'geodirectory'),
144 
+		'type' => 'sectionstart',
145 
+		'desc' => '',
146 
+		'id' => 'geodir_listing_layout'),
147 147
148 
-    array(
149 
-        'name' => __('Listing top section', 'geodirectory'),
150 
-        'desc' => __('Show the top section of listing page', 'geodirectory'),
151 
-        'id' => 'geodir_show_listing_top_section',
152 
-        'type' => 'checkbox',
153 
-        'std' => '1' // Default value to show home top section
154 
-    ),
148 
+	array(
149 
+		'name' => __('Listing top section', 'geodirectory'),
150 
+		'desc' => __('Show the top section of listing page', 'geodirectory'),
151 
+		'id' => 'geodir_show_listing_top_section',
152 
+		'type' => 'checkbox',
153 
+		'std' => '1' // Default value to show home top section
154 
+	),
155 155
156 
-    array(
157 
-        'name' => __('Listing right section', 'geodirectory'),
158 
-        'desc' => __('Show the right section of listing page', 'geodirectory'),
159 
-        'id' => 'geodir_show_listing_right_section',
160 
-        'type' => 'checkbox',
161 
-        'std' => '1' // Default value to show home top section
162 
-    ),
156 
+	array(
157 
+		'name' => __('Listing right section', 'geodirectory'),
158 
+		'desc' => __('Show the right section of listing page', 'geodirectory'),
159 
+		'id' => 'geodir_show_listing_right_section',
160 
+		'type' => 'checkbox',
161 
+		'std' => '1' // Default value to show home top section
162 
+	),
163 163
164 
-    array(
165 
-        'name' => __('Width of listing right section', 'geodirectory'),
166 
-        'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),
167 
-        'id' => 'geodir_width_listing_right_section',
168 
-        'type' => 'text',
169 
-        'css' => 'min-width:300px;',
170 
-        'std' => '30' // Default value to show home top section
171 
-    ),
164 
+	array(
165 
+		'name' => __('Width of listing right section', 'geodirectory'),
166 
+		'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),
167 
+		'id' => 'geodir_width_listing_right_section',
168 
+		'type' => 'text',
169 
+		'css' => 'min-width:300px;',
170 
+		'std' => '30' // Default value to show home top section
171 
+	),
172 172
173 173
174 
-    array(
175 
-        'name' => __('Listing content section view', 'geodirectory'),
176 
-        'desc' => __('Set the listing view of listing page', 'geodirectory'),
177 
-        'id' => 'geodir_listing_view',
178 
-        'css' => 'min-width:300px;',
179 
-        'std' => 'gridview_onehalf',
180 
-        'type' => 'select',
181 
-        'class' => 'chosen_select',
182 
-        'options' => array_unique(array(
183 
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
184 
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
185 
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
186 
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
187 
-            'listview' => __('List view', 'geodirectory'),
188 
-        ))
189 
-    ),
174 
+	array(
175 
+		'name' => __('Listing content section view', 'geodirectory'),
176 
+		'desc' => __('Set the listing view of listing page', 'geodirectory'),
177 
+		'id' => 'geodir_listing_view',
178 
+		'css' => 'min-width:300px;',
179 
+		'std' => 'gridview_onehalf',
180 
+		'type' => 'select',
181 
+		'class' => 'chosen_select',
182 
+		'options' => array_unique(array(
183 
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
184 
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
185 
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
186 
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
187 
+			'listview' => __('List view', 'geodirectory'),
188 
+		))
189 
+	),
190 190
191 
-    array(
192 
-        'name' => __('Width of listing content section', 'geodirectory'),
193 
-        'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),
194 
-        'id' => 'geodir_width_listing_contant_section',
195 
-        'type' => 'text',
196 
-        'css' => 'min-width:300px;',
197 
-        'std' => '63' // Default value to show home top section
198 
-    ),
191 
+	array(
192 
+		'name' => __('Width of listing content section', 'geodirectory'),
193 
+		'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),
194 
+		'id' => 'geodir_width_listing_contant_section',
195 
+		'type' => 'text',
196 
+		'css' => 'min-width:300px;',
197 
+		'std' => '63' // Default value to show home top section
198 
+	),
199 199
200 
-    array(
201 
-        'name' => __('Listing left section', 'geodirectory'),
202 
-        'desc' => __('Show the left section of listing page', 'geodirectory'),
203 
-        'id' => 'geodir_show_listing_left_section',
204 
-        'type' => 'checkbox',
205 
-        'std' => '0' // Default value to show home top section
206 
-    ),
200 
+	array(
201 
+		'name' => __('Listing left section', 'geodirectory'),
202 
+		'desc' => __('Show the left section of listing page', 'geodirectory'),
203 
+		'id' => 'geodir_show_listing_left_section',
204 
+		'type' => 'checkbox',
205 
+		'std' => '0' // Default value to show home top section
206 
+	),
207 207
208 
-    array(
209 
-        'name' => __('Width of listing left section', 'geodirectory'),
210 
-        'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),
211 
-        'id' => 'geodir_width_listing_left_section',
212 
-        'type' => 'text',
213 
-        'css' => 'min-width:300px;',
214 
-        'std' => '30' // Default value to show home top section
215 
-    ),
208 
+	array(
209 
+		'name' => __('Width of listing left section', 'geodirectory'),
210 
+		'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),
211 
+		'id' => 'geodir_width_listing_left_section',
212 
+		'type' => 'text',
213 
+		'css' => 'min-width:300px;',
214 
+		'std' => '30' // Default value to show home top section
215 
+	),
216 216
217 
-    array(
218 
-        'name' => __('Listing bottom section', 'geodirectory'),
219 
-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),
220 
-        'id' => 'geodir_show_listing_bottom_section',
221 
-        'type' => 'checkbox',
222 
-        'std' => '0' // Default value to show home top section
223 
-    ),
217 
+	array(
218 
+		'name' => __('Listing bottom section', 'geodirectory'),
219 
+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),
220 
+		'id' => 'geodir_show_listing_bottom_section',
221 
+		'type' => 'checkbox',
222 
+		'std' => '0' // Default value to show home top section
223 
+	),
224 224
225 
-    array(
226 
-        'name' => __('Upload listing no image', 'geodirectory'),
227 
-        'desc' => '',
228 
-        'id' => 'geodir_listing_no_img',
229 
-        'type' => 'file',
230 
-        'std' => '0' // Default value to show home top section
231 
-    ),
225 
+	array(
226 
+		'name' => __('Upload listing no image', 'geodirectory'),
227 
+		'desc' => '',
228 
+		'id' => 'geodir_listing_no_img',
229 
+		'type' => 'file',
230 
+		'std' => '0' // Default value to show home top section
231 
+	),
232 232
233 
-    array(
234 
-        'name' => __('Description word limit', 'geodirectory'),
235 
-        'desc' => '',
236 
-        'id' => 'geodir_desc_word_limit',
237 
-        'type' => 'text',
238 
-        'css' => 'min-width:300px;',
239 
-        'std' => '50' // Default value to show home top section
240 
-    ),
233 
+	array(
234 
+		'name' => __('Description word limit', 'geodirectory'),
235 
+		'desc' => '',
236 
+		'id' => 'geodir_desc_word_limit',
237 
+		'type' => 'text',
238 
+		'css' => 'min-width:300px;',
239 
+		'std' => '50' // Default value to show home top section
240 
+	),
241 241
242 
-    array(
243 
-        'name' => __('Hover listing map animation', 'geodirectory'),
244 
-        'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),
245 
-        'id' => 'geodir_listing_hover_bounce_map_pin',
246 
-        'type' => 'checkbox',
247 
-        'std' => '1' // Default value to show home top section
248 
-    ),
242 
+	array(
243 
+		'name' => __('Hover listing map animation', 'geodirectory'),
244 
+		'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),
245 
+		'id' => 'geodir_listing_hover_bounce_map_pin',
246 
+		'type' => 'checkbox',
247 
+		'std' => '1' // Default value to show home top section
248 
+	),
249 249
250 
-    array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),
250 
+	array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),
251 251
252 252
253 
-    array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),
253 
+	array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),
254 254
255 
-    array(
256 
-        'name' => __('New listing default status', 'geodirectory'),
257 
-        'desc' => __('Select new listing default status.', 'geodirectory'),
258 
-        'tip' => '',
259 
-        'id' => 'geodir_new_post_default_status',
260 
-        'css' => 'min-width:300px;',
261 
-        'std' => 'publish',
262 
-        'type' => 'select',
263 
-        'class' => 'chosen_select',
264 
-        'options' => array_unique(array(
265 
-            'publish' => __('publish', 'geodirectory'),
266 
-            'draft' => __('draft', 'geodirectory'),
267 
-        ))
268 
-    ),
255 
+	array(
256 
+		'name' => __('New listing default status', 'geodirectory'),
257 
+		'desc' => __('Select new listing default status.', 'geodirectory'),
258 
+		'tip' => '',
259 
+		'id' => 'geodir_new_post_default_status',
260 
+		'css' => 'min-width:300px;',
261 
+		'std' => 'publish',
262 
+		'type' => 'select',
263 
+		'class' => 'chosen_select',
264 
+		'options' => array_unique(array(
265 
+			'publish' => __('publish', 'geodirectory'),
266 
+			'draft' => __('draft', 'geodirectory'),
267 
+		))
268 
+	),
269 269
270 
-    array(
271 
-        'name' => __('New listings settings', 'geodirectory'),
272 
-        'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),
273 
-        'id' => 'geodir_listing_new_days',
274 
-        'type' => 'text',
275 
-        'css' => 'min-width:300px;',
276 
-        'std' => '30' // Default value for the page title - changed in settings
277 
-    ),
270 
+	array(
271 
+		'name' => __('New listings settings', 'geodirectory'),
272 
+		'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),
273 
+		'id' => 'geodir_listing_new_days',
274 
+		'type' => 'text',
275 
+		'css' => 'min-width:300px;',
276 
+		'std' => '30' // Default value for the page title - changed in settings
277 
+	),
278 278
279 
-    array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),
279 
+	array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),
280 280
281 281
282 
-    array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),
282 
+	array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),
283 283
284 
-    array(
285 
-        'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),
286 
-        'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),
287 
-        'id' => 'geodir_accept_term_condition',
288 
-        'type' => 'checkbox',
289 
-        'std' => '1' // Default value to show home top section
290 
-    ),
284 
+	array(
285 
+		'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),
286 
+		'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),
287 
+		'id' => 'geodir_accept_term_condition',
288 
+		'type' => 'checkbox',
289 
+		'std' => '1' // Default value to show home top section
290 
+	),
291 291
292 292
293 
-    array(
294 
-        'name' => __('Show description field as editor', 'geodirectory'),
295 
-        'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),
296 
-        'tip' => '',
297 
-        'id' => 'geodir_tiny_editor_on_add_listing',
298 
-        'css' => 'min-width:300px;',
299 
-        'std' => array(),
300 
-        'type' => 'multiselect',
301 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
302 
-        'class' => 'chosen_select',
303 
-        'options' => array_unique(geodir_post_type_setting_fun())
304 
-    ),
293 
+	array(
294 
+		'name' => __('Show description field as editor', 'geodirectory'),
295 
+		'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),
296 
+		'tip' => '',
297 
+		'id' => 'geodir_tiny_editor_on_add_listing',
298 
+		'css' => 'min-width:300px;',
299 
+		'std' => array(),
300 
+		'type' => 'multiselect',
301 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
302 
+		'class' => 'chosen_select',
303 
+		'options' => array_unique(geodir_post_type_setting_fun())
304 
+	),
305 305
306 
-    array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),
307 
-    /* Listing Layout Settings end */
306 
+	array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),
307 
+	/* Listing Layout Settings end */
308 308
309 309
310 
-    /* Search Layout Settings end */
310 
+	/* Search Layout Settings end */
311 311
312 
-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),
312 
+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),
313 313
314 314
315 
-    array('name' => __('Search Page Layout Settings', 'geodirectory'),
316 
-        'type' => 'sectionstart',
317 
-        'desc' => '',
318 
-        'id' => 'geodir_search_layout'),
315 
+	array('name' => __('Search Page Layout Settings', 'geodirectory'),
316 
+		'type' => 'sectionstart',
317 
+		'desc' => '',
318 
+		'id' => 'geodir_search_layout'),
319 319
320 
-    array(
321 
-        'name' => __('Search top section', 'geodirectory'),
322 
-        'desc' => __('Show the top section of search page', 'geodirectory'),
323 
-        'id' => 'geodir_show_search_top_section',
324 
-        'type' => 'checkbox',
325 
-        'std' => '1' // Default value to show home top section
326 
-    ),
320 
+	array(
321 
+		'name' => __('Search top section', 'geodirectory'),
322 
+		'desc' => __('Show the top section of search page', 'geodirectory'),
323 
+		'id' => 'geodir_show_search_top_section',
324 
+		'type' => 'checkbox',
325 
+		'std' => '1' // Default value to show home top section
326 
+	),
327 327
328 
-    array(
329 
-        'name' => __('Search right section', 'geodirectory'),
330 
-        'desc' => __('Show the right section of search page', 'geodirectory'),
331 
-        'id' => 'geodir_show_search_right_section',
332 
-        'type' => 'checkbox',
333 
-        'std' => '1' // Default value to show home top section
334 
-    ),
328 
+	array(
329 
+		'name' => __('Search right section', 'geodirectory'),
330 
+		'desc' => __('Show the right section of search page', 'geodirectory'),
331 
+		'id' => 'geodir_show_search_right_section',
332 
+		'type' => 'checkbox',
333 
+		'std' => '1' // Default value to show home top section
334 
+	),
335 335
336 
-    array(
337 
-        'name' => __('Width of search right section', 'geodirectory'),
338 
-        'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),
339 
-        'id' => 'geodir_width_search_right_section',
340 
-        'type' => 'text',
341 
-        'css' => 'min-width:300px;',
342 
-        'std' => '30' // Default value to show home top section
343 
-    ),
336 
+	array(
337 
+		'name' => __('Width of search right section', 'geodirectory'),
338 
+		'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),
339 
+		'id' => 'geodir_width_search_right_section',
340 
+		'type' => 'text',
341 
+		'css' => 'min-width:300px;',
342 
+		'std' => '30' // Default value to show home top section
343 
+	),
344 344
345 345
346 
-    array(
347 
-        'name' => __('Search content section view', 'geodirectory'),
348 
-        'desc' => __('Set the listing view of search page', 'geodirectory'),
349 
-        'id' => 'geodir_search_view',
350 
-        'css' => 'min-width:300px;',
351 
-        'std' => 'gridview_onehalf',
352 
-        'type' => 'select',
353 
-        'class' => 'chosen_select',
354 
-        'options' => array_unique(array(
355 
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
356 
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
357 
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
358 
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
359 
-            'listview' => __('List view', 'geodirectory'),
360 
-        ))
361 
-    ),
346 
+	array(
347 
+		'name' => __('Search content section view', 'geodirectory'),
348 
+		'desc' => __('Set the listing view of search page', 'geodirectory'),
349 
+		'id' => 'geodir_search_view',
350 
+		'css' => 'min-width:300px;',
351 
+		'std' => 'gridview_onehalf',
352 
+		'type' => 'select',
353 
+		'class' => 'chosen_select',
354 
+		'options' => array_unique(array(
355 
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
356 
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
357 
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
358 
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
359 
+			'listview' => __('List view', 'geodirectory'),
360 
+		))
361 
+	),
362 362
363 
-    array(
364 
-        'name' => __('Width of search content section', 'geodirectory'),
365 
-        'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),
366 
-        'id' => 'geodir_width_search_contant_section',
367 
-        'type' => 'text',
368 
-        'css' => 'min-width:300px;',
369 
-        'std' => '63' // Default value to show home top section
370 
-    ),
363 
+	array(
364 
+		'name' => __('Width of search content section', 'geodirectory'),
365 
+		'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),
366 
+		'id' => 'geodir_width_search_contant_section',
367 
+		'type' => 'text',
368 
+		'css' => 'min-width:300px;',
369 
+		'std' => '63' // Default value to show home top section
370 
+	),
371 371
372 
-    array(
373 
-        'name' => __('Search left section', 'geodirectory'),
374 
-        'desc' => __('Show the left section of search page', 'geodirectory'),
375 
-        'id' => 'geodir_show_search_left_section',
376 
-        'type' => 'checkbox',
377 
-        'std' => '0' // Default value to show home top section
378 
-    ),
372 
+	array(
373 
+		'name' => __('Search left section', 'geodirectory'),
374 
+		'desc' => __('Show the left section of search page', 'geodirectory'),
375 
+		'id' => 'geodir_show_search_left_section',
376 
+		'type' => 'checkbox',
377 
+		'std' => '0' // Default value to show home top section
378 
+	),
379 379
380 
-    array(
381 
-        'name' => __('Width of search left section', 'geodirectory'),
382 
-        'desc' => __('Enter the width of left section of search in %', 'geodirectory'),
383 
-        'id' => 'geodir_width_search_left_section',
384 
-        'type' => 'text',
385 
-        'css' => 'min-width:300px;',
386 
-        'std' => '30' // Default value to show home top section
387 
-    ),
380 
+	array(
381 
+		'name' => __('Width of search left section', 'geodirectory'),
382 
+		'desc' => __('Enter the width of left section of search in %', 'geodirectory'),
383 
+		'id' => 'geodir_width_search_left_section',
384 
+		'type' => 'text',
385 
+		'css' => 'min-width:300px;',
386 
+		'std' => '30' // Default value to show home top section
387 
+	),
388 388
389 
-    array(
390 
-        'name' => __('Search bottom section', 'geodirectory'),
391 
-        'desc' => __('Show the bottom section of search page', 'geodirectory'),
392 
-        'id' => 'geodir_show_search_bottom_section',
393 
-        'type' => 'checkbox',
394 
-        'std' => '0' // Default value to show home top section
395 
-    ),
389 
+	array(
390 
+		'name' => __('Search bottom section', 'geodirectory'),
391 
+		'desc' => __('Show the bottom section of search page', 'geodirectory'),
392 
+		'id' => 'geodir_show_search_bottom_section',
393 
+		'type' => 'checkbox',
394 
+		'std' => '0' // Default value to show home top section
395 
+	),
396 396
397 397 
 	array(
398 
-        'name' => __('Show advanced pagination details', 'geodirectory'),
399 
-        'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),
400 
-        'id' => 'geodir_pagination_advance_info',
401 
-        'css' => 'min-width:300px;',
402 
-        'std' => '',
403 
-        'type' => 'select',
404 
-        'class' => 'chosen_select',
405 
-        'options' => array(
398 
+		'name' => __('Show advanced pagination details', 'geodirectory'),
399 
+		'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),
400 
+		'id' => 'geodir_pagination_advance_info',
401 
+		'css' => 'min-width:300px;',
402 
+		'std' => '',
403 
+		'type' => 'select',
404 
+		'class' => 'chosen_select',
405 
+		'options' => array(
406 406 
 						'' => __('Never Display', 'geodirectory'),
407 407 
 						'after' => __('After Pagination', 'geodirectory'),
408 408 
 						'before' => __('Before Pagination', 'geodirectory')
409 409 
 					)
410 
-    ),
410 
+	),
411 411
412 
-    array('type' => 'sectionend', 'id' => 'geodir_search_layout'),
412 
+	array('type' => 'sectionend', 'id' => 'geodir_search_layout'),
413 413
414 414
415 
-    array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),
415 
+	array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),
416 416
417 
-    array(
418 
-        'name' => __('Use old non-styled form', 'geodirectory'),
419 
-        'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'),
420 
-        'id' => 'geodir_show_search_old_search_from',
421 
-        'type' => 'checkbox',
422 
-        'std' => '0' // Default value to show
423 
-    ),
417 
+	array(
418 
+		'name' => __('Use old non-styled form', 'geodirectory'),
419 
+		'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'),
420 
+		'id' => 'geodir_show_search_old_search_from',
421 
+		'type' => 'checkbox',
422 
+		'std' => '0' // Default value to show
423 
+	),
424 424
425 
-    array(
426 
-        'name' => __('Search field default value', 'geodirectory'),
427 
-        'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),
428 
-        'id' => 'geodir_search_field_default_text',
429 
-        'type' => 'text',
430 
-        'css' => 'min-width:300px;',
431 
-        'std' => 'Search for' // show on the listing page.
432 
-    ),
425 
+	array(
426 
+		'name' => __('Search field default value', 'geodirectory'),
427 
+		'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),
428 
+		'id' => 'geodir_search_field_default_text',
429 
+		'type' => 'text',
430 
+		'css' => 'min-width:300px;',
431 
+		'std' => 'Search for' // show on the listing page.
432 
+	),
433 433
434 
-    array(
435 
-        'name' => __('Near field default value', 'geodirectory'),
436 
-        'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),
437 
-        'id' => 'geodir_near_field_default_text',
438 
-        'type' => 'text',
439 
-        'css' => 'min-width:300px;',
440 
-        'std' => 'Near' // show on the listing page.
441 
-    ),
434 
+	array(
435 
+		'name' => __('Near field default value', 'geodirectory'),
436 
+		'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),
437 
+		'id' => 'geodir_near_field_default_text',
438 
+		'type' => 'text',
439 
+		'css' => 'min-width:300px;',
440 
+		'std' => 'Near' // show on the listing page.
441 
+	),
442 442
443 
-    array(
444 
-        'name' => __('Search button label', 'geodirectory'),
445 
-        'desc' => __('Show the search button label on search form.', 'geodirectory'),
446 
-        'id' => 'geodir_search_button_label',
447 
-        'type' => 'text',
448 
-        'css' => 'min-width:300px;',
449 
-        'std' => 'Search' // show on the listing page.
450 
-    ),
443 
+	array(
444 
+		'name' => __('Search button label', 'geodirectory'),
445 
+		'desc' => __('Show the search button label on search form.', 'geodirectory'),
446 
+		'id' => 'geodir_search_button_label',
447 
+		'type' => 'text',
448 
+		'css' => 'min-width:300px;',
449 
+		'std' => 'Search' // show on the listing page.
450 
+	),
451 451
452 
-    array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),
452 
+	array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),
453 453
454 
-    /* Listing Layout Settings end */
454 
+	/* Listing Layout Settings end */
455 455
456 456
457 
-    /* Detail Layout Settings end */
457 
+	/* Detail Layout Settings end */
458 458
459 
-    array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),
459 
+	array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),
460 460
461 
-    array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),
461 
+	array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),
462 462
463 
-    array(
464 
-        'name' => __('Detail top section', 'geodirectory'),
465 
-        'desc' => __('Show the top section of listing page', 'geodirectory'),
466 
-        'id' => 'geodir_show_detail_top_section',
467 
-        'type' => 'checkbox',
468 
-        'std' => '1' // Default value to show home top section
469 
-    ),
463 
+	array(
464 
+		'name' => __('Detail top section', 'geodirectory'),
465 
+		'desc' => __('Show the top section of listing page', 'geodirectory'),
466 
+		'id' => 'geodir_show_detail_top_section',
467 
+		'type' => 'checkbox',
468 
+		'std' => '1' // Default value to show home top section
469 
+	),
470 470
471 
-    array(
472 
-        'name' => __('Detail bottom section', 'geodirectory'),
473 
-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),
474 
-        'id' => 'geodir_show_detail_bottom_section',
475 
-        'type' => 'checkbox',
476 
-        'std' => '1' // Default value to show home top section
477 
-    ),
478 
-    array(
479 
-        'name' => __('Detail sidebar section on left side', 'geodirectory'),
480 
-        'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),
481 
-        'id' => 'geodir_detail_sidebar_left_section',
482 
-        'type' => 'checkbox',
483 
-        'std' => '0'
484 
-    ),
485 
-    array(
486 
-        'name' => __('Disable GD modal', 'geodirectory'),
487 
-        'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),
488 
-        'id' => 'geodir_disable_gb_modal',
489 
-        'type' => 'checkbox',
490 
-        'std' => '0'
491 
-    ),
492 
-    array(
493 
-        'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),
494 
-        'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),
495 
-        'id' => 'geodir_disable_tfg_buttons_section',
496 
-        'type' => 'checkbox',
497 
-        'std' => '0'
498 
-    ),
499 
-    array(
500 
-        'name' => __('Disable Google Analytics section', 'geodirectory'),
501 
-        'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),
502 
-        'id' => 'geodir_disable_google_analytics_section',
503 
-        'type' => 'checkbox',
504 
-        'std' => '0'
505 
-    ),
506 
-    array(
507 
-        'name' => __('Disable User Links section', 'geodirectory'),
508 
-        'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),
509 
-        'id' => 'geodir_disable_user_links_section',
510 
-        'type' => 'checkbox',
511 
-        'std' => '0'
512 
-    ),
513 
-    array(
514 
-        'name' => __('Disable Rating Info section', 'geodirectory'),
515 
-        'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),
516 
-        'id' => 'geodir_disable_rating_info_section',
517 
-        'type' => 'checkbox',
518 
-        'std' => '0'
519 
-    ),
520 
-    array(
521 
-        'name' => __('Disable Listing Info section', 'geodirectory'),
522 
-        'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),
523 
-        'id' => 'geodir_disable_listing_info_section',
524 
-        'type' => 'checkbox',
525 
-        'std' => '0'
526 
-    ),
471 
+	array(
472 
+		'name' => __('Detail bottom section', 'geodirectory'),
473 
+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),
474 
+		'id' => 'geodir_show_detail_bottom_section',
475 
+		'type' => 'checkbox',
476 
+		'std' => '1' // Default value to show home top section
477 
+	),
478 
+	array(
479 
+		'name' => __('Detail sidebar section on left side', 'geodirectory'),
480 
+		'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),
481 
+		'id' => 'geodir_detail_sidebar_left_section',
482 
+		'type' => 'checkbox',
483 
+		'std' => '0'
484 
+	),
485 
+	array(
486 
+		'name' => __('Disable GD modal', 'geodirectory'),
487 
+		'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),
488 
+		'id' => 'geodir_disable_gb_modal',
489 
+		'type' => 'checkbox',
490 
+		'std' => '0'
491 
+	),
492 
+	array(
493 
+		'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),
494 
+		'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),
495 
+		'id' => 'geodir_disable_tfg_buttons_section',
496 
+		'type' => 'checkbox',
497 
+		'std' => '0'
498 
+	),
499 
+	array(
500 
+		'name' => __('Disable Google Analytics section', 'geodirectory'),
501 
+		'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),
502 
+		'id' => 'geodir_disable_google_analytics_section',
503 
+		'type' => 'checkbox',
504 
+		'std' => '0'
505 
+	),
506 
+	array(
507 
+		'name' => __('Disable User Links section', 'geodirectory'),
508 
+		'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),
509 
+		'id' => 'geodir_disable_user_links_section',
510 
+		'type' => 'checkbox',
511 
+		'std' => '0'
512 
+	),
513 
+	array(
514 
+		'name' => __('Disable Rating Info section', 'geodirectory'),
515 
+		'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),
516 
+		'id' => 'geodir_disable_rating_info_section',
517 
+		'type' => 'checkbox',
518 
+		'std' => '0'
519 
+	),
520 
+	array(
521 
+		'name' => __('Disable Listing Info section', 'geodirectory'),
522 
+		'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),
523 
+		'id' => 'geodir_disable_listing_info_section',
524 
+		'type' => 'checkbox',
525 
+		'std' => '0'
526 
+	),
527 527
528 
-    array('type' => 'sectionend', 'id' => 'detail_page_settings'),
528 
+	array('type' => 'sectionend', 'id' => 'detail_page_settings'),
529 529
530 530
531 
-    /* ---------- DETAIL PAGE TAB SETTING START*/
531 
+	/* ---------- DETAIL PAGE TAB SETTING START*/
532 532
533 
-    array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),
533 
+	array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),
534 534
535 
-    array(
536 
-        'name' => __('Exclude selected tabs from detail page', 'geodirectory'),
537 
-        'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),
538 
-        'tip' => '',
539 
-        'id' => 'geodir_detail_page_tabs_excluded',
540 
-        'css' => 'min-width:300px;',
541 
-        'std' => geodir_get_posttypes(),
542 
-        'type' => 'multiselect',
543 
-        'placeholder_text' => __('Select tabs', 'geodirectory'),
544 
-        'class' => 'chosen_select',
545 
-        'options' => array_unique(geodir_detail_page_tabs_key_value_array())
546 
-    ),
535 
+	array(
536 
+		'name' => __('Exclude selected tabs from detail page', 'geodirectory'),
537 
+		'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),
538 
+		'tip' => '',
539 
+		'id' => 'geodir_detail_page_tabs_excluded',
540 
+		'css' => 'min-width:300px;',
541 
+		'std' => geodir_get_posttypes(),
542 
+		'type' => 'multiselect',
543 
+		'placeholder_text' => __('Select tabs', 'geodirectory'),
544 
+		'class' => 'chosen_select',
545 
+		'options' => array_unique(geodir_detail_page_tabs_key_value_array())
546 
+	),
547 547
548 
-    array(
549 
-        'name' => __('Show as list', 'geodirectory'),
550 
-        'desc' => __('Show as list instead of tabs', 'geodirectory'),
551 
-        'id' => 'geodir_disable_tabs',
552 
-        'type' => 'checkbox',
553 
-        'std' => '0'
554 
-    ),
548 
+	array(
549 
+		'name' => __('Show as list', 'geodirectory'),
550 
+		'desc' => __('Show as list instead of tabs', 'geodirectory'),
551 
+		'id' => 'geodir_disable_tabs',
552 
+		'type' => 'checkbox',
553 
+		'std' => '0'
554 
+	),
555 555
556 
-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
557 
-    /* ---------- DETAIL PAGE TAB SETTING END*/
556 
+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
557 
+	/* ---------- DETAIL PAGE TAB SETTING END*/
558 558
559 
-    /* START DEFAULT STAR IMAGE*/
560 
-    array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),
559 
+	/* START DEFAULT STAR IMAGE*/
560 
+	array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),
561 561
562 
-    array(
563 
-        'name' => __('Upload default rating star icon', 'geodirectory'),
564 
-        'desc' => '',
565 
-        'id' => 'geodir_default_rating_star_icon',
566 
-        'type' => 'file',
567 
-        'std' => '0',
568 
-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
569 
-    ),
562 
+	array(
563 
+		'name' => __('Upload default rating star icon', 'geodirectory'),
564 
+		'desc' => '',
565 
+		'id' => 'geodir_default_rating_star_icon',
566 
+		'type' => 'file',
567 
+		'std' => '0',
568 
+		'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
569 
+	),
570 570 
 	array(
571 571 
 		'name' => __('Enable Font Awesome', 'geodirectory'),
572 572 
 		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

@@ -582,369 +582,369 @@  discard block
 
 block discarded – undo
582 582 
 		'std' => '#757575'
583 583 
 	),
584 584
585 
-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
585 
+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
586 586
587 
-    /* END DEFAULT STAR IMAGE*/
587 
+	/* END DEFAULT STAR IMAGE*/
588 588
589 
-    /* Detail related post settings start */
589 
+	/* Detail related post settings start */
590 590
591 
-    array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),
591 
+	array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),
592 592
593 
-    array(
594 
-        'name' => __('Show related post listing on', 'geodirectory'),
595 
-        'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),
596 
-        'tip' => '',
597 
-        'id' => 'geodir_add_related_listing_posttypes',
598 
-        'css' => 'min-width:300px;',
599 
-        'std' => geodir_get_posttypes(),
600 
-        'type' => 'multiselect',
601 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
602 
-        'class' => 'chosen_select',
603 
-        'options' => array_unique(geodir_post_type_setting_fun())
604 
-    ),
593 
+	array(
594 
+		'name' => __('Show related post listing on', 'geodirectory'),
595 
+		'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),
596 
+		'tip' => '',
597 
+		'id' => 'geodir_add_related_listing_posttypes',
598 
+		'css' => 'min-width:300px;',
599 
+		'std' => geodir_get_posttypes(),
600 
+		'type' => 'multiselect',
601 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
602 
+		'class' => 'chosen_select',
603 
+		'options' => array_unique(geodir_post_type_setting_fun())
604 
+	),
605 605
606 
-    array(
607 
-        'name' => __('Relate to', 'geodirectory'),
608 
-        'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),
609 
-        'id' => 'geodir_related_post_relate_to',
610 
-        'css' => 'min-width:300px;',
611 
-        'std' => 'category',
612 
-        'type' => 'select',
613 
-        'class' => 'chosen_select',
614 
-        'options' => array_unique(array(
615 
-            'category' => __('Categories', 'geodirectory'),
616 
-            'tags' => __('Tags', 'geodirectory'),
617 
-        ))
618 
-    ),
606 
+	array(
607 
+		'name' => __('Relate to', 'geodirectory'),
608 
+		'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),
609 
+		'id' => 'geodir_related_post_relate_to',
610 
+		'css' => 'min-width:300px;',
611 
+		'std' => 'category',
612 
+		'type' => 'select',
613 
+		'class' => 'chosen_select',
614 
+		'options' => array_unique(array(
615 
+			'category' => __('Categories', 'geodirectory'),
616 
+			'tags' => __('Tags', 'geodirectory'),
617 
+		))
618 
+	),
619 619
620 
-    array(
621 
-        'name' => __('Layout', 'geodirectory'),
622 
-        'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),
623 
-        'id' => 'geodir_related_post_listing_view',
624 
-        'css' => 'min-width:300px;',
625 
-        'std' => 'gridview_onehalf',
626 
-        'type' => 'select',
627 
-        'class' => 'chosen_select',
628 
-        'options' => array_unique(array(
629 
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
630 
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
631 
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
632 
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
633 
-            'listview' => __('List view', 'geodirectory'),
634 
-        ))
635 
-    ),
620 
+	array(
621 
+		'name' => __('Layout', 'geodirectory'),
622 
+		'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),
623 
+		'id' => 'geodir_related_post_listing_view',
624 
+		'css' => 'min-width:300px;',
625 
+		'std' => 'gridview_onehalf',
626 
+		'type' => 'select',
627 
+		'class' => 'chosen_select',
628 
+		'options' => array_unique(array(
629 
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
630 
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
631 
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
632 
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
633 
+			'listview' => __('List view', 'geodirectory'),
634 
+		))
635 
+	),
636 636
637 
-    array(
638 
-        'name' => __('Sort by', 'geodirectory'),
639 
-        'desc' => __('Set the related post listing sort by view', 'geodirectory'),
640 
-        'id' => 'geodir_related_post_sortby',
641 
-        'css' => 'min-width:300px;',
642 
-        'std' => 'latest',
643 
-        'type' => 'select',
644 
-        'class' => 'chosen_select',
645 
-        'options' => array_unique(array(
646 
-            'latest' => __('Latest', 'geodirectory'),
647 
-            'featured' => __('Featured', 'geodirectory'),
648 
-            'high_review' => __('Review', 'geodirectory'),
649 
-            'high_rating' => __('Rating', 'geodirectory'),
650 
-            'random' => __('Random', 'geodirectory'),
651 
-            'nearest' => __('Nearest', 'geodirectory'),
652 
-        ))
653 
-    ),
637 
+	array(
638 
+		'name' => __('Sort by', 'geodirectory'),
639 
+		'desc' => __('Set the related post listing sort by view', 'geodirectory'),
640 
+		'id' => 'geodir_related_post_sortby',
641 
+		'css' => 'min-width:300px;',
642 
+		'std' => 'latest',
643 
+		'type' => 'select',
644 
+		'class' => 'chosen_select',
645 
+		'options' => array_unique(array(
646 
+			'latest' => __('Latest', 'geodirectory'),
647 
+			'featured' => __('Featured', 'geodirectory'),
648 
+			'high_review' => __('Review', 'geodirectory'),
649 
+			'high_rating' => __('Rating', 'geodirectory'),
650 
+			'random' => __('Random', 'geodirectory'),
651 
+			'nearest' => __('Nearest', 'geodirectory'),
652 
+		))
653 
+	),
654 654
655 
-    array(
656 
-        'name' => __('Number of posts:', 'geodirectory'),
657 
-        'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),
658 
-        'id' => 'geodir_related_post_count',
659 
-        'type' => 'text',
660 
-        'css' => 'min-width:300px;',
661 
-        'std' => '5' // Default value to show home top section
662 
-    ),
655 
+	array(
656 
+		'name' => __('Number of posts:', 'geodirectory'),
657 
+		'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),
658 
+		'id' => 'geodir_related_post_count',
659 
+		'type' => 'text',
660 
+		'css' => 'min-width:300px;',
661 
+		'std' => '5' // Default value to show home top section
662 
+	),
663 663
664 
-    array(
665 
-        'name' => __('Post excerpt', 'geodirectory'),
666 
-        'desc' => __('Post content excerpt character count', 'geodirectory'),
667 
-        'id' => 'geodir_related_post_excerpt',
668 
-        'type' => 'text',
669 
-        'css' => 'min-width:300px;',
670 
-        'std' => '20' // Default value to show home top section
671 
-    ),
664 
+	array(
665 
+		'name' => __('Post excerpt', 'geodirectory'),
666 
+		'desc' => __('Post content excerpt character count', 'geodirectory'),
667 
+		'id' => 'geodir_related_post_excerpt',
668 
+		'type' => 'text',
669 
+		'css' => 'min-width:300px;',
670 
+		'std' => '20' // Default value to show home top section
671 
+	),
672 672
673 673
674 
-    array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),
675 
-    /* Detail Layout Settings end */
674 
+	array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),
675 
+	/* Detail Layout Settings end */
676 676
677 
-    /* Author Layout Settings Start */
677 
+	/* Author Layout Settings Start */
678 678
679 
-    array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),
679 
+	array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),
680 680
681 681
682 
-    array('name' => __('Author Page Layout Settings', 'geodirectory'),
683 
-        'type' => 'sectionstart',
684 
-        'desc' => '',
685 
-        'id' => 'geodir_author_layout'),
682 
+	array('name' => __('Author Page Layout Settings', 'geodirectory'),
683 
+		'type' => 'sectionstart',
684 
+		'desc' => '',
685 
+		'id' => 'geodir_author_layout'),
686 686
687 
-    array(
688 
-        'name' => __('Author top section', 'geodirectory'),
689 
-        'desc' => __('Show the top section of author page', 'geodirectory'),
690 
-        'id' => 'geodir_show_author_top_section',
691 
-        'type' => 'checkbox',
692 
-        'std' => '1' // Default value to show home top section
693 
-    ),
687 
+	array(
688 
+		'name' => __('Author top section', 'geodirectory'),
689 
+		'desc' => __('Show the top section of author page', 'geodirectory'),
690 
+		'id' => 'geodir_show_author_top_section',
691 
+		'type' => 'checkbox',
692 
+		'std' => '1' // Default value to show home top section
693 
+	),
694 694
695 
-    array(
696 
-        'name' => __('Author right section', 'geodirectory'),
697 
-        'desc' => __('Show the right section of author page', 'geodirectory'),
698 
-        'id' => 'geodir_show_author_right_section',
699 
-        'type' => 'checkbox',
700 
-        'std' => '1' // Default value to show home top section
701 
-    ),
695 
+	array(
696 
+		'name' => __('Author right section', 'geodirectory'),
697 
+		'desc' => __('Show the right section of author page', 'geodirectory'),
698 
+		'id' => 'geodir_show_author_right_section',
699 
+		'type' => 'checkbox',
700 
+		'std' => '1' // Default value to show home top section
701 
+	),
702 702
703 
-    array(
704 
-        'name' => __('Width of author right section', 'geodirectory'),
705 
-        'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),
706 
-        'id' => 'geodir_width_author_right_section',
707 
-        'type' => 'text',
708 
-        'css' => 'min-width:300px;',
709 
-        'std' => '30' // Default value to show home top section
710 
-    ),
703 
+	array(
704 
+		'name' => __('Width of author right section', 'geodirectory'),
705 
+		'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),
706 
+		'id' => 'geodir_width_author_right_section',
707 
+		'type' => 'text',
708 
+		'css' => 'min-width:300px;',
709 
+		'std' => '30' // Default value to show home top section
710 
+	),
711 711
712 
-    array(
713 
-        'name' => __('Author content section view', 'geodirectory'),
714 
-        'desc' => __('Set the listing view of author page', 'geodirectory'),
715 
-        'id' => 'geodir_author_view',
716 
-        'css' => 'min-width:300px;',
717 
-        'std' => 'gridview_onehalf',
718 
-        'type' => 'select',
719 
-        'class' => 'chosen_select',
720 
-        'options' => array_unique(array(
721 
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
722 
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
723 
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
724 
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
725 
-            'listview' => __('List view', 'geodirectory'),
726 
-        ))
727 
-    ),
712 
+	array(
713 
+		'name' => __('Author content section view', 'geodirectory'),
714 
+		'desc' => __('Set the listing view of author page', 'geodirectory'),
715 
+		'id' => 'geodir_author_view',
716 
+		'css' => 'min-width:300px;',
717 
+		'std' => 'gridview_onehalf',
718 
+		'type' => 'select',
719 
+		'class' => 'chosen_select',
720 
+		'options' => array_unique(array(
721 
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
722 
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
723 
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
724 
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
725 
+			'listview' => __('List view', 'geodirectory'),
726 
+		))
727 
+	),
728 728
729 
-    array(
730 
-        'name' => __('Width of author content section', 'geodirectory'),
731 
-        'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),
732 
-        'id' => 'geodir_width_author_contant_section',
733 
-        'type' => 'text',
734 
-        'css' => 'min-width:300px;',
735 
-        'std' => '63' // Default value to show home top section
736 
-    ),
729 
+	array(
730 
+		'name' => __('Width of author content section', 'geodirectory'),
731 
+		'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),
732 
+		'id' => 'geodir_width_author_contant_section',
733 
+		'type' => 'text',
734 
+		'css' => 'min-width:300px;',
735 
+		'std' => '63' // Default value to show home top section
736 
+	),
737 737
738 
-    array(
739 
-        'name' => __('Author left section', 'geodirectory'),
740 
-        'desc' => __('Show the left section of author page', 'geodirectory'),
741 
-        'id' => 'geodir_show_author_left_section',
742 
-        'type' => 'checkbox',
743 
-        'std' => '0' // Default value to show home top section
744 
-    ),
738 
+	array(
739 
+		'name' => __('Author left section', 'geodirectory'),
740 
+		'desc' => __('Show the left section of author page', 'geodirectory'),
741 
+		'id' => 'geodir_show_author_left_section',
742 
+		'type' => 'checkbox',
743 
+		'std' => '0' // Default value to show home top section
744 
+	),
745 745
746 
-    array(
747 
-        'name' => __('Width of author left section', 'geodirectory'),
748 
-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
749 
-        'id' => 'geodir_width_author_left_section',
750 
-        'type' => 'text',
751 
-        'css' => 'min-width:300px;',
752 
-        'std' => '30' // Default value to show home top section
753 
-    ),
746 
+	array(
747 
+		'name' => __('Width of author left section', 'geodirectory'),
748 
+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),
749 
+		'id' => 'geodir_width_author_left_section',
750 
+		'type' => 'text',
751 
+		'css' => 'min-width:300px;',
752 
+		'std' => '30' // Default value to show home top section
753 
+	),
754 754
755 
-    array(
756 
-        'name' => __('Author bottom section', 'geodirectory'),
757 
-        'desc' => __('Show the bottom section of author page', 'geodirectory'),
758 
-        'id' => 'geodir_show_author_bottom_section',
759 
-        'type' => 'checkbox',
760 
-        'std' => '0' // Default value to show home top section
761 
-    ),
755 
+	array(
756 
+		'name' => __('Author bottom section', 'geodirectory'),
757 
+		'desc' => __('Show the bottom section of author page', 'geodirectory'),
758 
+		'id' => 'geodir_show_author_bottom_section',
759 
+		'type' => 'checkbox',
760 
+		'std' => '0' // Default value to show home top section
761 
+	),
762 762
763 763
764 
-    array(
765 
-        'name' => __('Description word limit', 'geodirectory'),
766 
-        'desc' => '',
767 
-        'id' => 'geodir_author_desc_word_limit',
768 
-        'type' => 'text',
769 
-        'css' => 'min-width:300px;',
770 
-        'std' => '50' // Default value to show home top section
771 
-    ),
764 
+	array(
765 
+		'name' => __('Description word limit', 'geodirectory'),
766 
+		'desc' => '',
767 
+		'id' => 'geodir_author_desc_word_limit',
768 
+		'type' => 'text',
769 
+		'css' => 'min-width:300px;',
770 
+		'std' => '50' // Default value to show home top section
771 
+	),
772 772
773 
-    array('type' => 'sectionend', 'id' => 'geodir_author_layout'),
774 
-    /* Author Layout Settings end */
773 
+	array('type' => 'sectionend', 'id' => 'geodir_author_layout'),
774 
+	/* Author Layout Settings end */
775 775
776 776
777 
-    /* Post Type Navigation Settings Start */
778 
-    array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),
777 
+	/* Post Type Navigation Settings Start */
778 
+	array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),
779 779
780 780
781 
-    /* Post Type Navigation Settings Start */
781 
+	/* Post Type Navigation Settings Start */
782 782
783 
-    array('name' => __('Navigation Locations', 'geodirectory'),
784 
-        'type' => 'sectionstart',
785 
-        'desc' => '',
786 
-        'id' => 'geodir_navigation_locations'),
783 
+	array('name' => __('Navigation Locations', 'geodirectory'),
784 
+		'type' => 'sectionstart',
785 
+		'desc' => '',
786 
+		'id' => 'geodir_navigation_locations'),
787 787
788 
-    array(
789 
-        'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),
790 
-        'desc' => '',
791 
-        'tip' => '',
792 
-        'id' => 'geodir_theme_location_nav',
793 
-        'css' => 'min-width:300px;',
794 
-        'std' => array(),
795 
-        'type' => 'multiselect',
796 
-        'placeholder_text' => __('Select menu locations', 'geodirectory'),
797 
-        'class' => 'chosen_select',
798 
-        'options' => array_unique(geodir_theme_location_setting_fun())
799 
-    ),
800 
-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
801 
-
802 
-
803 
-    array('name' => __('Navigation Settings', 'geodirectory'),
804 
-        'type' => 'sectionstart',
805 
-        'desc' => '',
806 
-        'id' => 'geodir_navigation_options'),
788 
+	array(
789 
+		'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),
790 
+		'desc' => '',
791 
+		'tip' => '',
792 
+		'id' => 'geodir_theme_location_nav',
793 
+		'css' => 'min-width:300px;',
794 
+		'std' => array(),
795 
+		'type' => 'multiselect',
796 
+		'placeholder_text' => __('Select menu locations', 'geodirectory'),
797 
+		'class' => 'chosen_select',
798 
+		'options' => array_unique(geodir_theme_location_setting_fun())
799 
+	),
800 
+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
807 801
808 802
809 
-    array(
810 
-        'name' => __('Show add listing navigation in menu', 'geodirectory'),
811 
-        'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),
812 
-        'id' => 'geodir_show_addlisting_nav',
813 
-        'std' => '1',
814 
-        'type' => 'checkbox'
815 
-    ),
803 
+	array('name' => __('Navigation Settings', 'geodirectory'),
804 
+		'type' => 'sectionstart',
805 
+		'desc' => '',
806 
+		'id' => 'geodir_navigation_options'),
816 807
817 
-    array(
818 
-        'name' => __('Show listings navigation in menu', 'geodirectory'),
819 
-        'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),
820 
-        'id' => 'geodir_show_listing_nav',
821 
-        'std' => '1',
822 
-        'type' => 'checkbox'
823 
-    ),
824 808
825 
-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
809 
+	array(
810 
+		'name' => __('Show add listing navigation in menu', 'geodirectory'),
811 
+		'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),
812 
+		'id' => 'geodir_show_addlisting_nav',
813 
+		'std' => '1',
814 
+		'type' => 'checkbox'
815 
+	),
826 816
817 
+	array(
818 
+		'name' => __('Show listings navigation in menu', 'geodirectory'),
819 
+		'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),
820 
+		'id' => 'geodir_show_listing_nav',
821 
+		'std' => '1',
822 
+		'type' => 'checkbox'
823 
+	),
827 824
828 
-    array('name' => __('Post Type Navigation Settings', 'geodirectory'),
829 
-        'type' => 'sectionstart',
830 
-        'desc' => '',
831 
-        'id' => 'geodir_post_type_navigation_layout'),
832 
-    array(
833 
-        'name' => __('Show listing link in main navigation', 'geodirectory'),
834 
-        'desc' => '',
835 
-        'tip' => '',
836 
-        'id' => 'geodir_add_posttype_in_main_nav',
837 
-        'css' => 'min-width:300px;',
838 
-        'std' => array(),
839 
-        'type' => 'multiselect',
840 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
841 
-        'class' => 'chosen_select',
842 
-        'options' => array_unique(geodir_post_type_setting_fun())
843 
-    ),
825 
+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),
844 826
845 
-    array(
846 
-        'name' => __('Show listing link in listing navigation', 'geodirectory'),
847 
-        'desc' => '',
848 
-        'tip' => '',
849 
-        'id' => 'geodir_add_posttype_in_listing_nav',
850 
-        'css' => 'min-width:300px;',
851 
-        'std' => geodir_get_posttypes(),
852 
-        'type' => 'multiselect',
853 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
854 
-        'class' => 'chosen_select',
855 
-        'options' => array_unique(geodir_post_type_setting_fun())
856 
-    ),
857 827
858 
-    array(
859 
-        'name' => __('Allow post type to add from frontend', 'geodirectory'),
860 
-        'desc' => '',
861 
-        'tip' => '',
862 
-        'id' => 'geodir_allow_posttype_frontend',
863 
-        'css' => 'min-width:300px;',
864 
-        'std' => geodir_get_posttypes(),
865 
-        'type' => 'multiselect',
866 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
867 
-        'class' => 'chosen_select',
868 
-        'options' => array_unique(geodir_post_type_setting_fun())
869 
-    ),
828 
+	array('name' => __('Post Type Navigation Settings', 'geodirectory'),
829 
+		'type' => 'sectionstart',
830 
+		'desc' => '',
831 
+		'id' => 'geodir_post_type_navigation_layout'),
832 
+	array(
833 
+		'name' => __('Show listing link in main navigation', 'geodirectory'),
834 
+		'desc' => '',
835 
+		'tip' => '',
836 
+		'id' => 'geodir_add_posttype_in_main_nav',
837 
+		'css' => 'min-width:300px;',
838 
+		'std' => array(),
839 
+		'type' => 'multiselect',
840 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
841 
+		'class' => 'chosen_select',
842 
+		'options' => array_unique(geodir_post_type_setting_fun())
843 
+	),
870 844
871 
-    array(
872 
-        'name' => __('Show add listing link in main navigation', 'geodirectory'),
873 
-        'desc' => '',
874 
-        'tip' => '',
875 
-        'id' => 'geodir_add_listing_link_main_nav',
876 
-        'css' => 'min-width:300px;',
877 
-        'std' => array(),
878 
-        'type' => 'multiselect',
879 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
880 
-        'class' => 'chosen_select',
881 
-        'options' => array_unique(geodir_post_type_setting_fun())
882 
-    ),
845 
+	array(
846 
+		'name' => __('Show listing link in listing navigation', 'geodirectory'),
847 
+		'desc' => '',
848 
+		'tip' => '',
849 
+		'id' => 'geodir_add_posttype_in_listing_nav',
850 
+		'css' => 'min-width:300px;',
851 
+		'std' => geodir_get_posttypes(),
852 
+		'type' => 'multiselect',
853 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
854 
+		'class' => 'chosen_select',
855 
+		'options' => array_unique(geodir_post_type_setting_fun())
856 
+	),
883 857
884 
-    array(
885 
-        'name' => __('Show add listing link in add listing navigation', 'geodirectory'),
886 
-        'desc' => '',
887 
-        'tip' => '',
888 
-        'id' => 'geodir_add_listing_link_add_listing_nav',
889 
-        'css' => 'min-width:300px;',
890 
-        'std' => geodir_get_posttypes(),
891 
-        'type' => 'multiselect',
892 
-        'class' => 'chosen_select',
893 
-        'options' => array_unique(geodir_post_type_setting_fun())
894 
-    ),
858 
+	array(
859 
+		'name' => __('Allow post type to add from frontend', 'geodirectory'),
860 
+		'desc' => '',
861 
+		'tip' => '',
862 
+		'id' => 'geodir_allow_posttype_frontend',
863 
+		'css' => 'min-width:300px;',
864 
+		'std' => geodir_get_posttypes(),
865 
+		'type' => 'multiselect',
866 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
867 
+		'class' => 'chosen_select',
868 
+		'options' => array_unique(geodir_post_type_setting_fun())
869 
+	),
895 870
896 
-    array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),
871 
+	array(
872 
+		'name' => __('Show add listing link in main navigation', 'geodirectory'),
873 
+		'desc' => '',
874 
+		'tip' => '',
875 
+		'id' => 'geodir_add_listing_link_main_nav',
876 
+		'css' => 'min-width:300px;',
877 
+		'std' => array(),
878 
+		'type' => 'multiselect',
879 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
880 
+		'class' => 'chosen_select',
881 
+		'options' => array_unique(geodir_post_type_setting_fun())
882 
+	),
897 883
884 
+	array(
885 
+		'name' => __('Show add listing link in add listing navigation', 'geodirectory'),
886 
+		'desc' => '',
887 
+		'tip' => '',
888 
+		'id' => 'geodir_add_listing_link_add_listing_nav',
889 
+		'css' => 'min-width:300px;',
890 
+		'std' => geodir_get_posttypes(),
891 
+		'type' => 'multiselect',
892 
+		'class' => 'chosen_select',
893 
+		'options' => array_unique(geodir_post_type_setting_fun())
894 
+	),
898 895
899 
-    array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),
896 
+	array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),
900 897
901 898
902 
-    array(
903 
-        'name' => __('Show add listing link in user dashboard', 'geodirectory'),
904 
-        'desc' => '',
905 
-        'tip' => '',
906 
-        'id' => 'geodir_add_listing_link_user_dashboard',
907 
-        'css' => 'min-width:300px;',
908 
-        'std' => geodir_get_posttypes(),
909 
-        'type' => 'multiselect',
910 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
911 
-        'class' => 'chosen_select',
912 
-        'options' => array_unique(geodir_post_type_setting_fun())
913 
-    ),
899 
+	array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),
914 900
915 
-    array(
916 
-        'name' => __('Show favorite link in user dashboard', 'geodirectory'),
917 
-        'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),
918 
-        'tip' => '',
919 
-        'id' => 'geodir_favorite_link_user_dashboard',
920 
-        'css' => 'min-width:300px;',
921 
-        'std' => geodir_get_posttypes(),
922 
-        'type' => 'multiselect',
923 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
924 
-        'class' => 'chosen_select',
925 
-        'options' => array_unique(geodir_post_type_setting_fun())
926 
-    ),
927 901
928 
-    array(
929 
-        'name' => __('Show listing link in user dashboard', 'geodirectory'),
930 
-        'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),
931 
-        'tip' => '',
932 
-        'id' => 'geodir_listing_link_user_dashboard',
933 
-        'css' => 'min-width:300px;',
934 
-        'std' => geodir_get_posttypes(),
935 
-        'type' => 'multiselect',
936 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
937 
-        'class' => 'chosen_select',
938 
-        'options' => array_unique(geodir_post_type_setting_fun())
939 
-    ),
940 
-
941 
-    array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),
942 
-    /* Post Type Navigation Settings End */
943 
-
944 
-    /* Script Settings Start */
945 
-    array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),
946 
-
947 
-    /*
902 
+	array(
903 
+		'name' => __('Show add listing link in user dashboard', 'geodirectory'),
904 
+		'desc' => '',
905 
+		'tip' => '',
906 
+		'id' => 'geodir_add_listing_link_user_dashboard',
907 
+		'css' => 'min-width:300px;',
908 
+		'std' => geodir_get_posttypes(),
909 
+		'type' => 'multiselect',
910 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
911 
+		'class' => 'chosen_select',
912 
+		'options' => array_unique(geodir_post_type_setting_fun())
913 
+	),
914 
+
915 
+	array(
916 
+		'name' => __('Show favorite link in user dashboard', 'geodirectory'),
917 
+		'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),
918 
+		'tip' => '',
919 
+		'id' => 'geodir_favorite_link_user_dashboard',
920 
+		'css' => 'min-width:300px;',
921 
+		'std' => geodir_get_posttypes(),
922 
+		'type' => 'multiselect',
923 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
924 
+		'class' => 'chosen_select',
925 
+		'options' => array_unique(geodir_post_type_setting_fun())
926 
+	),
927 
+
928 
+	array(
929 
+		'name' => __('Show listing link in user dashboard', 'geodirectory'),
930 
+		'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),
931 
+		'tip' => '',
932 
+		'id' => 'geodir_listing_link_user_dashboard',
933 
+		'css' => 'min-width:300px;',
934 
+		'std' => geodir_get_posttypes(),
935 
+		'type' => 'multiselect',
936 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
937 
+		'class' => 'chosen_select',
938 
+		'options' => array_unique(geodir_post_type_setting_fun())
939 
+	),
940 
+
941 
+	array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),
942 
+	/* Post Type Navigation Settings End */
943 
+
944 
+	/* Script Settings Start */
945 
+	array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),
946 
+
947 
+	/*
948 948 
     array( 	'name' => __( 'Add/Remove Scripts', 'geodirectory' ),
949 949 
                 'type' => 'sectionstart',
950 950 
                 'desc' => '',

@@ -970,190 +970,190 @@  discard block
 
 block discarded – undo
970 970
971 971 
     */
972 972
973 
-    array('name' => __('GD Lazy Load Images', 'geodirectory'),
974 
-        'type' => 'sectionstart',
975 
-        'desc' => '',
976 
-        'id' => 'geodir_gdll_settings'),
973 
+	array('name' => __('GD Lazy Load Images', 'geodirectory'),
974 
+		'type' => 'sectionstart',
975 
+		'desc' => '',
976 
+		'id' => 'geodir_gdll_settings'),
977 977
978 
-    array(
979 
-        'name' => __('Enable lazy load images?', 'geodirectory'),
980 
-        'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),
981 
-        'id' => 'geodir_lazy_load',
982 
-        'type' => 'checkbox',
983 
-        'std' => '1' // Default value to show home top section
984 
-    ),
985 
-    array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),
978 
+	array(
979 
+		'name' => __('Enable lazy load images?', 'geodirectory'),
980 
+		'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),
981 
+		'id' => 'geodir_lazy_load',
982 
+		'type' => 'checkbox',
983 
+		'std' => '1' // Default value to show home top section
984 
+	),
985 
+	array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),
986 986
987 987
988 
-    array('name' => __('Script Settings', 'geodirectory'),
989 
-        'type' => 'sectionstart',
990 
-        'desc' => '',
991 
-        'id' => 'geodir_script_settings'),
988 
+	array('name' => __('Script Settings', 'geodirectory'),
989 
+		'type' => 'sectionstart',
990 
+		'desc' => '',
991 
+		'id' => 'geodir_script_settings'),
992 992
993 
-    array(
994 
-        'name' => __('Custom style css code', 'geodirectory'),
995 
-        'desc' => '',
996 
-        'id' => 'geodir_coustem_css',
997 
-        'type' => 'textarea',
998 
-        'css' => 'min-width:300px;',
999 
-        'std' => '' // Default value for the page title - changed in settings
1000 
-    ),
993 
+	array(
994 
+		'name' => __('Custom style css code', 'geodirectory'),
995 
+		'desc' => '',
996 
+		'id' => 'geodir_coustem_css',
997 
+		'type' => 'textarea',
998 
+		'css' => 'min-width:300px;',
999 
+		'std' => '' // Default value for the page title - changed in settings
1000 
+	),
1001 1001
1002 
-    array(
1003 
-        'name' => __('Header script code', 'geodirectory'),
1004 
-        'desc' => '',
1005 
-        'id' => 'geodir_header_scripts',
1006 
-        'type' => 'textarea',
1007 
-        'css' => 'min-width:300px;',
1008 
-        'std' => '' // Default value for the page title - changed in settings
1009 
-    ),
1002 
+	array(
1003 
+		'name' => __('Header script code', 'geodirectory'),
1004 
+		'desc' => '',
1005 
+		'id' => 'geodir_header_scripts',
1006 
+		'type' => 'textarea',
1007 
+		'css' => 'min-width:300px;',
1008 
+		'std' => '' // Default value for the page title - changed in settings
1009 
+	),
1010 1010
1011 
-    array(
1012 
-        'name' => __('Footer script code', 'geodirectory'),
1013 
-        'desc' => '',
1014 
-        'id' => 'geodir_footer_scripts',
1015 
-        'type' => 'textarea',
1016 
-        'css' => 'min-width:300px;',
1017 
-        'std' => '' // Default value for the page title - changed in settings
1018 
-    ),
1011 
+	array(
1012 
+		'name' => __('Footer script code', 'geodirectory'),
1013 
+		'desc' => '',
1014 
+		'id' => 'geodir_footer_scripts',
1015 
+		'type' => 'textarea',
1016 
+		'css' => 'min-width:300px;',
1017 
+		'std' => '' // Default value for the page title - changed in settings
1018 
+	),
1019 1019
1020 
-    array('type' => 'sectionend', 'id' => 'geodir_script_settings'),
1021 
-    /* Script Settings End */
1020 
+	array('type' => 'sectionend', 'id' => 'geodir_script_settings'),
1021 
+	/* Script Settings End */
1022 1022
1023 
-    /* Map Settings Start */
1024 
-    array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),
1023 
+	/* Map Settings Start */
1024 
+	array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),
1025 1025
1026 1026
1027 
-    // Google API key
1028 
-    array(
1029 
-        'name' => __('Google Maps API KEY', 'geodirectory'),
1030 
-        'type' => 'sectionstart',
1031 
-        'desc' => '',
1032 
-        'id' => 'geodir_google_api_key'
1033 
-    ),
1034 
-    array(
1035 
-        'name' => __('Google Maps API KEY', 'geodirectory'),
1036 
-        'desc' => sprintf(
1037 
-            __('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),
1038 
-            'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),
1039 
-        'tip' => '',
1040 
-        'id' => 'geodir_google_api_key',
1041 
-        'css' => 'min-width:300px;',
1042 
-        'std' => '',
1043 
-        'type' => 'map-key',
1044 
-    ),
1045 
-    array(
1046 
-        'type' => 'sectionend',
1047 
-        'id' => 'geodir_google_api_key'
1048 
-    ),
1027 
+	// Google API key
1028 
+	array(
1029 
+		'name' => __('Google Maps API KEY', 'geodirectory'),
1030 
+		'type' => 'sectionstart',
1031 
+		'desc' => '',
1032 
+		'id' => 'geodir_google_api_key'
1033 
+	),
1034 
+	array(
1035 
+		'name' => __('Google Maps API KEY', 'geodirectory'),
1036 
+		'desc' => sprintf(
1037 
+			__('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),
1038 
+			'https://console.developers.google.com/flows/enableapi?apiid=static_maps_backend,street_view_image_backend,maps_embed_backend,places_backend,geocoding_backend,directions_backend,distance_matrix_backend,geolocation,elevation_backend,timezone_backend,maps_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),
1039 
+		'tip' => '',
1040 
+		'id' => 'geodir_google_api_key',
1041 
+		'css' => 'min-width:300px;',
1042 
+		'std' => '',
1043 
+		'type' => 'map-key',
1044 
+	),
1045 
+	array(
1046 
+		'type' => 'sectionend',
1047 
+		'id' => 'geodir_google_api_key'
1048 
+	),
1049 1049
1050 
-    /* Untick the category by default on home map */
1051 
-    array(
1052 
-        'name' => __('Home Map Settings', 'geodirectory'),
1053 
-        'type' => 'sectionstart',
1054 
-        'desc' => '',
1055 
-        'id' => 'geodir_home_map_section'
1056 
-    ),
1057 
-    array(
1058 
-        'name' => __('Select category to untick by default on map', 'geodirectory'),
1059 
-        'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),
1060 
-        'tip' => '',
1061 
-        'id' => 'geodir_home_map_untick',
1062 
-        'css' => 'min-width:300px;',
1063 
-        'std' => '',
1064 
-        'type' => 'multiselect',
1065 
-        'placeholder_text' => __('Select category', 'geodirectory'),
1066 
-        'class' => 'chosen_select',
1067 
-        'options' => geodir_home_map_cats_key_value_array()
1068 
-    ),
1069 
-    array(
1070 
-        'type' => 'sectionend',
1071 
-        'id' => 'geodir_home_map_section'
1072 
-    ),
1050 
+	/* Untick the category by default on home map */
1051 
+	array(
1052 
+		'name' => __('Home Map Settings', 'geodirectory'),
1053 
+		'type' => 'sectionstart',
1054 
+		'desc' => '',
1055 
+		'id' => 'geodir_home_map_section'
1056 
+	),
1057 
+	array(
1058 
+		'name' => __('Select category to untick by default on map', 'geodirectory'),
1059 
+		'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),
1060 
+		'tip' => '',
1061 
+		'id' => 'geodir_home_map_untick',
1062 
+		'css' => 'min-width:300px;',
1063 
+		'std' => '',
1064 
+		'type' => 'multiselect',
1065 
+		'placeholder_text' => __('Select category', 'geodirectory'),
1066 
+		'class' => 'chosen_select',
1067 
+		'options' => geodir_home_map_cats_key_value_array()
1068 
+	),
1069 
+	array(
1070 
+		'type' => 'sectionend',
1071 
+		'id' => 'geodir_home_map_section'
1072 
+	),
1073 1073
1074 
-    array(
1075 
-        'name' => __('Add Listing Map Settings', 'geodirectory'),
1076 
-        'type' => 'sectionstart',
1077 
-        'desc' => '',
1078 
-        'id' => 'geodir_add_listing_map_section'
1079 
-    ),
1080 
-    array(
1081 
-        'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'),
1082 
-        'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'),
1083 
-        'id' => 'geodir_add_listing_mouse_scroll',
1084 
-        'type' => 'checkbox',
1085 
-        'std' => '0' // Default value to show home top section
1086 
-    ),
1087 
-    array(
1088 
-        'type' => 'sectionend',
1089 
-        'id' => 'geodir_add_listing_map_section'
1090 
-    ),
1074 
+	array(
1075 
+		'name' => __('Add Listing Map Settings', 'geodirectory'),
1076 
+		'type' => 'sectionstart',
1077 
+		'desc' => '',
1078 
+		'id' => 'geodir_add_listing_map_section'
1079 
+	),
1080 
+	array(
1081 
+		'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'),
1082 
+		'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'),
1083 
+		'id' => 'geodir_add_listing_mouse_scroll',
1084 
+		'type' => 'checkbox',
1085 
+		'std' => '0' // Default value to show home top section
1086 
+	),
1087 
+	array(
1088 
+		'type' => 'sectionend',
1089 
+		'id' => 'geodir_add_listing_map_section'
1090 
+	),
1091 1091
1092 1092
1093 
-    array('name' => __('Default map settings', 'geodirectory'),
1094 
-        'type' => 'sectionstart',
1095 
-        'desc' => '',
1096 
-        'id' => 'geodir_map_default_settings'),
1093 
+	array('name' => __('Default map settings', 'geodirectory'),
1094 
+		'type' => 'sectionstart',
1095 
+		'desc' => '',
1096 
+		'id' => 'geodir_map_default_settings'),
1097 1097
1098 
-    array(
1099 
-        'name' => '',
1100 
-        'desc' => '',
1101 
-        'id' => 'map_default_settings',
1102 
-        'type' => 'map_default_settings',
1103 
-        'css' => 'min-width:300px;',
1104 
-        'std' => '' // Default value for the page title - changed in settings
1105 
-    ),
1098 
+	array(
1099 
+		'name' => '',
1100 
+		'desc' => '',
1101 
+		'id' => 'map_default_settings',
1102 
+		'type' => 'map_default_settings',
1103 
+		'css' => 'min-width:300px;',
1104 
+		'std' => '' // Default value for the page title - changed in settings
1105 
+	),
1106 1106
1107 
-    array(
1108 
-        'name' => __('Upload map default marker icon', 'geodirectory'),
1109 
-        'desc' => '',
1110 
-        'id' => 'geodir_default_marker_icon',
1111 
-        'type' => 'file',
1112 
-        'std' => '0',
1113 
-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1114 
-    ),
1115 
-    // add option that allows enable/disable map dragging to phone devices
1116 
-    array(
1117 
-        'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),
1118 
-        'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),
1119 
-        'id' => 'geodir_map_onoff_dragging',
1120 
-        'type' => 'checkbox',
1121 
-        'std' => '0' // Default value to show home top section
1122 
-    ),
1123 
-    array(
1124 
-        'name' => __('Select Maps API', 'geodirectory'),
1125 
-        'desc' => __('- Google Maps API will force to load Google JS library only.<br>- OpenStreetMap API will force to load OpenStreetMap JS library only.<br>- Load Automatic will load Google JS library first, but if Google maps JS library not loaded it then loads the OpenStreetMap JS library to load the maps (recommended for regions where Google maps banned).<br>- Disable Maps will disable and hides maps for entire site.', 'geodirectory'),
1126 
-        'tip' => '',
1127 
-        'id' => 'geodir_load_map',
1128 
-        'css' => 'min-width:300px;',
1129 
-        'std' => 'auto',
1130 
-        'type' => 'select',
1131 
-        'placeholder_text' => __('Select Map', 'geodirectory'),
1132 
-        'options' => array(
1133 
-                        'auto' => __('Load Automatic', 'geodirectory'),
1134 
-                        'google' => __('Load Google Maps API', 'geodirectory'),
1135 
-                        'osm' => __('Load OpenStreetMap API', 'geodirectory'),
1136 
-                        'none' => __('Disable Maps', 'geodirectory')
1137 
-                    )
1138 
-    ),
1139 
-
1140 
-    array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),
1141 
-
1142 
-    array('name' => __('Show / hide post type and category on map', 'geodirectory'),
1143 
-        'type' => 'sectionstart',
1144 
-        'desc' => '',
1145 
-        'id' => 'geodir_map_settings'),
1107 
+	array(
1108 
+		'name' => __('Upload map default marker icon', 'geodirectory'),
1109 
+		'desc' => '',
1110 
+		'id' => 'geodir_default_marker_icon',
1111 
+		'type' => 'file',
1112 
+		'std' => '0',
1113 
+		'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1114 
+	),
1115 
+	// add option that allows enable/disable map dragging to phone devices
1116 
+	array(
1117 
+		'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),
1118 
+		'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),
1119 
+		'id' => 'geodir_map_onoff_dragging',
1120 
+		'type' => 'checkbox',
1121 
+		'std' => '0' // Default value to show home top section
1122 
+	),
1123 
+	array(
1124 
+		'name' => __('Select Maps API', 'geodirectory'),
1125 
+		'desc' => __('- Google Maps API will force to load Google JS library only.<br>- OpenStreetMap API will force to load OpenStreetMap JS library only.<br>- Load Automatic will load Google JS library first, but if Google maps JS library not loaded it then loads the OpenStreetMap JS library to load the maps (recommended for regions where Google maps banned).<br>- Disable Maps will disable and hides maps for entire site.', 'geodirectory'),
1126 
+		'tip' => '',
1127 
+		'id' => 'geodir_load_map',
1128 
+		'css' => 'min-width:300px;',
1129 
+		'std' => 'auto',
1130 
+		'type' => 'select',
1131 
+		'placeholder_text' => __('Select Map', 'geodirectory'),
1132 
+		'options' => array(
1133 
+						'auto' => __('Load Automatic', 'geodirectory'),
1134 
+						'google' => __('Load Google Maps API', 'geodirectory'),
1135 
+						'osm' => __('Load OpenStreetMap API', 'geodirectory'),
1136 
+						'none' => __('Disable Maps', 'geodirectory')
1137 
+					)
1138 
+	),
1146 1139
1147 
-    array(
1148 
-        'name' => __('Select Map Category', 'geodirectory'),
1149 
-        'desc' => '',
1150 
-        'id' => 'geodir_map_settings',
1151 
-        'type' => 'map',
1152 
-        'css' => 'min-width:300px;',
1153 
-        'std' => '' // Default value for the page title - changed in settings
1154 
-    ),
1155 
-
1156 
-    array('type' => 'sectionend', 'id' => 'geodir_map_settings'),
1157 
-    /* Map Settings End */
1140 
+	array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),
1141 
+
1142 
+	array('name' => __('Show / hide post type and category on map', 'geodirectory'),
1143 
+		'type' => 'sectionstart',
1144 
+		'desc' => '',
1145 
+		'id' => 'geodir_map_settings'),
1146 
+
1147 
+	array(
1148 
+		'name' => __('Select Map Category', 'geodirectory'),
1149 
+		'desc' => '',
1150 
+		'id' => 'geodir_map_settings',
1151 
+		'type' => 'map',
1152 
+		'css' => 'min-width:300px;',
1153 
+		'std' => '' // Default value for the page title - changed in settings
1154 
+	),
1155 
+
1156 
+	array('type' => 'sectionend', 'id' => 'geodir_map_settings'),
1157 
+	/* Map Settings End */
1158 1158
1159 1159 
 )); // End Design settings
Please login to merge, or discard this patch.
geodirectory-functions/reviews.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -16,8 +16,9 @@
 
 block discarded – undo
16 16 
  * the visitor has not yet entered the password we will
17 17 
  * return early without loading the comments.
18 18 
  */
19 
-if (post_password_required())
20 
-    return;
19 
+if (post_password_required()) {
20 
+    return;
21 
+}
21 22 
 ?>
22 23
23 24 
 <div id="comments" class="comments-area">
Please login to merge, or discard this patch.
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch 
@@ -17,7 +17,7 @@  discard block
 
 block discarded – undo
17 17 
  * return early without loading the comments.
18 18 
  */
19 19 
 if (post_password_required())
20 
-    return;
20 
+	return;
21 21 
 ?>
22 22
23 23 
 <div id="comments" class="comments-area">

@@ -25,35 +25,35 @@  discard block
 
 block discarded – undo
25 25 
     <?php // You can start editing here -- including this comment! ?>
26 26
27 27 
     <?php
28 
-    /**
29 
-     * Called before displaying reviews.
30 
-     *
31 
-     * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.
32 
-     *
33 
-     * @since 1.5.7
34 
-     */
35 
-    do_action('geodir_before_review_list'); ?>
28 
+	/**
29 
+	 * Called before displaying reviews.
30 
+	 *
31 
+	 * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.
32 
+	 *
33 
+	 * @since 1.5.7
34 
+	 */
35 
+	do_action('geodir_before_review_list'); ?>
36 36
37 37 
     <?php if (have_comments()) : ?>
38 38 
         <h2 class="comments-title">
39 39 
             <?php
40 
-            printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),
41 
-                number_format_i18n(get_comments_number()), get_the_title());
42 
-            ?>
40 
+			printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),
41 
+				number_format_i18n(get_comments_number()), get_the_title());
42 
+			?>
43 43 
         </h2>
44 44
45 45 
         <?php
46 
-        /**
47 
-         * Called after displaying review listing title.
48 
-         *
49 
-         * @since 1.5.7
50 
-         */
51 
-        do_action('geodir_after_review_list_title'); ?>
46 
+		/**
47 
+		 * Called after displaying review listing title.
48 
+		 *
49 
+		 * @since 1.5.7
50 
+		 */
51 
+		do_action('geodir_after_review_list_title'); ?>
52 52
53 53 
         <ol class="commentlist">
54 54 
             <?php $reverse_top_level = is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php') ? false : null; ?>
55 55 
 			<?php wp_list_comments(array('callback' => 'geodir_comment', 'reverse_top_level' => $reverse_top_level, 'style' => 'ol'));
56 
-            ?>
56 
+			?>
57 57 
         </ol><!-- .commentlist -->
58 58
59 59 
         <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>

@@ -68,51 +68,51 @@  discard block
 
 block discarded – undo
68 68 
         <?php endif; // check for comment navigation ?>
69 69
70 70 
         <?php
71 
-        /* If there are no comments and comments are closed, let's leave a note.
71 
+		/* If there are no comments and comments are closed, let's leave a note.
72 72 
          * But we only want the note on posts and pages that had comments in the first place.
73 73 
          */
74 
-        if (!comments_open() && get_comments_number()) : ?>
74 
+		if (!comments_open() && get_comments_number()) : ?>
75 75 
             <p class="nocomments"><?php _e('Reviews are closed.', 'geodirectory'); ?></p>
76 76 
         <?php endif; ?>
77 77
78 78 
     <?php endif; // have_comments() ?>
79 79
80 80 
     <?php
81 
-    /**
82 
-     * Called before displaying "Leave a review form".
83 
-     *
84 
-     * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.
85 
-     * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.
86 
-     *
87 
-     * @since 1.5.7
88 
-     */
89 
-    do_action('geodir_before_review_form'); ?>
81 
+	/**
82 
+	 * Called before displaying "Leave a review form".
83 
+	 *
84 
+	 * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.
85 
+	 * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.
86 
+	 *
87 
+	 * @since 1.5.7
88 
+	 */
89 
+	do_action('geodir_before_review_form'); ?>
90 90
91 91 
     <?php
92 
-    /**
93 
-     * Filters comment form args
94 
-     *
95 
-     * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.
96 
-     *
97 
-     * @since 1.0.0
98 
-     */
99 
-    $args = apply_filters('geodir_review_form_args', array(
100 
-        'title_reply' => __('Leave a Review', 'geodirectory'),
101 
-        'label_submit' => __('Post Review', 'geodirectory'),
102 
-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103 
-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
104 
-    ));
105 
-    comment_form($args);
106 
-    ?>
92 
+	/**
93 
+	 * Filters comment form args
94 
+	 *
95 
+	 * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.
96 
+	 *
97 
+	 * @since 1.0.0
98 
+	 */
99 
+	$args = apply_filters('geodir_review_form_args', array(
100 
+		'title_reply' => __('Leave a Review', 'geodirectory'),
101 
+		'label_submit' => __('Post Review', 'geodirectory'),
102 
+		'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103 
+		'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
104 
+	));
105 
+	comment_form($args);
106 
+	?>
107 107
108 108 
     <?php
109 
-    /**
110 
-     * Called after displaying "Leave a review form".
111 
-     *
112 
-     * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.
113 
-     *
114 
-     * @since 1.5.7
115 
-     */
116 
-    do_action('geodir_after_review_form'); ?>
109 
+	/**
110 
+	 * Called after displaying "Leave a review form".
111 
+	 *
112 
+	 * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.
113 
+	 *
114 
+	 * @since 1.5.7
115 
+	 */
116 
+	do_action('geodir_after_review_form'); ?>
117 117
118 118 
 </div><!-- #comments .comments-area -->
119 119 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -99,8 +99,8 @@
 
 block discarded – undo
99 99 
     $args = apply_filters('geodir_review_form_args', array(
100 100 
         'title_reply' => __('Leave a Review', 'geodirectory'),
101 101 
         'label_submit' => __('Post Review', 'geodirectory'),
102 
-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103 
-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
102 
+        'comment_field' => '<p class="comment-form-comment"><label for="comment">'.__('Review text', 'geodirectory').'</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
103 
+        'must_log_in' => '<p class="must-log-in">'.sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()).'</p>'
104 104 
     ));
105 105 
     comment_form($args);
106 106 
     ?>
Please login to merge, or discard this patch.
geodirectory-templates/preview-buttons.php 3 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -61,10 +61,11 @@
 
 block discarded – undo
61 61 
                 ob_start();
62 62 
                 echo '<h5 class="geodir_information">';
63 63
64 
-                if (!isset($_REQUEST['pid']))
65 
-                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66 
-                else
67 
-                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
64 
+                if (!isset($_REQUEST['pid'])) {
65 
+                                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66 
+                } else {
67 
+                                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
68 
+                }
68 69
69 70 
                 echo '</h5>';
70 71 
                 $publish_listing_form_message = ob_get_clean();
Please login to merge, or discard this patch.
Indentation   +76 added lines, -76 removed lines patch added patch discarded remove patch 
@@ -15,9 +15,9 @@  discard block
 
 block discarded – undo
15 15 
 $post_type = $post->listing_type;
16 16
17 17 
 if (isset($_REQUEST['preview']) && $_REQUEST['preview'] && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
18 
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
18 
+	$form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
19 19 
 } elseif (isset($_REQUEST['preview']) && $_REQUEST['preview']) {
20 
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
20 
+	$form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
21 21 
 }
22 22
23 23 
 /**
 
@@ -45,48 +45,48 @@  discard block
 
 block discarded – undo
45 45 
         <form action="<?php echo $form_action_url; ?>" name="publish_listing" id="publish_listing" method="post">
46 46 
             <div class="clearfix">
47 47 
                 <input type="hidden" name="pid" value="<?php if (isset($post->pid)) {
48 
-                    echo $post->pid;
49 
-                } ?>">
48 
+					echo $post->pid;
49 
+				} ?>">
50 50 
                 <?php
51 
-                /**
52 
-                 * Called on the add listing preview page inside the publish listings form, before the publish message.
53 
-                 *
54 
-                 * @since 1.0.0
55 
-                 * @see 'geodir_publish_listing_form_after_msg'
56 
-                 */
57 
-                do_action('geodir_publish_listing_form_before_msg'); ?>
51 
+				/**
52 
+				 * Called on the add listing preview page inside the publish listings form, before the publish message.
53 
+				 *
54 
+				 * @since 1.0.0
55 
+				 * @see 'geodir_publish_listing_form_after_msg'
56 
+				 */
57 
+				do_action('geodir_publish_listing_form_before_msg'); ?>
58 58 
                 <?php
59 
-                $alive_days = UNLIMITED;
60 
-                $type_title = '';
61 
-                ob_start();
62 
-                echo '<h5 class="geodir_information">';
63 
-
64 
-                if (!isset($_REQUEST['pid']))
65 
-                    printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66 
-                else
67 
-                    printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
68 
-
69 
-                echo '</h5>';
70 
-                $publish_listing_form_message = ob_get_clean();
71 
-                /**
72 
-                 * Filter the publish listing message on the preview page.
73 
-                 *
74 
-                 * @since 1.0.0
75 
-                 * @param string $publish_listing_form_message The message to be filtered.
76 
-                 */
77 
-                $publish_listing_form_message = apply_filters('geodir_publish_listing_form_message', $publish_listing_form_message);
78 
-                echo $publish_listing_form_message;
79 
-
80 
-                /**
81 
-                 * Called on the add listing preview page inside the publish listings form, after the publish message.
82 
-                 *
83 
-                 * @since 1.0.0
84 
-                 * @see 'geodir_publish_listing_form_before_msg'
85 
-                 */
86 
-                do_action('geodir_publish_listing_form_after_msg');
87 
-
88 
-                ob_start(); // start action button buffering
89 
-                ?>
59 
+				$alive_days = UNLIMITED;
60 
+				$type_title = '';
61 
+				ob_start();
62 
+				echo '<h5 class="geodir_information">';
63 
+
64 
+				if (!isset($_REQUEST['pid']))
65 
+					printf(GOING_TO_FREE_MSG, $type_title, $alive_days);
66 
+				else
67 
+					printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days);
68 
+
69 
+				echo '</h5>';
70 
+				$publish_listing_form_message = ob_get_clean();
71 
+				/**
72 
+				 * Filter the publish listing message on the preview page.
73 
+				 *
74 
+				 * @since 1.0.0
75 
+				 * @param string $publish_listing_form_message The message to be filtered.
76 
+				 */
77 
+				$publish_listing_form_message = apply_filters('geodir_publish_listing_form_message', $publish_listing_form_message);
78 
+				echo $publish_listing_form_message;
79 
+
80 
+				/**
81 
+				 * Called on the add listing preview page inside the publish listings form, after the publish message.
82 
+				 *
83 
+				 * @since 1.0.0
84 
+				 * @see 'geodir_publish_listing_form_before_msg'
85 
+				 */
86 
+				do_action('geodir_publish_listing_form_after_msg');
87 
+
88 
+				ob_start(); // start action button buffering
89 
+				?>
90 90 
                 <?php if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>
91 91
92 92 
                     <input type="submit" name="Submit and Pay" value="<?php echo PRO_UPDATE_BUTTON; ?>"
 
@@ -95,46 +95,46 @@  discard block
 
 block discarded – undo
95 95 
                     <input type="submit" name="Submit and Pay" value="<?php echo PRO_SUBMIT_BUTTON; ?>"
96 96 
                            class=" geodir_button geodir_publish_button"/>
97 97 
                 <?php
98 
-                }
99 
-                $publish_listing_form_button = ob_get_clean();
100 
-                /**
101 
-                 * Filter the HTML button for publishing the listing on the preview page.
102 
-                 *
103 
-                 * @since 1.0.0
104 
-                 * @param string $publish_listing_form_button The HTML for the submit button.
105 
-                 */
106 
-                $publish_listing_form_button = apply_filters('geodir_publish_listing_form_button', $publish_listing_form_button);
107 
-                echo $publish_listing_form_button;
108 
-
109 
-                $post_id = '';
110 
-                if (isset($post->pid)) {
111 
-                    $post_id = $post->pid;
112 
-                } else if (isset($_REQUEST['pid'])) {
113 
-                    $post_id = (int)$_REQUEST['pid'];
114 
-                }
115 
-
116 
-                $postlink = get_permalink(geodir_add_listing_page_id());
117 
-                $postlink = geodir_getlink($postlink, array('pid' => $post_id, 'backandedit' => '1', 'listing_type' => $post_type), false);
118 
-
119 
-                ob_start(); // start go back and edit / cancel buffering
120 
-                ?>
98 
+				}
99 
+				$publish_listing_form_button = ob_get_clean();
100 
+				/**
101 
+				 * Filter the HTML button for publishing the listing on the preview page.
102 
+				 *
103 
+				 * @since 1.0.0
104 
+				 * @param string $publish_listing_form_button The HTML for the submit button.
105 
+				 */
106 
+				$publish_listing_form_button = apply_filters('geodir_publish_listing_form_button', $publish_listing_form_button);
107 
+				echo $publish_listing_form_button;
108 
+
109 
+				$post_id = '';
110 
+				if (isset($post->pid)) {
111 
+					$post_id = $post->pid;
112 
+				} else if (isset($_REQUEST['pid'])) {
113 
+					$post_id = (int)$_REQUEST['pid'];
114 
+				}
115 
+
116 
+				$postlink = get_permalink(geodir_add_listing_page_id());
117 
+				$postlink = geodir_getlink($postlink, array('pid' => $post_id, 'backandedit' => '1', 'listing_type' => $post_type), false);
118 
+
119 
+				ob_start(); // start go back and edit / cancel buffering
120 
+				?>
121 121 
                 <a href="<?php echo esc_url($postlink); ?>" class="geodir_goback"><?php echo PRO_BACK_AND_EDIT_TEXT; ?></a>
122 122 
                 <input type="button" name="Cancel" value="<?php echo(PRO_CANCEL_BUTTON); ?>"
123 123 
                        class="geodir_button geodir_cancle_button"
124 124 
                        onclick="window.location.href='<?php echo geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=cancel&pid=' . $post_id . '&listing_type=' . $post_type; ?>'"/>
125 125 
                 <?php
126 126
127 
-                $publish_listing_form_go_back = ob_get_clean();
128 
-                /**
129 
-                 * Filter the cancel and go back and edit HTML on the preview page.
130 
-                 *
131 
-                 * @since 1.0.0
132 
-                 * @param string $publish_listing_form_go_back The HTML for the cancel and go back and edit button/link.
133 
-                 */
134 
-                $publish_listing_form_go_back = apply_filters('geodir_publish_listing_form_go_back', $publish_listing_form_go_back);
135 
-                echo $publish_listing_form_go_back;
136 
-
137 
-                ?>
127 
+				$publish_listing_form_go_back = ob_get_clean();
128 
+				/**
129 
+				 * Filter the cancel and go back and edit HTML on the preview page.
130 
+				 *
131 
+				 * @since 1.0.0
132 
+				 * @param string $publish_listing_form_go_back The HTML for the cancel and go back and edit button/link.
133 
+				 */
134 
+				$publish_listing_form_go_back = apply_filters('geodir_publish_listing_form_go_back', $publish_listing_form_go_back);
135 
+				echo $publish_listing_form_go_back;
136 
+
137 
+				?>
138 138 
             </div>
139 139 
         </form>
140 140 
     </div>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -15,9 +15,9 @@  discard block
 
 block discarded – undo
15 15 
 $post_type = $post->listing_type;
16 16
17 17 
 if (isset($_REQUEST['preview']) && $_REQUEST['preview'] && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
18 
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=update&listing_type=' . $post_type;
18 
+    $form_action_url = geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=update&listing_type='.$post_type;
19 19 
 } elseif (isset($_REQUEST['preview']) && $_REQUEST['preview']) {
20 
-    $form_action_url = geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=publish&listing_type=' . $post_type;
20 
+    $form_action_url = geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=publish&listing_type='.$post_type;
21 21 
 }
22 22
23 23 
 /**
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
                 if (isset($post->pid)) {
111 111 
                     $post_id = $post->pid;
112 112 
                 } else if (isset($_REQUEST['pid'])) {
113 
-                    $post_id = (int)$_REQUEST['pid'];
113 
+                    $post_id = (int) $_REQUEST['pid'];
114 114 
                 }
115 115
116 116 
                 $postlink = get_permalink(geodir_add_listing_page_id());
 
@@ -121,7 +121,7 @@  discard block
 
 block discarded – undo
121 121 
                 <a href="<?php echo esc_url($postlink); ?>" class="geodir_goback"><?php echo PRO_BACK_AND_EDIT_TEXT; ?></a>
122 122 
                 <input type="button" name="Cancel" value="<?php echo(PRO_CANCEL_BUTTON); ?>"
123 123 
                        class="geodir_button geodir_cancle_button"
124 
-                       onclick="window.location.href='<?php echo geodir_get_ajax_url() . '&geodir_ajax=add_listing&ajax_action=cancel&pid=' . $post_id . '&listing_type=' . $post_type; ?>'"/>
124 
+                       onclick="window.location.href='<?php echo geodir_get_ajax_url().'&geodir_ajax=add_listing&ajax_action=cancel&pid='.$post_id.'&listing_type='.$post_type; ?>'"/>
125 125 
                 <?php
126 126
127 127 
                 $publish_listing_form_go_back = ob_get_clean();
Please login to merge, or discard this patch.
geodirectory-widgets/geodirectory_cpt_categories_widget.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -353,7 +353,7 @@
 
 block discarded – undo
353 353
354 354 
     if(!$cpt_left){
355 355 
         $cpt_left = "gd-cpt-flat";
356 
-    }else{
356 
+    } else{
357 357 
         $cpt_left = '';
358 358 
     }
359 359
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -169,9 +169,9 @@  discard block
 
 block discarded – undo
169 169 
         $output = geodir_cpt_categories_output($params);
170 170
171 171 
         echo $args['before_widget'];
172 
-        if ( $params['title'] ) {
172 
+        if ($params['title']) {
173 173 
             echo '<div class="geodir_list_heading clearfix">';
174 
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
174 
+            echo $args['before_title'].$params['title'].$args['after_title'];
175 175 
             echo '</div>';
176 176 
         }
177 177 
         echo '<div class="gd-cptcats-widget">';
 
@@ -218,7 +218,7 @@  discard block
 
 block discarded – undo
218 218 
      * @param array $instance Previously saved values from database.
219 219 
      */
220 220 
     public function form($instance) {
221 
-        $instance = wp_parse_args( (array)$instance,
221 
+        $instance = wp_parse_args((array) $instance,
222 222 
             array(
223 223 
                 'title' => '',
224 224 
                 'post_type' => array(), // NULL for all
 
@@ -252,50 +252,50 @@  discard block
 
 block discarded – undo
252 252 
         <p>
253 253 
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
254 254 
             <select name="<?php echo $this->get_field_name('post_type'); ?>[]" id="<?php echo $this->get_field_id('post_type'); ?>" class="widefat" multiple="multiple">
255 
-                <option value="0" <?php selected( (empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true ); ?>><?php _e('All', 'geodirectory'); ?></option>
255 
+                <option value="0" <?php selected((empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true); ?>><?php _e('All', 'geodirectory'); ?></option>
256 256 
                 <?php foreach ($post_type_options as $name => $title) { ?>
257 
-                    <option value="<?php echo $name;?>" <?php selected( is_array($post_type) && in_array($name, $post_type), true ); ?>><?php echo $title; ?></option>
257 
+                    <option value="<?php echo $name; ?>" <?php selected(is_array($post_type) && in_array($name, $post_type), true); ?>><?php echo $title; ?></option>
258 258 
                 <?php } ?>
259 259 
             </select>
260 260 
         </p>
261 
-        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked( $hide_empty ); ?> value="1" />
262 
-            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e( 'Hide empty categories', 'geodirectory' ); ?></label><br />
263 
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked( $show_count ); ?> value="1" />
264 
-            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e( 'Show category count' ); ?></label> <small><?php _e( '( Enabling will slow down page loading for big directories. )', 'geodirectory' ); ?></small><br />
265 
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked( $hide_icon ); ?> value="1" />
266 
-            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e( 'Hide category icon', 'geodirectory' ); ?></label><br />
267 
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked( $cpt_left ); ?> value="1" />
268 
-            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e( 'Show CPT on same line', 'geodirectory' ); ?></label>
261 
+        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked($hide_empty); ?> value="1" />
262 
+            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e('Hide empty categories', 'geodirectory'); ?></label><br />
263 
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked($show_count); ?> value="1" />
264 
+            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e('Show category count'); ?></label> <small><?php _e('( Enabling will slow down page loading for big directories. )', 'geodirectory'); ?></small><br />
265 
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked($hide_icon); ?> value="1" />
266 
+            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e('Hide category icon', 'geodirectory'); ?></label><br />
267 
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked($cpt_left); ?> value="1" />
268 
+            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e('Show CPT on same line', 'geodirectory'); ?></label>
269 269 
         <p>
270 270 
             <label for="<?php echo $this->get_field_id('sort_by'); ?>"><?php _e('Sort by:', 'geodirectory'); ?></label>
271 271 
             <select name="<?php echo $this->get_field_name('sort_by'); ?>" id="<?php echo $this->get_field_id('sort_by'); ?>" class="widefat">
272 
-                <option value="az" <?php selected( $sort_by, 'az' ); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
273 
-                <option value="count" <?php selected( $sort_by, 'count' ); ?>><?php _e('Count', 'geodirectory'); ?></option>
272 
+                <option value="az" <?php selected($sort_by, 'az'); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
273 
+                <option value="count" <?php selected($sort_by, 'count'); ?>><?php _e('Count', 'geodirectory'); ?></option>
274 274 
             </select>
275 275 
         </p>
276 276 
         <p>
277 277 
             <label for="<?php echo $this->get_field_id('max_count'); ?>"><?php _e('Max no of sub-categories:', 'geodirectory'); ?></label>
278 278 
             <select name="<?php echo $this->get_field_name('max_count'); ?>" id="<?php echo $this->get_field_id('max_count'); ?>" class="widefat">
279 
-                <option value="all" <?php selected( $max_count, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
279 
+                <option value="all" <?php selected($max_count, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
280 280 
                 <?php for ($n = 10; $n >= 0; $n--) { ?>
281 
-                    <option value="<?php echo $n;?>" <?php selected( $max_count, $n ); ?>><?php echo $n; ?></option>
281 
+                    <option value="<?php echo $n; ?>" <?php selected($max_count, $n); ?>><?php echo $n; ?></option>
282 282 
                 <?php } ?>
283 283 
             </select>
284 284 
         </p>
285 285 
         <p>
286 286 
             <label for="<?php echo $this->get_field_id('max_level'); ?>"><?php _e('Show max sub-categories depth:', 'geodirectory'); ?></label>
287 287 
             <select name="<?php echo $this->get_field_name('max_level'); ?>" id="<?php echo $this->get_field_id('max_level'); ?>" class="widefat">
288 
-                <option value="all" <?php selected( $max_level, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
288 
+                <option value="all" <?php selected($max_level, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
289 289 
                 <?php for ($n = 0; $n <= 10; $n++) { ?>
290 
-                    <option value="<?php echo $n;?>" <?php selected( $max_level, $n ); ?>><?php echo $n; ?></option>
290 
+                    <option value="<?php echo $n; ?>" <?php selected($max_level, $n); ?>><?php echo $n; ?></option>
291 291 
                 <?php } ?>
292 292 
             </select>
293 293 
         </p>
294 294 
         <p>
295 
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked( $no_cpt_filter ); ?> value="1" />
296 
-            <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e( 'Don\'t filter for current viewing post type', 'geodirectory' ); ?></label>
297 
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked( $no_cat_filter ); ?> value="1" />
298 
-            <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label>
295 
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cpt_filter'); ?>" name="<?php echo $this->get_field_name('no_cpt_filter'); ?>"<?php checked($no_cpt_filter); ?> value="1" />
296 
+            <label for="<?php echo $this->get_field_id('no_cpt_filter'); ?>"><?php _e('Don\'t filter for current viewing post type', 'geodirectory'); ?></label>
297 
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('no_cat_filter'); ?>" name="<?php echo $this->get_field_name('no_cat_filter'); ?>"<?php checked($no_cat_filter); ?> value="1" />
298 
+            <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e('Don\'t filter for current viewing category', 'geodirectory'); ?></label>
299 299 
         </p>
300 300 
     <?php
301 301 
     }
 
@@ -313,7 +313,7 @@  discard block
 
 block discarded – undo
313 313 
  * @return string CPT categories content.
314 314 
  */
315 315 
 function geodir_cpt_categories_output($params) {
316 
-    $args = wp_parse_args((array)$params,
316 
+    $args = wp_parse_args((array) $params,
317 317 
         array(
318 318 
             'title' => '',
319 319 
             'post_type' => array(), // NULL for all
 
@@ -351,7 +351,7 @@  discard block
 
 block discarded – undo
351 351 
                 $current_taxonomy = get_query_var('taxonomy');
352 352 
                 $current_posttype = geodir_get_current_posttype();
353 353
354 
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
354 
+                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype.'category') {
355 355 
                     $is_category = true;
356 356 
                 }
357 357 
             }
 
@@ -383,15 +383,15 @@  discard block
 
 block discarded – undo
383 383 
     $hide_empty = !empty($args['hide_empty']) ? true : false;
384 384 
     $max_count = strip_tags($args['max_count']);
385 385 
     $all_childs = $max_count == 'all' ? true : false;
386 
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
386 
+    $max_count = $max_count > 0 ? (int) $max_count : 0;
387 387 
     $max_level = strip_tags($args['max_level']);
388 388 
     $show_count = !empty($args['show_count']) ? true : false;
389 389 
     $hide_icon = !empty($args['hide_icon']) ? true : false;
390 390 
     $cpt_left = !empty($args['cpt_left']) ? true : false;
391 391
392 
-    if(!$cpt_left){
392 
+    if (!$cpt_left) {
393 393 
         $cpt_left = "gd-cpt-flat";
394 
-    }else{
394 
+    } else {
395 395 
         $cpt_left = '';
396 396 
     }
397 397 
 
@@ -406,7 +406,7 @@  discard block
 
 block discarded – undo
406 406 
     if (!empty($post_types)) {
407 407 
         foreach ($post_types as $cpt => $cpt_info) {
408 408 
             $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
409 
-            $cat_taxonomy = $cpt . 'category';
409 
+            $cat_taxonomy = $cpt.'category';
410 410 
             $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
411 411 
             if ($hide_empty) {
412 412 
                 $categories = geodir_filter_empty_terms($categories);
 
@@ -422,32 +422,32 @@  discard block
 
 block discarded – undo
422 422 
                 if ($is_listing) {
423 423 
                     $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
424 424 
                 }
425 
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
425 
+                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-'.$cpt.$row_class.' '.$cpt_left.'">';
426 426
427 427 
                 if ($is_category && $cat_filter && $cpt == $current_posttype) {
428 428 
                     $term_info = get_term($current_term_id, $cat_taxonomy);
429 429
430 430 
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
431 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
431 
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($term_info->name).' icon" src="'.$term_icon_url.'" /> ' : '';
432 432
433 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
434 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
433 
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$term_info->count.')</span>' : '';
434 
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.$term_icon_url.$term_info->name.$count.'</h2>';
435 435 
                 } else {
436 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
436 
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.__($cpt_info['labels']['name'], 'geodirectory').'</h2>';
437 437 
                 }
438 438 
                 foreach ($categories as $category) {
439 439 
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
440 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
440 
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
441 441
442 
-                    $term_link = get_term_link( $category, $category->taxonomy );
442 
+                    $term_link = get_term_link($category, $category->taxonomy);
443 443 
                     /** Filter documented in geodirectory-functions/general_functions.php **/
444 
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
444 
+                    $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
445 445
446 446 
                     $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
447 447 
                     $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
448 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
449 
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
450 
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
448 
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
449 
+                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></h3>';
450 
+                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int) $max_level > 0)) {
451 451 
                         $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
452 452 
                     }
453 453 
                     $cpt_row .= '</li>';
 
@@ -479,7 +479,7 @@  discard block
 
 block discarded – undo
479 479 
  * @return string Html content.
480 480 
  */
481 481 
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
482 
-    $cat_taxonomy = $cpt . 'category';
482 
+    $cat_taxonomy = $cpt.'category';
483 483
484 484 
     $orderby = 'count';
485 485 
     $order = 'DESC';
 
@@ -488,7 +488,7 @@  discard block
 
 block discarded – undo
488 488 
         $order = 'ASC';
489 489 
     }
490 490
491 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
491 
+    if ($max_level != 'all' && $depth > (int) $max_level) {
492 492 
         return '';
493 493 
     }
494 494 
 
@@ -505,18 +505,18 @@  discard block
 
 block discarded – undo
505 505 
         $child_cats = geodir_sort_terms($child_cats, 'count');
506 506 
     }
507 507
508 
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
508 
+    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-'.$depth.'">';
509 509 
     $depth++;
510 510 
     foreach ($child_cats as $category) {
511 511 
         $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
512 
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
513 
-        $term_link = get_term_link( $category, $category->taxonomy );
512 
+        $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
513 
+        $term_link = get_term_link($category, $category->taxonomy);
514 514 
         /** Filter documented in geodirectory-functions/general_functions.php **/
515 
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
516 
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
515 
+        $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
516 
+        $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
517 517
518 518 
         $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
519 
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
519 
+        $content .= '<a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></li>';
520 520 
         $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
521 521 
     }
522 522 
     $content .= '</li></ul>';
Please login to merge, or discard this patch.
Indentation   +424 added lines, -424 removed lines patch added patch discarded remove patch 
@@ -13,241 +13,241 @@  discard block
 
 block discarded – undo
13 13 
  */
14 14 
 class geodir_cpt_categories_widget extends WP_Widget {
15 15
16 
-    /**
17 
-     * Register the cpt categories with WordPress.
18 
-     *
19 
-     * @since 1.5.4
20 
-     */
21 
-    public function __construct() {
22 
-        $widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
23 
-        parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
24 
-    }
25 
-
26 
-    /**
27 
-     * Front-end display content for cpt categories widget.
28 
-     *
29 
-     * @since 1.5.4
30 
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
31 
-     *
32 
-     * @param array $args Widget arguments.
33 
-     * @param array $instance Saved values from database.
34 
-     */
35 
-    public function widget($args, $instance) {
36 
-        $params = array();
37 
-        /**
38 
-         * Filter the widget title.
39 
-         *
40 
-         * @since 1.5.4
41 
-         *
42 
-         * @param string $title The widget title. Default empty.
43 
-         * @param array  $instance An array of the widget's settings.
44 
-         * @param mixed  $id_base The widget ID.
45 
-         */
46 
-        $params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
47 
-
48 
-        /**
49 
-         * Filter the widget setting post type.
50 
-         *
51 
-         * @since 1.5.4
52 
-         *
53 
-         * @param array $post_type The post types to display categories.
54 
-         * @param array $instance An array of the widget's settings.
55 
-         * @param mixed $id_base The widget ID.
56 
-         */
57 
-        $params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
58 
-
59 
-        /**
60 
-         * Filter the widget setting to hide empty categories.
61 
-         *
62 
-         * @since 1.5.4
63 
-         *
64 
-         * @param bool  $hide_empty If true then empty category will be not displayed.
65 
-         * @param array $instance An array of the widget's settings.
66 
-         * @param mixed $id_base The widget ID.
67 
-         */
68 
-        $params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
69 
-
70 
-        /**
71 
-         * Filter the widget setting to show/hide category count.
72 
-         *
73 
-         * @since 1.5.4
74 
-         *
75 
-         * @param bool  $show_count If true then category count will be displayed.
76 
-         * @param array $instance An array of the widget's settings.
77 
-         * @param mixed $id_base The widget ID.
78 
-         */
79 
-        $params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
80 
-
81 
-        /**
82 
-         * Filter the widget setting to show/hide category icon.
83 
-         *
84 
-         * @since 1.5.4
85 
-         *
86 
-         * @param bool  $hide_icon If true then category icon will be not displayed.
87 
-         * @param array $instance An array of the widget's settings.
88 
-         * @param mixed $id_base The widget ID.
89 
-         */
90 
-        $params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
91 
-
92 
-        /**
93 
-         * Filter the widget setting to show CPT inline or not.
94 
-         *
95 
-         * @since 1.5.4
96 
-         *
97 
-         * @param bool  $cpt_left If true then CPT will be displayed inline.
98 
-         * @param array $instance An array of the widget's settings.
99 
-         * @param mixed $id_base The widget ID.
100 
-         */
101 
-        $params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
102 
-
103 
-        /**
104 
-         * Filter the widget categories sorting order settings.
105 
-         *
106 
-         * @since 1.5.4
107 
-         *
108 
-         * @param string $max_count Widget max no of sub-categories count. Default 'count'.
109 
-         * @param array       $instance An array of the widget's settings.
110 
-         * @param mixed       $id_base The widget ID.
111 
-         */
112 
-        $params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
113 
-
114 
-        /**
115 
-         * Filter the widget max no of sub-categories count.
116 
-         *
117 
-         * @since 1.5.4
118 
-         *
119 
-         * @param bool|string $max_count Widget max no of sub-categories count.
120 
-         * @param array       $instance An array of the widget's settings.
121 
-         * @param mixed       $id_base The widget ID.
122 
-         */
123 
-        $params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
124 
-
125 
-        /**
126 
-         * Filter the widget max sub-categories depth.
127 
-         *
128 
-         * @since 1.5.4
129 
-         *
130 
-         * @param bool|string $max_level Widget max sub-categories depth.
131 
-         * @param array       $instance An array of the widget's settings.
132 
-         * @param mixed       $id_base The widget ID.
133 
-         */
134 
-        $params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
16 
+	/**
17 
+	 * Register the cpt categories with WordPress.
18 
+	 *
19 
+	 * @since 1.5.4
20 
+	 */
21 
+	public function __construct() {
22 
+		$widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
23 
+		parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
24 
+	}
25 
+
26 
+	/**
27 
+	 * Front-end display content for cpt categories widget.
28 
+	 *
29 
+	 * @since 1.5.4
30 
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
31 
+	 *
32 
+	 * @param array $args Widget arguments.
33 
+	 * @param array $instance Saved values from database.
34 
+	 */
35 
+	public function widget($args, $instance) {
36 
+		$params = array();
37 
+		/**
38 
+		 * Filter the widget title.
39 
+		 *
40 
+		 * @since 1.5.4
41 
+		 *
42 
+		 * @param string $title The widget title. Default empty.
43 
+		 * @param array  $instance An array of the widget's settings.
44 
+		 * @param mixed  $id_base The widget ID.
45 
+		 */
46 
+		$params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
47 
+
48 
+		/**
49 
+		 * Filter the widget setting post type.
50 
+		 *
51 
+		 * @since 1.5.4
52 
+		 *
53 
+		 * @param array $post_type The post types to display categories.
54 
+		 * @param array $instance An array of the widget's settings.
55 
+		 * @param mixed $id_base The widget ID.
56 
+		 */
57 
+		$params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
58 
+
59 
+		/**
60 
+		 * Filter the widget setting to hide empty categories.
61 
+		 *
62 
+		 * @since 1.5.4
63 
+		 *
64 
+		 * @param bool  $hide_empty If true then empty category will be not displayed.
65 
+		 * @param array $instance An array of the widget's settings.
66 
+		 * @param mixed $id_base The widget ID.
67 
+		 */
68 
+		$params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
69 
+
70 
+		/**
71 
+		 * Filter the widget setting to show/hide category count.
72 
+		 *
73 
+		 * @since 1.5.4
74 
+		 *
75 
+		 * @param bool  $show_count If true then category count will be displayed.
76 
+		 * @param array $instance An array of the widget's settings.
77 
+		 * @param mixed $id_base The widget ID.
78 
+		 */
79 
+		$params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
80 
+
81 
+		/**
82 
+		 * Filter the widget setting to show/hide category icon.
83 
+		 *
84 
+		 * @since 1.5.4
85 
+		 *
86 
+		 * @param bool  $hide_icon If true then category icon will be not displayed.
87 
+		 * @param array $instance An array of the widget's settings.
88 
+		 * @param mixed $id_base The widget ID.
89 
+		 */
90 
+		$params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
91 
+
92 
+		/**
93 
+		 * Filter the widget setting to show CPT inline or not.
94 
+		 *
95 
+		 * @since 1.5.4
96 
+		 *
97 
+		 * @param bool  $cpt_left If true then CPT will be displayed inline.
98 
+		 * @param array $instance An array of the widget's settings.
99 
+		 * @param mixed $id_base The widget ID.
100 
+		 */
101 
+		$params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
102 
+
103 
+		/**
104 
+		 * Filter the widget categories sorting order settings.
105 
+		 *
106 
+		 * @since 1.5.4
107 
+		 *
108 
+		 * @param string $max_count Widget max no of sub-categories count. Default 'count'.
109 
+		 * @param array       $instance An array of the widget's settings.
110 
+		 * @param mixed       $id_base The widget ID.
111 
+		 */
112 
+		$params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
113 
+
114 
+		/**
115 
+		 * Filter the widget max no of sub-categories count.
116 
+		 *
117 
+		 * @since 1.5.4
118 
+		 *
119 
+		 * @param bool|string $max_count Widget max no of sub-categories count.
120 
+		 * @param array       $instance An array of the widget's settings.
121 
+		 * @param mixed       $id_base The widget ID.
122 
+		 */
123 
+		$params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
124 
+
125 
+		/**
126 
+		 * Filter the widget max sub-categories depth.
127 
+		 *
128 
+		 * @since 1.5.4
129 
+		 *
130 
+		 * @param bool|string $max_level Widget max sub-categories depth.
131 
+		 * @param array       $instance An array of the widget's settings.
132 
+		 * @param mixed       $id_base The widget ID.
133 
+		 */
134 
+		$params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
135 135
136 
-        /**
137 
-         * Filter the widget setting to disable filter current viewing post type.
138 
-         *
139 
-         * @since 1.6.6
140 
-         *
141 
-         * @param bool  $no_cpt_filter If true then it doesn't filter current viewing post type.
142 
-         * @param array $instance An array of the widget's settings.
143 
-         * @param mixed $id_base The widget ID.
144 
-         */
145 
-        $params['no_cpt_filter'] = apply_filters('geodir_cpt_categories_widget_no_cpt_filter', empty($instance['no_cpt_filter']) ? 0 : 1, $instance, $this->id_base);
136 
+		/**
137 
+		 * Filter the widget setting to disable filter current viewing post type.
138 
+		 *
139 
+		 * @since 1.6.6
140 
+		 *
141 
+		 * @param bool  $no_cpt_filter If true then it doesn't filter current viewing post type.
142 
+		 * @param array $instance An array of the widget's settings.
143 
+		 * @param mixed $id_base The widget ID.
144 
+		 */
145 
+		$params['no_cpt_filter'] = apply_filters('geodir_cpt_categories_widget_no_cpt_filter', empty($instance['no_cpt_filter']) ? 0 : 1, $instance, $this->id_base);
146 146
147 
-        /**
148 
-         * Filter the widget setting to disable current viewing category.
149 
-         *
150 
-         * @since 1.6.6
151 
-         *
152 
-         * @param bool  $no_cat_filter If true then it doesn't filter current viewing category.
153 
-         * @param array $instance An array of the widget's settings.
154 
-         * @param mixed $id_base The widget ID.
155 
-         */
156 
-        $params['no_cat_filter'] = apply_filters('geodir_cpt_categories_widget_no_cat_filter', empty($instance['no_cat_filter']) ? 0 : 1, $instance, $this->id_base);
157 
-
158 
-        /**
159 
-         * Filter the widget parameters.
160 
-         *
161 
-         * @since 1.5.4
162 
-         *
163 
-         * @param array $params The widget parameters.
164 
-         * @param array $instance An array of the widget's settings.
165 
-         * @param mixed $id_base The widget ID.
166 
-         */
167 
-        $params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
168 
-
169 
-        $output = geodir_cpt_categories_output($params);
170 
-
171 
-        echo $args['before_widget'];
172 
-        if ( $params['title'] ) {
173 
-            echo '<div class="geodir_list_heading clearfix">';
174 
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
175 
-            echo '</div>';
176 
-        }
177 
-        echo '<div class="gd-cptcats-widget">';
178 
-        echo $output;
179 
-        echo '</div>';
180 
-        echo $args['after_widget'];
181 
-    }
182 
-
183 
-    /**
184 
-     * Sanitize cpt categories widget values as they are saved.
185 
-     *
186 
-     * @since 1.5.4
187 
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
188 
-     *
189 
-     * @param array $new_instance Values just sent to be saved.
190 
-     * @param array $old_instance Previously saved values from database.
191 
-     *
192 
-     * @return array Updated safe values to be saved.
193 
-     */
194 
-    public function update($new_instance, $old_instance) {
195 
-        $new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
196 
-        $instance = $old_instance;
197 
-        $instance['title'] = strip_tags($new_instance['title']);
198 
-        $instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
199 
-        $instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
200 
-        $instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
201 
-        $instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
202 
-        $instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
203 
-        $instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
204 
-        $instance['max_count'] = strip_tags($new_instance['max_count']);
205 
-        $instance['max_level'] = strip_tags($new_instance['max_level']);
206 
-        $instance['no_cpt_filter'] = !empty($new_instance['no_cpt_filter']) ? 1 : 0;
207 
-        $instance['no_cat_filter'] = !empty($new_instance['no_cat_filter']) ? 1 : 0;
208 
-
209 
-        return $instance;
210 
-    }
211 
-
212 
-    /**
213 
-     * Back-end cpt categories settings form.
214 
-     *
215 
-     * @since 1.5.4
216 
-     * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
217 
-     *
218 
-     * @param array $instance Previously saved values from database.
219 
-     */
220 
-    public function form($instance) {
221 
-        $instance = wp_parse_args( (array)$instance,
222 
-            array(
223 
-                'title' => '',
224 
-                'post_type' => array(), // NULL for all
225 
-                'hide_empty' => '',
226 
-                'show_count' => '',
227 
-                'hide_icon' => '',
228 
-                'cpt_left' => '',
229 
-                'sort_by' => 'count',
230 
-                'max_count' => 'all',
231 
-                'max_level' => '1',
232 
-                'no_cpt_filter' => '',
233 
-                'no_cat_filter' => '',
234 
-            )
235 
-        );
236 
-
237 
-        $title = strip_tags($instance['title']);
238 
-        $post_type = $instance['post_type'];
239 
-        $hide_empty = !empty($instance['hide_empty']) ? true : false;
240 
-        $show_count = !empty($instance['show_count']) ? true : false;
241 
-        $hide_icon = !empty($instance['hide_icon']) ? true : false;
242 
-        $cpt_left = !empty($instance['cpt_left']) ? true : false;
243 
-        $max_count = strip_tags($instance['max_count']);
244 
-        $max_level = strip_tags($instance['max_level']);
245 
-        $sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
246 
-        $no_cpt_filter = !empty($instance['no_cpt_filter']) ? true : false;
247 
-        $no_cat_filter = !empty($instance['no_cat_filter']) ? true : false;
248 
-
249 
-        $post_type_options = geodir_get_posttypes('options');
250 
-        ?>
147 
+		/**
148 
+		 * Filter the widget setting to disable current viewing category.
149 
+		 *
150 
+		 * @since 1.6.6
151 
+		 *
152 
+		 * @param bool  $no_cat_filter If true then it doesn't filter current viewing category.
153 
+		 * @param array $instance An array of the widget's settings.
154 
+		 * @param mixed $id_base The widget ID.
155 
+		 */
156 
+		$params['no_cat_filter'] = apply_filters('geodir_cpt_categories_widget_no_cat_filter', empty($instance['no_cat_filter']) ? 0 : 1, $instance, $this->id_base);
157 
+
158 
+		/**
159 
+		 * Filter the widget parameters.
160 
+		 *
161 
+		 * @since 1.5.4
162 
+		 *
163 
+		 * @param array $params The widget parameters.
164 
+		 * @param array $instance An array of the widget's settings.
165 
+		 * @param mixed $id_base The widget ID.
166 
+		 */
167 
+		$params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
168 
+
169 
+		$output = geodir_cpt_categories_output($params);
170 
+
171 
+		echo $args['before_widget'];
172 
+		if ( $params['title'] ) {
173 
+			echo '<div class="geodir_list_heading clearfix">';
174 
+			echo $args['before_title'] . $params['title'] . $args['after_title'];
175 
+			echo '</div>';
176 
+		}
177 
+		echo '<div class="gd-cptcats-widget">';
178 
+		echo $output;
179 
+		echo '</div>';
180 
+		echo $args['after_widget'];
181 
+	}
182 
+
183 
+	/**
184 
+	 * Sanitize cpt categories widget values as they are saved.
185 
+	 *
186 
+	 * @since 1.5.4
187 
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
188 
+	 *
189 
+	 * @param array $new_instance Values just sent to be saved.
190 
+	 * @param array $old_instance Previously saved values from database.
191 
+	 *
192 
+	 * @return array Updated safe values to be saved.
193 
+	 */
194 
+	public function update($new_instance, $old_instance) {
195 
+		$new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
196 
+		$instance = $old_instance;
197 
+		$instance['title'] = strip_tags($new_instance['title']);
198 
+		$instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
199 
+		$instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
200 
+		$instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
201 
+		$instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
202 
+		$instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
203 
+		$instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
204 
+		$instance['max_count'] = strip_tags($new_instance['max_count']);
205 
+		$instance['max_level'] = strip_tags($new_instance['max_level']);
206 
+		$instance['no_cpt_filter'] = !empty($new_instance['no_cpt_filter']) ? 1 : 0;
207 
+		$instance['no_cat_filter'] = !empty($new_instance['no_cat_filter']) ? 1 : 0;
208 
+
209 
+		return $instance;
210 
+	}
211 
+
212 
+	/**
213 
+	 * Back-end cpt categories settings form.
214 
+	 *
215 
+	 * @since 1.5.4
216 
+	 * @since 1.6.6 New parameters $no_cpt_filter &no_cat_filter added.
217 
+	 *
218 
+	 * @param array $instance Previously saved values from database.
219 
+	 */
220 
+	public function form($instance) {
221 
+		$instance = wp_parse_args( (array)$instance,
222 
+			array(
223 
+				'title' => '',
224 
+				'post_type' => array(), // NULL for all
225 
+				'hide_empty' => '',
226 
+				'show_count' => '',
227 
+				'hide_icon' => '',
228 
+				'cpt_left' => '',
229 
+				'sort_by' => 'count',
230 
+				'max_count' => 'all',
231 
+				'max_level' => '1',
232 
+				'no_cpt_filter' => '',
233 
+				'no_cat_filter' => '',
234 
+			)
235 
+		);
236 
+
237 
+		$title = strip_tags($instance['title']);
238 
+		$post_type = $instance['post_type'];
239 
+		$hide_empty = !empty($instance['hide_empty']) ? true : false;
240 
+		$show_count = !empty($instance['show_count']) ? true : false;
241 
+		$hide_icon = !empty($instance['hide_icon']) ? true : false;
242 
+		$cpt_left = !empty($instance['cpt_left']) ? true : false;
243 
+		$max_count = strip_tags($instance['max_count']);
244 
+		$max_level = strip_tags($instance['max_level']);
245 
+		$sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
246 
+		$no_cpt_filter = !empty($instance['no_cpt_filter']) ? true : false;
247 
+		$no_cat_filter = !empty($instance['no_cat_filter']) ? true : false;
248 
+
249 
+		$post_type_options = geodir_get_posttypes('options');
250 
+		?>
251 251 
         <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
252 252 
         <p>
253 253 
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
 
@@ -298,7 +298,7 @@  discard block
 
 block discarded – undo
298 298 
             <label for="<?php echo $this->get_field_id('no_cat_filter'); ?>"><?php _e( 'Don\'t filter for current viewing category', 'geodirectory' ); ?></label>
299 299 
         </p>
300 300 
     <?php
301 
-    }
301 
+	}
302 302 
 } // class geodir_cpt_categories_widget
303 303
304 304 
 register_widget('geodir_cpt_categories_widget');
 
@@ -313,153 +313,153 @@  discard block
 
 block discarded – undo
313 313 
  * @return string CPT categories content.
314 314 
  */
315 315 
 function geodir_cpt_categories_output($params) {
316 
-    $args = wp_parse_args((array)$params,
317 
-        array(
318 
-            'title' => '',
319 
-            'post_type' => array(), // NULL for all
320 
-            'hide_empty' => '',
321 
-            'show_count' => '',
322 
-            'hide_icon' => '',
323 
-            'cpt_left' => '',
324 
-            'sort_by' => 'count',
325 
-            'max_count' => 'all',
326 
-            'max_level' => '1',
327 
-            'no_cpt_filter' => '',
328 
-            'no_cat_filter' => '',
329 
-        )
330 
-    );
331 
-
332 
-    $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
333 
-    $cpt_filter = empty($args['no_cpt_filter']) ? true : false;
334 
-    $cat_filter = empty($args['no_cat_filter']) ? true : false;
335 
-
336 
-    $gd_post_types = geodir_get_posttypes('array');
337 
-
338 
-    $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
339 
-    $current_posttype = geodir_get_current_posttype();
340 
-
341 
-    $is_listing = false;
342 
-    $is_category = false;
343 
-    if (geodir_is_page('listing')) {
344 
-        $current_posttype = geodir_get_current_posttype();
345 
-
346 
-        if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
347 
-            $is_listing = true;
348 
-
349 
-            if (is_tax()) { // category page
350 
-                $current_term_id = get_queried_object_id();
351 
-                $current_taxonomy = get_query_var('taxonomy');
352 
-                $current_posttype = geodir_get_current_posttype();
353 
-
354 
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
355 
-                    $is_category = true;
356 
-                }
357 
-            }
358 
-        }
359 
-    }
360 
-
361 
-    $parent_category = 0;
362 
-    if ($is_listing && $cpt_filter) {
363 
-        $post_type_arr = array($current_posttype);
364 
-    }
365 
-
366 
-    $post_types = array();
367 
-    if (!empty($post_type_arr)) {
368 
-        if (in_array('0', $post_type_arr)) {
369 
-            $post_types = $gd_post_types;
370 
-        } else {
371 
-            foreach ($post_type_arr as $cpt) {
372 
-                if (isset($gd_post_types[$cpt])) {
373 
-                    $post_types[$cpt] = $gd_post_types[$cpt];
374 
-                }
375 
-            }
376 
-        }
377 
-    }
378 
-
379 
-    if (empty($post_type_arr)) {
380 
-        $post_types = $gd_post_types;
381 
-    }
382 
-
383 
-    $hide_empty = !empty($args['hide_empty']) ? true : false;
384 
-    $max_count = strip_tags($args['max_count']);
385 
-    $all_childs = $max_count == 'all' ? true : false;
386 
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
387 
-    $max_level = strip_tags($args['max_level']);
388 
-    $show_count = !empty($args['show_count']) ? true : false;
389 
-    $hide_icon = !empty($args['hide_icon']) ? true : false;
390 
-    $cpt_left = !empty($args['cpt_left']) ? true : false;
391 
-
392 
-    if(!$cpt_left){
393 
-        $cpt_left = "gd-cpt-flat";
394 
-    }else{
395 
-        $cpt_left = '';
396 
-    }
397 
-
398 
-    $orderby = 'count';
399 
-    $order = 'DESC';
400 
-    if ($sort_by == 'az') {
401 
-        $orderby = 'name';
402 
-        $order = 'ASC';
403 
-    }
404 
-
405 
-    $output = '';
406 
-    if (!empty($post_types)) {
407 
-        foreach ($post_types as $cpt => $cpt_info) {
408 
-            $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
409 
-            $cat_taxonomy = $cpt . 'category';
410 
-            $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
411 
-            if ($hide_empty) {
412 
-                $categories = geodir_filter_empty_terms($categories);
413 
-            }
414 
-            if ($sort_by == 'count') {
415 
-                $categories = geodir_sort_terms($categories, 'count');
416 
-            }
417 
-
418 
-            if (!empty($categories)) {
419 
-                $term_icons = !$hide_icon ? geodir_get_term_icon() : array();
420 
-                $row_class = '';
421 
-
422 
-                if ($is_listing) {
423 
-                    $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
424 
-                }
425 
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
426 
-
427 
-                if ($is_category && $cat_filter && $cpt == $current_posttype) {
428 
-                    $term_info = get_term($current_term_id, $cat_taxonomy);
429 
-
430 
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
431 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
432 
-
433 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
434 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
435 
-                } else {
436 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
437 
-                }
438 
-                foreach ($categories as $category) {
439 
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
440 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
441 
-
442 
-                    $term_link = get_term_link( $category, $category->taxonomy );
443 
-                    /** Filter documented in geodirectory-functions/general_functions.php **/
444 
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
445 
-
446 
-                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
447 
-                    $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
448 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
449 
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
450 
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
451 
-                        $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
452 
-                    }
453 
-                    $cpt_row .= '</li>';
454 
-                    $cpt_row .= '</ul>';
455 
-                }
456 
-                $cpt_row .= '</div>';
457 
-
458 
-                $output .= $cpt_row;
459 
-            }
460 
-        }
461 
-    }
462 
-    return $output;
316 
+	$args = wp_parse_args((array)$params,
317 
+		array(
318 
+			'title' => '',
319 
+			'post_type' => array(), // NULL for all
320 
+			'hide_empty' => '',
321 
+			'show_count' => '',
322 
+			'hide_icon' => '',
323 
+			'cpt_left' => '',
324 
+			'sort_by' => 'count',
325 
+			'max_count' => 'all',
326 
+			'max_level' => '1',
327 
+			'no_cpt_filter' => '',
328 
+			'no_cat_filter' => '',
329 
+		)
330 
+	);
331 
+
332 
+	$sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
333 
+	$cpt_filter = empty($args['no_cpt_filter']) ? true : false;
334 
+	$cat_filter = empty($args['no_cat_filter']) ? true : false;
335 
+
336 
+	$gd_post_types = geodir_get_posttypes('array');
337 
+
338 
+	$post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
339 
+	$current_posttype = geodir_get_current_posttype();
340 
+
341 
+	$is_listing = false;
342 
+	$is_category = false;
343 
+	if (geodir_is_page('listing')) {
344 
+		$current_posttype = geodir_get_current_posttype();
345 
+
346 
+		if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
347 
+			$is_listing = true;
348 
+
349 
+			if (is_tax()) { // category page
350 
+				$current_term_id = get_queried_object_id();
351 
+				$current_taxonomy = get_query_var('taxonomy');
352 
+				$current_posttype = geodir_get_current_posttype();
353 
+
354 
+				if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
355 
+					$is_category = true;
356 
+				}
357 
+			}
358 
+		}
359 
+	}
360 
+
361 
+	$parent_category = 0;
362 
+	if ($is_listing && $cpt_filter) {
363 
+		$post_type_arr = array($current_posttype);
364 
+	}
365 
+
366 
+	$post_types = array();
367 
+	if (!empty($post_type_arr)) {
368 
+		if (in_array('0', $post_type_arr)) {
369 
+			$post_types = $gd_post_types;
370 
+		} else {
371 
+			foreach ($post_type_arr as $cpt) {
372 
+				if (isset($gd_post_types[$cpt])) {
373 
+					$post_types[$cpt] = $gd_post_types[$cpt];
374 
+				}
375 
+			}
376 
+		}
377 
+	}
378 
+
379 
+	if (empty($post_type_arr)) {
380 
+		$post_types = $gd_post_types;
381 
+	}
382 
+
383 
+	$hide_empty = !empty($args['hide_empty']) ? true : false;
384 
+	$max_count = strip_tags($args['max_count']);
385 
+	$all_childs = $max_count == 'all' ? true : false;
386 
+	$max_count = $max_count > 0 ? (int)$max_count : 0;
387 
+	$max_level = strip_tags($args['max_level']);
388 
+	$show_count = !empty($args['show_count']) ? true : false;
389 
+	$hide_icon = !empty($args['hide_icon']) ? true : false;
390 
+	$cpt_left = !empty($args['cpt_left']) ? true : false;
391 
+
392 
+	if(!$cpt_left){
393 
+		$cpt_left = "gd-cpt-flat";
394 
+	}else{
395 
+		$cpt_left = '';
396 
+	}
397 
+
398 
+	$orderby = 'count';
399 
+	$order = 'DESC';
400 
+	if ($sort_by == 'az') {
401 
+		$orderby = 'name';
402 
+		$order = 'ASC';
403 
+	}
404 
+
405 
+	$output = '';
406 
+	if (!empty($post_types)) {
407 
+		foreach ($post_types as $cpt => $cpt_info) {
408 
+			$parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
409 
+			$cat_taxonomy = $cpt . 'category';
410 
+			$categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
411 
+			if ($hide_empty) {
412 
+				$categories = geodir_filter_empty_terms($categories);
413 
+			}
414 
+			if ($sort_by == 'count') {
415 
+				$categories = geodir_sort_terms($categories, 'count');
416 
+			}
417 
+
418 
+			if (!empty($categories)) {
419 
+				$term_icons = !$hide_icon ? geodir_get_term_icon() : array();
420 
+				$row_class = '';
421 
+
422 
+				if ($is_listing) {
423 
+					$row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
424 
+				}
425 
+				$cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
426 
+
427 
+				if ($is_category && $cat_filter && $cpt == $current_posttype) {
428 
+					$term_info = get_term($current_term_id, $cat_taxonomy);
429 
+
430 
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
431 
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
432 
+
433 
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
434 
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
435 
+				} else {
436 
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
437 
+				}
438 
+				foreach ($categories as $category) {
439 
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
440 
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
441 
+
442 
+					$term_link = get_term_link( $category, $category->taxonomy );
443 
+					/** Filter documented in geodirectory-functions/general_functions.php **/
444 
+					$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
445 
+
446 
+					$cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
447 
+					$cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
448 
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
449 
+					$cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
450 
+					if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
451 
+						$cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
452 
+					}
453 
+					$cpt_row .= '</li>';
454 
+					$cpt_row .= '</ul>';
455 
+				}
456 
+				$cpt_row .= '</div>';
457 
+
458 
+				$output .= $cpt_row;
459 
+			}
460 
+		}
461 
+	}
462 
+	return $output;
463 463 
 }
464 464
465 465 
 /**
 
@@ -479,48 +479,48 @@  discard block
 
 block discarded – undo
479 479 
  * @return string Html content.
480 480 
  */
481 481 
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
482 
-    $cat_taxonomy = $cpt . 'category';
483 
-
484 
-    $orderby = 'count';
485 
-    $order = 'DESC';
486 
-    if ($sort_by == 'az') {
487 
-        $orderby = 'name';
488 
-        $order = 'ASC';
489 
-    }
490 
-
491 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
492 
-        return '';
493 
-    }
494 
-
495 
-    $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
496 
-    if ($hide_empty) {
497 
-        $child_cats = geodir_filter_empty_terms($child_cats);
498 
-    }
499 
-
500 
-    if (empty($child_cats)) {
501 
-        return '';
502 
-    }
503 
-
504 
-    if ($sort_by == 'count') {
505 
-        $child_cats = geodir_sort_terms($child_cats, 'count');
506 
-    }
507 
-
508 
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
509 
-    $depth++;
510 
-    foreach ($child_cats as $category) {
511 
-        $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
512 
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
513 
-        $term_link = get_term_link( $category, $category->taxonomy );
514 
-        /** Filter documented in geodirectory-functions/general_functions.php **/
515 
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
516 
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
517 
-
518 
-        $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
519 
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
520 
-        $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
521 
-    }
522 
-    $content .= '</li></ul>';
523 
-
524 
-    return $content;
482 
+	$cat_taxonomy = $cpt . 'category';
483 
+
484 
+	$orderby = 'count';
485 
+	$order = 'DESC';
486 
+	if ($sort_by == 'az') {
487 
+		$orderby = 'name';
488 
+		$order = 'ASC';
489 
+	}
490 
+
491 
+	if ($max_level != 'all' && $depth > (int)$max_level ) {
492 
+		return '';
493 
+	}
494 
+
495 
+	$child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
496 
+	if ($hide_empty) {
497 
+		$child_cats = geodir_filter_empty_terms($child_cats);
498 
+	}
499 
+
500 
+	if (empty($child_cats)) {
501 
+		return '';
502 
+	}
503 
+
504 
+	if ($sort_by == 'count') {
505 
+		$child_cats = geodir_sort_terms($child_cats, 'count');
506 
+	}
507 
+
508 
+	$content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
509 
+	$depth++;
510 
+	foreach ($child_cats as $category) {
511 
+		$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
512 
+		$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
513 
+		$term_link = get_term_link( $category, $category->taxonomy );
514 
+		/** Filter documented in geodirectory-functions/general_functions.php **/
515 
+		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
516 
+		$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
517 
+
518 
+		$content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
519 
+		$content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
520 
+		$content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
521 
+	}
522 
+	$content .= '</li></ul>';
523 
+
524 
+	return $content;
525 525 
 }
526 526 
 ?>
527 527 
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-widgets/geodirectory_related_listing_widget.php 3 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
     public function form($instance)
138 138 
     {
139 139 
         //widgetform in backend
140 
-        $instance = wp_parse_args((array)$instance,
140 
+        $instance = wp_parse_args((array) $instance,
141 141 
             array('title' => '',
142 142 
                 'list_sort' => '',
143 143 
                 'list_order' => '',
 
@@ -169,7 +169,7 @@  discard block
 
 block discarded – undo
169 169
170 170 
         ?>
171 171 
         <p>
172 
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
172 
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
173 173
174 174 
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
175 175 
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
 
@@ -178,7 +178,7 @@  discard block
 
 block discarded – undo
178 178 
         </p>
179 179 
         <p>
180 180 
             <label
181 
-                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>
181 
+                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>
182 182
183 183 
                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"
184 184 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
 
@@ -208,7 +208,7 @@  discard block
 
 block discarded – undo
208 208 
         </p>
209 209 
         <p>
210 210 
             <label
211 
-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
211 
+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
212 212
213 213 
                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"
214 214 
                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"
 
@@ -217,7 +217,7 @@  discard block
 
 block discarded – undo
217 217 
         </p>
218 218 
         <p>
219 219 
             <label for="<?php echo $this->get_field_id('relate_to'); ?>">
220 
-                <?php _e('Relate to:', 'geodirectory');?>
220 
+                <?php _e('Relate to:', 'geodirectory'); ?>
221 221 
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
222 222 
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
223 223 
                     <option <?php if ($relate_to == 'category') {
 
@@ -232,7 +232,7 @@  discard block
 
 block discarded – undo
232 232 
         <p>
233 233 
         <p>
234 234 
             <label for="<?php echo $this->get_field_id('layout'); ?>">
235 
-                <?php _e('Layout:', 'geodirectory');?>
235 
+                <?php _e('Layout:', 'geodirectory'); ?>
236 236 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
237 237 
                         name="<?php echo $this->get_field_name('layout'); ?>">
238 238 
                     <option <?php if ($layout == 'gridview_onehalf') {
 
@@ -260,7 +260,7 @@  discard block
 
 block discarded – undo
260 260 
         </p>
261 261 
         <p>
262 262 
             <label
263 
-                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory');?>
263 
+                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory'); ?>
264 264
265 265 
                 <input class="widefat" id="<?php echo $this->get_field_id('listing_width'); ?>"
266 266 
                        name="<?php echo $this->get_field_name('listing_width'); ?>" type="text"
 
@@ -269,7 +269,7 @@  discard block
 
 block discarded – undo
269 269 
         </p>
270 270 
         <p>
271 271 
             <label
272 
-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>
272 
+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>
273 273 
                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"
274 274 
                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"
275 275 
                        value="<?php echo esc_attr($character_count); ?>"/>
 
@@ -277,9 +277,9 @@  discard block
 
 block discarded – undo
277 277 
         </p>
278 278 
         <p>
279 279 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
280 
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
280 
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
281 281 
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
282 
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
282 
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
283 283 
                        value="1"/>
284 284 
             </label>
285 285 
         </p>
Please login to merge, or discard this patch.
Indentation   +120 added lines, -120 removed lines patch added patch discarded remove patch 
@@ -14,160 +14,160 @@  discard block
 
 block discarded – undo
14 14 
  */
15 15 
 class geodir_related_listing_postview extends WP_Widget
16 16 
 {
17 
-    /**
17 
+	/**
18 18 
 	 * Register the related listing widget.
19 19 
 	 *
20 20 
 	 * @since 1.0.0
21 
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
21 
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
22 22 
 	 */
23 
-    public function __construct() {
24 
-        $widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
25 
-        parent::__construct(
26 
-            'post_related_listing', // Base ID
27 
-            __('GD > Related Listing', 'geodirectory'), // Name
28 
-            $widget_ops// Args
29 
-        );
30 
-    }
23 
+	public function __construct() {
24 
+		$widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
25 
+		parent::__construct(
26 
+			'post_related_listing', // Base ID
27 
+			__('GD > Related Listing', 'geodirectory'), // Name
28 
+			$widget_ops// Args
29 
+		);
30 
+	}
31 31
32 32 
 	/**
33 33 
 	 * Front-end display content for related listing widget.
34 34 
 	 *
35 35 
 	 * @since 1.0.0
36 
-     * @since 1.5.1 Declare function public.
36 
+	 * @since 1.5.1 Declare function public.
37 37 
 	 *
38 38 
 	 * @param array $args     Widget arguments.
39 39 
 	 * @param array $instance Saved values from database.
40 40 
 	 */
41 
-    public function widget($args, $instance)
42 
-    {
41 
+	public function widget($args, $instance)
42 
+	{
43 43
44 
-        // prints the widget
45 
-        extract($args, EXTR_SKIP);
44 
+		// prints the widget
45 
+		extract($args, EXTR_SKIP);
46 46
47 
-        /** This filter is documented in geodirectory_widgets.php */
48 
-        $title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
47 
+		/** This filter is documented in geodirectory_widgets.php */
48 
+		$title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
49 49
50 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
50 
+		/** This filter is documented in geodirectory-functions/general_functions.php */
51 51 
 		$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
52 52
53 
-        /**
54 
-         * Filter the relation type to get related listing.
55 
-         *
56 
-         * @since 1.0.0
57 
-         * @param string $instance['relate_to'] Can be tags or category.
58 
-         */
53 
+		/**
54 
+		 * Filter the relation type to get related listing.
55 
+		 *
56 
+		 * @since 1.0.0
57 
+		 * @param string $instance['relate_to'] Can be tags or category.
58 
+		 */
59 59 
 		$relate_to = empty($instance['relate_to']) ? 'category' : apply_filters('widget_relate_to', $instance['relate_to']);
60 60
61 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
61 
+		/** This filter is documented in geodirectory-functions/general_functions.php */
62 62 
 		$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
63 63
64 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
64 
+		/** This filter is documented in geodirectory-functions/general_functions.php */
65 65 
 		$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
66 66
67 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
67 
+		/** This filter is documented in geodirectory-functions/general_functions.php */
68 68 
 		$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
69 69
70 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
70 
+		/** This filter is documented in geodirectory-functions/general_functions.php */
71 71 
 		$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
72 72
73 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
73 
+		/** This filter is documented in geodirectory-functions/general_functions.php */
74 74 
 		$character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
75 75
76 
-        $arr = array(
77 
-            'before_title' => $before_title,
78 
-            'after_title' => $after_title,
79 
-            'title' => $title,
80 
-            'post_number' => $post_number,
81 
-            'relate_to' => $relate_to,
82 
-            'layout' => $layout,
83 
-            'add_location_filter' => $add_location_filter,
84 
-            'listing_width' => $listing_width,
85 
-            'list_sort' => $list_sort,
86 
-            'character_count' => $character_count,
87 
-            'is_widget' => '1'
88 
-        );
89 
-
90 
-        if ($widget_display = geodir_related_posts_display($arr)) {
91 
-
92 
-            echo $before_widget;
93 
-            echo $widget_display;
94 
-            echo $after_widget;
95 
-        }
96 
-    }
76 
+		$arr = array(
77 
+			'before_title' => $before_title,
78 
+			'after_title' => $after_title,
79 
+			'title' => $title,
80 
+			'post_number' => $post_number,
81 
+			'relate_to' => $relate_to,
82 
+			'layout' => $layout,
83 
+			'add_location_filter' => $add_location_filter,
84 
+			'listing_width' => $listing_width,
85 
+			'list_sort' => $list_sort,
86 
+			'character_count' => $character_count,
87 
+			'is_widget' => '1'
88 
+		);
89 
+
90 
+		if ($widget_display = geodir_related_posts_display($arr)) {
91 
+
92 
+			echo $before_widget;
93 
+			echo $widget_display;
94 
+			echo $after_widget;
95 
+		}
96 
+	}
97 97
98 98 
 	/**
99 99 
 	 * Sanitize related listing widget form values as they are saved.
100 100 
 	 *
101 101 
 	 * @since 1.0.0
102 
-     * @since 1.5.1 Declare function public.
102 
+	 * @since 1.5.1 Declare function public.
103 103 
 	 *
104 104 
 	 * @param array $new_instance Values just sent to be saved.
105 105 
 	 * @param array $old_instance Previously saved values from database.
106 106 
 	 *
107 107 
 	 * @return array Updated safe values to be saved.
108 108 
 	 */
109 
-    public function update($new_instance, $old_instance)
110 
-    {
111 
-        //save the widget
112 
-        $instance = $old_instance;
113 
-
114 
-        $instance['title'] = strip_tags($new_instance['title']);
115 
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
116 
-        $instance['relate_to'] = strip_tags($new_instance['relate_to']);
117 
-        $instance['layout'] = strip_tags($new_instance['layout']);
118 
-        $instance['listing_width'] = strip_tags($new_instance['listing_width']);
119 
-        $instance['list_sort'] = strip_tags($new_instance['list_sort']);
120 
-        $instance['character_count'] = $new_instance['character_count'];
121 
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
122 
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123 
-        else
124 
-            $instance['add_location_filter'] = '0';
125 
-
126 
-        return $instance;
127 
-    }
109 
+	public function update($new_instance, $old_instance)
110 
+	{
111 
+		//save the widget
112 
+		$instance = $old_instance;
113 
+
114 
+		$instance['title'] = strip_tags($new_instance['title']);
115 
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
116 
+		$instance['relate_to'] = strip_tags($new_instance['relate_to']);
117 
+		$instance['layout'] = strip_tags($new_instance['layout']);
118 
+		$instance['listing_width'] = strip_tags($new_instance['listing_width']);
119 
+		$instance['list_sort'] = strip_tags($new_instance['list_sort']);
120 
+		$instance['character_count'] = $new_instance['character_count'];
121 
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
122 
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123 
+		else
124 
+			$instance['add_location_filter'] = '0';
125 
+
126 
+		return $instance;
127 
+	}
128 128
129 129 
 	/**
130 130 
 	 * Back-end related listing widget settings form.
131 131 
 	 *
132 132 
 	 * @since 1.0.0
133 
-     * @since 1.5.1 Declare function public.
133 
+	 * @since 1.5.1 Declare function public.
134 134 
 	 *
135 135 
 	 * @param array $instance Previously saved values from database.
136 136 
 	 */
137 
-    public function form($instance)
138 
-    {
139 
-        //widgetform in backend
140 
-        $instance = wp_parse_args((array)$instance,
141 
-            array('title' => '',
142 
-                'list_sort' => '',
143 
-                'list_order' => '',
144 
-                'post_number' => '5',
145 
-                'relate_to' => '',
146 
-                'layout' => 'gridview_onehalf',
147 
-                'listing_width' => '',
148 
-                'add_location_filter' => '1',
149 
-                'character_count' => '20')
150 
-        );
137 
+	public function form($instance)
138 
+	{
139 
+		//widgetform in backend
140 
+		$instance = wp_parse_args((array)$instance,
141 
+			array('title' => '',
142 
+				'list_sort' => '',
143 
+				'list_order' => '',
144 
+				'post_number' => '5',
145 
+				'relate_to' => '',
146 
+				'layout' => 'gridview_onehalf',
147 
+				'listing_width' => '',
148 
+				'add_location_filter' => '1',
149 
+				'character_count' => '20')
150 
+		);
151 151
152 
-        $title = strip_tags($instance['title']);
152 
+		$title = strip_tags($instance['title']);
153 153
154 
-        $list_sort = strip_tags($instance['list_sort']);
154 
+		$list_sort = strip_tags($instance['list_sort']);
155 155
156 
-        $list_order = strip_tags($instance['list_order']);
156 
+		$list_order = strip_tags($instance['list_order']);
157 157
158 
-        $post_number = strip_tags($instance['post_number']);
158 
+		$post_number = strip_tags($instance['post_number']);
159 159
160 
-        $relate_to = strip_tags($instance['relate_to']);
160 
+		$relate_to = strip_tags($instance['relate_to']);
161 161
162 
-        $layout = strip_tags($instance['layout']);
162 
+		$layout = strip_tags($instance['layout']);
163 163
164 
-        $listing_width = strip_tags($instance['listing_width']);
164 
+		$listing_width = strip_tags($instance['listing_width']);
165 165
166 
-        $add_location_filter = strip_tags($instance['add_location_filter']);
166 
+		$add_location_filter = strip_tags($instance['add_location_filter']);
167 167
168 
-        $character_count = $instance['character_count'];
168 
+		$character_count = $instance['character_count'];
169 169
170 
-        ?>
170 
+		?>
171 171 
         <p>
172 172 
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
173 173 
 
@@ -184,24 +184,24 @@  discard block
 
 block discarded – undo
184 184 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
185 185
186 186 
                     <option <?php if ($list_sort == 'latest') {
187 
-                        echo 'selected="selected"';
188 
-                    } ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
187 
+						echo 'selected="selected"';
188 
+					} ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
189 189
190 190 
                     <option <?php if ($list_sort == 'featured') {
191 
-                        echo 'selected="selected"';
192 
-                    } ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
191 
+						echo 'selected="selected"';
192 
+					} ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
193 193
194 194 
                     <option <?php if ($list_sort == 'high_review') {
195 
-                        echo 'selected="selected"';
196 
-                    } ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
195 
+						echo 'selected="selected"';
196 
+					} ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
197 197
198 198 
                     <option <?php if ($list_sort == 'high_rating') {
199 
-                        echo 'selected="selected"';
200 
-                    } ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
199 
+						echo 'selected="selected"';
200 
+					} ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
201 201
202 202 
                     <option <?php if ($list_sort == 'random') {
203 
-                        echo 'selected="selected"';
204 
-                    } ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
203 
+						echo 'selected="selected"';
204 
+					} ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
205 205
206 206 
                 </select>
207 207 
             </label>
 
@@ -221,11 +221,11 @@  discard block
 
 block discarded – undo
221 221 
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
222 222 
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
223 223 
                     <option <?php if ($relate_to == 'category') {
224 
-                        echo 'selected="selected"';
225 
-                    } ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
224 
+						echo 'selected="selected"';
225 
+					} ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
226 226 
                     <option <?php if ($relate_to == 'tags') {
227 
-                        echo 'selected="selected"';
228 
-                    } ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
227 
+						echo 'selected="selected"';
228 
+					} ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
229 229 
                 </select>
230 230 
             </label>
231 231 
         </p>
 
@@ -236,24 +236,24 @@  discard block
 
 block discarded – undo
236 236 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
237 237 
                         name="<?php echo $this->get_field_name('layout'); ?>">
238 238 
                     <option <?php if ($layout == 'gridview_onehalf') {
239 
-                        echo 'selected="selected"';
240 
-                    } ?>
239 
+						echo 'selected="selected"';
240 
+					} ?>
241 241 
                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>
242 242 
                     <option <?php if ($layout == 'gridview_onethird') {
243 
-                        echo 'selected="selected"';
244 
-                    } ?>
243 
+						echo 'selected="selected"';
244 
+					} ?>
245 245 
                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>
246 246 
                     <option <?php if ($layout == 'gridview_onefourth') {
247 
-                        echo 'selected="selected"';
248 
-                    } ?>
247 
+						echo 'selected="selected"';
248 
+					} ?>
249 249 
                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>
250 250 
                     <option <?php if ($layout == 'gridview_onefifth') {
251 
-                        echo 'selected="selected"';
252 
-                    } ?>
251 
+						echo 'selected="selected"';
252 
+					} ?>
253 253 
                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>
254 254 
                     <option <?php if ($layout == 'list') {
255 
-                        echo 'selected="selected"';
256 
-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
255 
+						echo 'selected="selected"';
256 
+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
257 257
258 258 
                 </select>
259 259 
             </label>
 
@@ -285,7 +285,7 @@  discard block
 
 block discarded – undo
285 285 
         </p>
286 286
287 287 
     <?php
288 
-    }
288 
+	}
289 289 
 } // class geodir_related_listing_postview
290 290
291 291 
 register_widget('geodir_related_listing_postview');
292 292 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -118,10 +118,11 @@  discard block
 
 block discarded – undo
118 118 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);
119 119 
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);
120 120 
         $instance['character_count'] = $new_instance['character_count'];
121 
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
122 
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123 
-        else
124 
-            $instance['add_location_filter'] = '0';
121 
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
122 
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
123 
+        } else {
124 
+                    $instance['add_location_filter'] = '0';
125 
+        }
125 126
126 127 
         return $instance;
127 128 
     }
 
@@ -279,7 +280,10 @@  discard block
 
 block discarded – undo
279 280 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
280 281 
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
281 282 
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
282 
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
283 
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
284 
+	echo 'checked="checked"';
285 
+}
286 
+?>
283 287 
                        value="1"/>
284 288 
             </label>
285 289 
         </p>
Please login to merge, or discard this patch.
geodirectory-widgets/home_map_widget.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -192,8 +192,9 @@
 
 block discarded – undo
192 192
193 193 
                     foreach ($map_zoom_level as $level) {
194 194 
                         $selected = '';
195 
-                        if ($level == $zoom)
196 
-                            $selected = 'selected="selected"';
195 
+                        if ($level == $zoom) {
196 
+                                                    $selected = 'selected="selected"';
197 
+                        }
197 198
198 199 
                         echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
199 200
Please login to merge, or discard this patch.
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch 
@@ -16,126 +16,126 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17 
 class geodir_homepage_map extends WP_Widget
18 18 
 {
19 
-    /**
19 
+	/**
20 20 
 	 * Register the home page map widget.
21 21 
 	 *
22 22 
 	 * @since 1.0.0
23 
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
23 
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
24 24 
 	 */
25 
-    public function __construct() {
26 
-        $widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));
27 
-        parent::__construct(
28 
-            'geodir_map_v3_home_map', // Base ID
29 
-            __('GD > GMap - Home page', 'geodirectory'), // Name
30 
-            $widget_ops// Args
31 
-        );
32 
-    }
25 
+	public function __construct() {
26 
+		$widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));
27 
+		parent::__construct(
28 
+			'geodir_map_v3_home_map', // Base ID
29 
+			__('GD > GMap - Home page', 'geodirectory'), // Name
30 
+			$widget_ops// Args
31 
+		);
32 
+	}
33 33
34 34 
 	/**
35 35 
 	 * Front-end display content for home page map widget.
36 36 
 	 *
37 37 
 	 * @since 1.0.0
38 
-     * @since 1.5.1 Declare function public.
38 
+	 * @since 1.5.1 Declare function public.
39 39 
 	 *
40 40 
 	 * @param array $args     Widget arguments.
41 41 
 	 * @param array $instance Saved values from database.
42 42 
 	 */
43 
-    public function widget($args, $instance)
44 
-    {
45 
-        extract($args, EXTR_SKIP);
46 
-        /** This action is documented in geodirectory_shortcodes.php */
47 
-        $width = empty($instance['width']) ? '100%' : apply_filters('widget_width', $instance['width']);
48 
-        /** This action is documented in geodirectory_shortcodes.php */
49 
-        $height = empty($instance['heigh']) ? '425' : apply_filters('widget_heigh', $instance['heigh']);
50 
-        /** This action is documented in geodirectory_shortcodes.php */
51 
-        $maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);
52 
-        /** This action is documented in geodirectory_shortcodes.php */
53 
-        $zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);
54 
-        /** This action is documented in geodirectory_shortcodes.php */
55 
-        $autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);
56 
-        /** This action is documented in geodirectory_shortcodes.php */
57 
-        $child_collapse = empty($instance['child_collapse']) ? '0' : apply_filters('widget_child_collapse', $instance['child_collapse']);
58 
-        /** This action is documented in geodirectory_shortcodes.php */
59 
-        $scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);
43 
+	public function widget($args, $instance)
44 
+	{
45 
+		extract($args, EXTR_SKIP);
46 
+		/** This action is documented in geodirectory_shortcodes.php */
47 
+		$width = empty($instance['width']) ? '100%' : apply_filters('widget_width', $instance['width']);
48 
+		/** This action is documented in geodirectory_shortcodes.php */
49 
+		$height = empty($instance['heigh']) ? '425' : apply_filters('widget_heigh', $instance['heigh']);
50 
+		/** This action is documented in geodirectory_shortcodes.php */
51 
+		$maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);
52 
+		/** This action is documented in geodirectory_shortcodes.php */
53 
+		$zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);
54 
+		/** This action is documented in geodirectory_shortcodes.php */
55 
+		$autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);
56 
+		/** This action is documented in geodirectory_shortcodes.php */
57 
+		$child_collapse = empty($instance['child_collapse']) ? '0' : apply_filters('widget_child_collapse', $instance['child_collapse']);
58 
+		/** This action is documented in geodirectory_shortcodes.php */
59 
+		$scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);
60 60
61 
-        $map_args = array();
62 
-        $map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']); //'home_map_canvas'.$str ;
63 
-        $map_args['width'] = $width;
64 
-        $map_args['height'] = $height;
65 
-        $map_args['maptype'] = $maptype;
66 
-        $map_args['scrollwheel'] = $scrollwheel;
67 
-        $map_args['zoom'] = $zoom;
68 
-        $map_args['autozoom'] = $autozoom;
69 
-        $map_args['child_collapse'] = $child_collapse;
70 
-        $map_args['enable_cat_filters'] = true;
71 
-        $map_args['enable_text_search'] = true;
72 
-        $map_args['enable_post_type_filters'] = true;
73 
-        /** This action is documented in geodirectory_shortcodes.php */
74 
-        $map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);
75 
-        $map_args['enable_jason_on_load'] = false;
76 
-        $map_args['enable_marker_cluster'] = false;
77 
-        $map_args['enable_map_resize_button'] = true;
78 
-        $map_args['map_class_name'] = 'geodir-map-home-page';
61 
+		$map_args = array();
62 
+		$map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']); //'home_map_canvas'.$str ;
63 
+		$map_args['width'] = $width;
64 
+		$map_args['height'] = $height;
65 
+		$map_args['maptype'] = $maptype;
66 
+		$map_args['scrollwheel'] = $scrollwheel;
67 
+		$map_args['zoom'] = $zoom;
68 
+		$map_args['autozoom'] = $autozoom;
69 
+		$map_args['child_collapse'] = $child_collapse;
70 
+		$map_args['enable_cat_filters'] = true;
71 
+		$map_args['enable_text_search'] = true;
72 
+		$map_args['enable_post_type_filters'] = true;
73 
+		/** This action is documented in geodirectory_shortcodes.php */
74 
+		$map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);
75 
+		$map_args['enable_jason_on_load'] = false;
76 
+		$map_args['enable_marker_cluster'] = false;
77 
+		$map_args['enable_map_resize_button'] = true;
78 
+		$map_args['map_class_name'] = 'geodir-map-home-page';
79 79
80 
-        $is_geodir_home_map_widget = true;
81 
-        $map_args['is_geodir_home_map_widget'] = $is_geodir_home_map_widget;
80 
+		$is_geodir_home_map_widget = true;
81 
+		$map_args['is_geodir_home_map_widget'] = $is_geodir_home_map_widget;
82 82
83 
-        geodir_draw_map($map_args);
83 
+		geodir_draw_map($map_args);
84 84
85 
-        /* home map post type slider */
86 
-        if ($is_geodir_home_map_widget) {
87 
-            add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);
88 
-        }
85 
+		/* home map post type slider */
86 
+		if ($is_geodir_home_map_widget) {
87 
+			add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);
88 
+		}
89 89
90 
-    }
90 
+	}
91 91
92 92 
 	/**
93 93 
 	 * Sanitize home page map widget form values as they are saved.
94 94 
 	 *
95 95 
 	 * @since 1.0.0
96 
-     * @since 1.5.1 Declare function public.
96 
+	 * @since 1.5.1 Declare function public.
97 97 
 	 *
98 98 
 	 * @param array $new_instance Values just sent to be saved.
99 99 
 	 * @param array $old_instance Previously saved values from database.
100 100 
 	 *
101 101 
 	 * @return array Updated safe values to be saved.
102 102 
 	 */
103 
-    public function update($new_instance, $old_instance)
104 
-    {
105 
-        //save the widget
106 
-        $instance = $old_instance;
107 
-        $instance['width'] = strip_tags($new_instance['width']);
108 
-        $instance['heigh'] = ($new_instance['heigh']);
109 
-        $instance['maptype'] = ($new_instance['maptype']);
110 
-        $instance['zoom'] = ($new_instance['zoom']);
111 
-        $instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';
112 
-        $instance['child_collapse'] = isset($new_instance['child_collapse']) ? ($new_instance['child_collapse']) : '';
113 
-        $instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';
103 
+	public function update($new_instance, $old_instance)
104 
+	{
105 
+		//save the widget
106 
+		$instance = $old_instance;
107 
+		$instance['width'] = strip_tags($new_instance['width']);
108 
+		$instance['heigh'] = ($new_instance['heigh']);
109 
+		$instance['maptype'] = ($new_instance['maptype']);
110 
+		$instance['zoom'] = ($new_instance['zoom']);
111 
+		$instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';
112 
+		$instance['child_collapse'] = isset($new_instance['child_collapse']) ? ($new_instance['child_collapse']) : '';
113 
+		$instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';
114 114
115 
-        return $instance;
116 
-    }
115 
+		return $instance;
116 
+	}
117 117
118 118 
 	/**
119 119 
 	 * Back-end home page map widget settings form.
120 120 
 	 *
121 121 
 	 * @since 1.0.0
122 
-     * @since 1.5.1 Declare function public.
122 
+	 * @since 1.5.1 Declare function public.
123 123 
 	 *
124 124 
 	 * @param array $instance Previously saved values from database.
125 125 
 	 */
126 
-    public function form($instance)
127 
-    {
128 
-        //widgetform in backend
126 
+	public function form($instance)
127 
+	{
128 
+		//widgetform in backend
129 129
130 
-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
131 
-        $width = strip_tags($instance['width']);
132 
-        $heigh = strip_tags($instance['heigh']);
133 
-        $maptype = strip_tags($instance['maptype']);
134 
-        $zoom = strip_tags($instance['zoom']);
135 
-        $autozoom = strip_tags($instance['autozoom']);
136 
-        $child_collapse = strip_tags($instance['child_collapse']);
137 
-        $scrollwheel = strip_tags($instance['scrollwheel']);
138 
-        ?>
130 
+		$instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
131 
+		$width = strip_tags($instance['width']);
132 
+		$heigh = strip_tags($instance['heigh']);
133 
+		$maptype = strip_tags($instance['maptype']);
134 
+		$zoom = strip_tags($instance['zoom']);
135 
+		$autozoom = strip_tags($instance['autozoom']);
136 
+		$child_collapse = strip_tags($instance['child_collapse']);
137 
+		$scrollwheel = strip_tags($instance['scrollwheel']);
138 
+		?>
139 139
140 140 
         <p>
141 141 
             <label

@@ -164,14 +164,14 @@  discard block
 
 block discarded – undo
164 164 
                         name="<?php echo $this->get_field_name('maptype'); ?>">
165 165
166 166 
                     <option <?php if (isset($maptype) && $maptype == 'ROADMAP') {
167 
-                        echo 'selected="selected"';
168 
-                    } ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>
167 
+						echo 'selected="selected"';
168 
+					} ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>
169 169 
                     <option <?php if (isset($maptype) && $maptype == 'SATELLITE') {
170 
-                        echo 'selected="selected"';
171 
-                    } ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>
170 
+						echo 'selected="selected"';
171 
+					} ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>
172 172 
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {
173 
-                        echo 'selected="selected"';
174 
-                    } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>
173 
+						echo 'selected="selected"';
174 
+					} ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>
175 175 
 					<option <?php selected($maptype, 'TERRAIN');?>
176 176 
 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>
177 177 
                 </select>

@@ -179,8 +179,8 @@  discard block
 
 block discarded – undo
179 179 
         </p>
180 180
181 181 
         <?php
182 
-        $map_zoom_level = geodir_map_zoom_level();
183 
-        ?>
182 
+		$map_zoom_level = geodir_map_zoom_level();
183 
+		?>
184 184
185 185 
         <p>
186 186 
             <label

@@ -189,14 +189,14 @@  discard block
 
 block discarded – undo
189 189 
                 <select class="widefat" id="<?php echo $this->get_field_id('zoom'); ?>"
190 190 
                         name="<?php echo $this->get_field_name('zoom'); ?>"> <?php
191 191
192 
-                    foreach ($map_zoom_level as $level) {
193 
-                        $selected = '';
194 
-                        if ($level == $zoom)
195 
-                            $selected = 'selected="selected"';
192 
+					foreach ($map_zoom_level as $level) {
193 
+						$selected = '';
194 
+						if ($level == $zoom)
195 
+							$selected = 'selected="selected"';
196 196
197 
-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
197 
+						echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
198 198
199 
-                    } ?>
199 
+					} ?>
200 200
201 201 
                 </select>
202 202 
             </label>

@@ -209,8 +209,8 @@  discard block
 
 block discarded – undo
209 209 
                 :
210 210 
                 <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('autozoom'); ?>"
211 211 
                        name="<?php echo $this->get_field_name('autozoom'); ?>"<?php if ($autozoom) {
212 
-                    echo 'checked="checked"';
213 
-                } ?> /></label>
212 
+					echo 'checked="checked"';
213 
+				} ?> /></label>
214 214 
         </p>
215 215
216 216 
         <p>

@@ -234,17 +234,17 @@  discard block
 
 block discarded – undo
234 234 
         </p>
235 235
236 236 
     <?php
237 
-    }
237 
+	}
238 238
239 
-    /**
239 
+	/**
240 240 
 	 * Adds the javascript in the footer for home page map widget.
241 241 
 	 *
242 242 
 	 * @since 1.0.0
243 
-     * @since 1.5.1 Declare function public.
243 
+	 * @since 1.5.1 Declare function public.
244 244 
 	 */
245 
-    public function geodir_home_map_add_script()
246 
-    {
247 
-        ?>
245 
+	public function geodir_home_map_add_script()
246 
+	{
247 
+		?>
248 248 
         <script type="text/javascript">
249 249 
             jQuery(document).ready(function () {
250 250 
                 geoDirMapSlide();

@@ -317,7 +317,7 @@  discard block
 
 block discarded – undo
317 317 
             }
318 318 
         </script>
319 319 
     <?php
320 
-    }
320 
+	}
321 321 
 } // class geodir_homepage_map
322 322
323 323 
 register_widget('geodir_homepage_map');
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127 
     {
128 128 
         //widgetform in backend
129 129
130 
-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
130 
+        $instance = wp_parse_args((array) $instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
131 131 
         $width = strip_tags($instance['width']);
132 132 
         $heigh = strip_tags($instance['heigh']);
133 133 
         $maptype = strip_tags($instance['maptype']);

@@ -172,7 +172,7 @@  discard block
 
 block discarded – undo
172 172 
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {
173 173 
                         echo 'selected="selected"';
174 174 
                     } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>
175 
-					<option <?php selected($maptype, 'TERRAIN');?>
175 
+					<option <?php selected($maptype, 'TERRAIN'); ?>
176 176 
 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>
177 177 
                 </select>
178 178 
             </label>

@@ -194,7 +194,7 @@  discard block
 
 block discarded – undo
194 194 
                         if ($level == $zoom)
195 195 
                             $selected = 'selected="selected"';
196 196
197 
-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';
197 
+                        echo '<option '.$selected.' value="'.$level.'">'.$level.'</option>';
198 198
199 199 
                     } ?>
200 200 
 

@@ -219,7 +219,7 @@  discard block
 
 block discarded – undo
219 219 
                 :
220 220 
                 <input id="<?php echo $this->get_field_id('child_collapse'); ?>"
221 221 
                        name="<?php echo $this->get_field_name('child_collapse'); ?>" type="checkbox" value="1"
222 
-                       <?php if ($child_collapse){ ?>checked="checked" <?php } ?> />
222 
+                       <?php if ($child_collapse) { ?>checked="checked" <?php } ?> />
223 223 
             </label>
224 224 
         </p>
225 225 
 

@@ -229,7 +229,7 @@  discard block
 
 block discarded – undo
229 229 
                 :
230 230 
                 <input id="<?php echo $this->get_field_id('scrollwheel'); ?>"
231 231 
                        name="<?php echo $this->get_field_name('scrollwheel'); ?>" type="checkbox" value="1"
232 
-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> />
232 
+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> />
233 233 
             </label>
234 234 
         </p>
235 235
Please login to merge, or discard this patch.
geodirectory-functions/post_functions.php 4 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -721,7 +721,7 @@  discard block
 
 block discarded – undo
721 721 
      * @param int $post_id The post ID.
722 722 
      * @param string $postmeta Detail table column name.
723 723 
      * @param string $meta_value Detail table column value.
724 
-     * @return void|bool
724 
+     * @return null|false
725 725 
      */
726 726 
     function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')
727 727 
     {

@@ -775,7 +775,7 @@  discard block
 
 block discarded – undo
775 775 
      * @param string $postmeta Detail table column name.
776 776 
      * @todo check if this is depreciated
777 777 
      * @todo Fix unknown variable mval
778 
-     * @return bool
778 
+     * @return boolean|null
779 779 
      */
780 780 
     function geodir_delete_post_meta($post_id, $postmeta)
781 781 
     {

@@ -2124,7 +2124,7 @@  discard block
 
 block discarded – undo
2124 2124 
      * @global string $plugin_prefix Geodirectory plugin table prefix.
2125 2125 
      * @param int $deleted_postid The post ID.
2126 2126 
      * @param bool $force Optional. Do you want to force delete it? Default: false.
2127 
-     * @return bool|void
2127 
+     * @return null|false
2128 2128 
      */
2129 2129 
     function geodir_delete_listing_info($deleted_postid, $force = false)
2130 2130 
     {

@@ -2693,7 +2693,7 @@  discard block
 
 block discarded – undo
2693 2693 
  * @since 1.0.0
2694 2694 
  * @package GeoDirectory
2695 2695 
  * @global object $current_user Current user object.
2696 
- * @param int|string $listing_id The post ID.
2696 
+ * @param integer $listing_id The post ID.
2697 2697 
  * @param bool $exclude_admin Optional. Do you want to exclude admin from the check?. Default true.
2698 2698 
  * @return bool
2699 2699 
  */
Please login to merge, or discard this patch.
Braces   +171 added lines, -121 removed lines patch added patch discarded remove patch 
@@ -21,12 +21,13 @@  discard block
 
 block discarded – undo
21 21 
 {
22 22
23 23 
     $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);
24 
-    if (!empty($post_cat_ids))
25 
-        $post_cat_array = explode(",", trim($post_cat_ids, ","));
24 
+    if (!empty($post_cat_ids)) {
25 
+            $post_cat_array = explode(",", trim($post_cat_ids, ","));
26 
+    }
26 27
27 28 
     if (!isset($default_cat) || empty($default_cat)) {
28 29 
         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
29 
-    }else{
30 
+    } else{
30 31 
         if(!is_int($default_cat)){
31 32 
             $category = get_term_by('name', $default_cat, $taxonomy);
32 33 
             if(isset($category->term_id)){

@@ -384,8 +385,9 @@  discard block
 
 block discarded – undo
384 385 
             } elseif (trim($type) == 'file') {
385 386 
                 if (isset($request_info[$name])) {
386 387 
                     $request_files = array();
387 
-                    if ($request_info[$name] != '')
388 
-                        $request_files = explode(",", $request_info[$name]);
388 
+                    if ($request_info[$name] != '') {
389 
+                                            $request_files = explode(",", $request_info[$name]);
390 
+                    }
389 391
390 392 
                     $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;
391 393 
                     geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

@@ -412,7 +414,7 @@  discard block
 
 block discarded – undo
412 414
413 415 
                             $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
414 416
415 
-                        }else{
417 
+                        } else{
416 418 
                             $post_htmlvar_value = $request_info[$name];
417 419 
                         }
418 420 
 

@@ -452,15 +454,17 @@  discard block
 
 block discarded – undo
452 454
453 455 
             foreach ($request_info['post_category'] as $taxonomy => $cat) {
454 456
455 
-                if ($dummy)
456 
-                    $post_category = $cat;
457 
-                else {
457 
+                if ($dummy) {
458 
+                                    $post_category = $cat;
459 
+                } else {
458 460
459 
-                    if (!is_array($cat) && strstr($cat, ','))
460 
-                        $cat = explode(',', $cat);
461 
+                    if (!is_array($cat) && strstr($cat, ',')) {
462 
+                                            $cat = explode(',', $cat);
463 
+                    }
461 464
462 
-                    if (!empty($cat) && is_array($cat))
463 
-                        $post_category = array_map('intval', $cat);
465 
+                    if (!empty($cat) && is_array($cat)) {
466 
+                                            $post_category = array_map('intval', $cat);
467 
+                    }
464 468 
                 }
465 469
466 470 
                 wp_set_object_terms($last_post_id, $post_category, $taxonomy);

@@ -478,11 +482,13 @@  discard block
 
 block discarded – undo
478 482 
         if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
479 483 
             $post_tags = explode(",", $request_info['post_tags']);
480 484 
         } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
481 
-            if ($dummy)
482 
-                $post_tags = $request_info['post_tags'];
485 
+            if ($dummy) {
486 
+                            $post_tags = $request_info['post_tags'];
487 
+            }
483 488 
         } else {
484 
-            if ($dummy)
485 
-                $post_tags = array($request_info['post_title']);
489 
+            if ($dummy) {
490 
+                            $post_tags = array($request_info['post_title']);
491 
+            }
486 492 
         }
487 493
488 494 
         if (is_array($post_tags)) {

@@ -569,15 +575,17 @@  discard block
 
 block discarded – undo
569 575
570 576 
     global $wpdb, $plugin_prefix, $post, $post_info;
571 577
572 
-    if ($post_id == '' && !empty($post))
573 
-        $post_id = $post->ID;
578 
+    if ($post_id == '' && !empty($post)) {
579 
+            $post_id = $post->ID;
580 
+    }
574 581
575 582 
     $post_type = get_post_type($post_id);
576 583
577 584 
     $all_postypes = geodir_get_posttypes();
578 585
579 
-    if (!in_array($post_type, $all_postypes))
580 
-        return false;
586 
+    if (!in_array($post_type, $all_postypes)) {
587 
+            return false;
588 
+    }
581 589
582 590 
     $table = $plugin_prefix . $post_type . '_detail';
583 591 
 

@@ -737,8 +745,9 @@  discard block
 
 block discarded – undo
737 745 
             do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
738 746
739 747 
             return true;
740 
-        } else
741 
-            return false;
748 
+        } else {
749 
+                    return false;
750 
+        }
742 751
743 752 
     }
744 753 
 }

@@ -792,8 +801,9 @@  discard block
 
 block discarded – undo
792 801 
             }
793 802
794 803
795 
-        } else
796 
-            return false;
804 
+        } else {
805 
+                    return false;
806 
+        }
797 807 
     }
798 808 
 }
799 809 
 

@@ -824,8 +834,9 @@  discard block
 
 block discarded – undo
824 834 
             $post_meta_set_query = '';
825 835
826 836 
             foreach ($postmeta as $mkey) {
827 
-                if ($mval != '')
828 
-                    $post_meta_set_query .= $mkey . " = '', ";
837 
+                if ($mval != '') {
838 
+                                    $post_meta_set_query .= $mkey . " = '', ";
839 
+                }
829 840 
             }
830 841
831 842 
             $post_meta_set_query = trim($post_meta_set_query, ", ");

@@ -859,8 +870,9 @@  discard block
 
 block discarded – undo
859 870 
                 return true;
860 871 
             }
861 872
862 
-        } else
863 
-            return false;
873 
+        } else {
874 
+                    return false;
875 
+        }
864 876 
     }
865 877 
 }
866 878 
 

@@ -890,8 +902,9 @@  discard block
 
 block discarded – undo
890 902
891 903 
         $post_type = get_post_type($post_id);
892 904
893 
-        if (!in_array($post_type, $all_postypes))
894 
-            return false;
905 
+        if (!in_array($post_type, $all_postypes)) {
906 
+                    return false;
907 
+        }
895 908
896 909 
         $table = $plugin_prefix . $post_type . '_detail';
897 910 
 

@@ -899,8 +912,9 @@  discard block
 
 block discarded – undo
899 912 
             $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
900 913 
             if ($meta_value && $meta_value !== '') {
901 914 
                 return maybe_serialize($meta_value);
902 
-            } else
903 
-                return $meta_value;
915 
+            } else {
916 
+                            return $meta_value;
917 
+            }
904 918 
         } else {
905 919 
             return false;
906 920 
         }

@@ -1034,7 +1048,7 @@  discard block
 
 block discarded – undo
1034 1048 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {
1035 1049 
                                 $new_name = basename($uploaded['file']);
1036 1050 
                                 $uploaded_file = $uploaded;
1037 
-                            }else{
1051 
+                            } else{
1038 1052 
                                 print_r($uploaded);exit;
1039 1053 
                             }
1040 1054 
                             $external_img = false;

@@ -1059,8 +1073,9 @@  discard block
 
 block discarded – undo
1059 1073 
                                 $file_path = $curr_img_dir . '/' . $filename;
1060 1074 
                             }
1061 1075
1062 
-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
1063 
-                                unlink($img_path);
1076 
+                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) {
1077 
+                                                            unlink($img_path);
1078 
+                            }
1064 1079 
                         }
1065 1080
1066 1081 
                         if (!empty($uploaded_file)) {

@@ -1089,8 +1104,9 @@  discard block
 
 block discarded – undo
1089 1104 
                             $attachment_set = '';
1090 1105
1091 1106 
                             foreach ($attachment as $key => $val) {
1092 
-                                if ($val != '')
1093 
-                                    $attachment_set .= $key . " = '" . $val . "', ";
1107 
+                                if ($val != '') {
1108 
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
1109 
+                                }
1094 1110 
                             }
1095 1111
1096 1112 
                             $attachment_set = trim($attachment_set, ", ");

@@ -1115,8 +1131,9 @@  discard block
 
 block discarded – undo
1115 1131 
                         )
1116 1132 
                     );
1117 1133
1118 
-                    if ($menu_order == 1)
1119 
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1134 
+                    if ($menu_order == 1) {
1135 
+                                            $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1136 
+                    }
1120 1137
1121 1138 
                 }
1122 1139 
 

@@ -1157,8 +1174,9 @@  discard block
 
 block discarded – undo
1157 1174
1158 1175 
         $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1159 1176
1160 
-        if (!empty($invalid_files))
1161 
-            geodir_remove_attachments($invalid_files);
1177 
+        if (!empty($invalid_files)) {
1178 
+                    geodir_remove_attachments($invalid_files);
1179 
+        }
1162 1180 
     }
1163 1181
1164 1182 
 }

@@ -1211,16 +1229,19 @@  discard block
 
 block discarded – undo
1211 1229 
 function geodir_delete_directory($dirname)
1212 1230 
 {
1213 1231 
     $dir_handle = '';
1214 
-    if (is_dir($dirname))
1215 
-        $dir_handle = opendir($dirname);
1216 
-    if (!$dir_handle)
1217 
-        return false;
1232 
+    if (is_dir($dirname)) {
1233 
+            $dir_handle = opendir($dirname);
1234 
+    }
1235 
+    if (!$dir_handle) {
1236 
+            return false;
1237 
+    }
1218 1238 
     while ($file = readdir($dir_handle)) {
1219 1239 
         if ($file != "." && $file != "..") {
1220 
-            if (!is_dir($dirname . "/" . $file))
1221 
-                unlink($dirname . "/" . $file);
1222 
-            else
1223 
-                geodir_delete_directory($dirname . '/' . $file);
1240 
+            if (!is_dir($dirname . "/" . $file)) {
1241 
+                            unlink($dirname . "/" . $file);
1242 
+            } else {
1243 
+                            geodir_delete_directory($dirname . '/' . $file);
1244 
+            }
1224 1245 
         }
1225 1246 
     }
1226 1247 
     closedir($dir_handle);

@@ -1249,8 +1270,9 @@  discard block
 
 block discarded – undo
1249 1270 
             foreach ($postcurr_images as $postimg) {
1250 1271 
                 $image_name_arr = explode('/', $postimg->src);
1251 1272 
                 $filename = end($image_name_arr);
1252 
-                if (file_exists($uploads_dir . '/' . $filename))
1253 
-                    unlink($uploads_dir . '/' . $filename);
1273 
+                if (file_exists($uploads_dir . '/' . $filename)) {
1274 
+                                    unlink($uploads_dir . '/' . $filename);
1275 
+                }
1254 1276 
             }
1255 1277
1256 1278 
         } // endif

@@ -1358,9 +1380,9 @@  discard block
 
 block discarded – undo
1358 1380 
                 $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1359 1381 
             }
1360 1382
1361 
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1362 
-                $default_img = $default_catimg['src'];
1363 
-            elseif ($no_image) {
1383 
+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
1384 
+                            $default_img = $default_catimg['src'];
1385 
+            } elseif ($no_image) {
1364 1386 
                 $default_img = get_option('geodir_listing_no_img');
1365 1387 
             }
1366 1388 
 

@@ -1392,10 +1414,13 @@  discard block
 
 block discarded – undo
1392 1414 
             }
1393 1415 
         }
1394 1416
1395 
-        if (!empty($img_arr))
1396 
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
1397 
-        else
1398 
-            return false;
1417 
+        if (!empty($img_arr)) {
1418 
+                    return (object)$img_arr;
1419 
+        }
1420 
+        //return (object)array( 'src' => $file_url, 'path' => $file_path );
1421 
+        else {
1422 
+                    return false;
1423 
+        }
1399 1424 
     }
1400 1425 
 }
1401 1426 
 

@@ -1422,8 +1447,9 @@  discard block
 
 block discarded – undo
1422 1447 
             echo $html;
1423 1448 
         } elseif (!empty($html)) {
1424 1449 
             return $html;
1425 
-        } else
1426 
-            return false;
1450 
+        } else {
1451 
+                    return false;
1452 
+        }
1427 1453 
     }
1428 1454 
 }
1429 1455 
 

@@ -1451,8 +1477,9 @@  discard block
 
 block discarded – undo
1451 1477 
         }
1452 1478 
         $not_featured = '';
1453 1479 
         $sub_dir = '';
1454 
-        if (!$add_featured)
1455 
-            $not_featured = " AND is_featured = 0 ";
1480 
+        if (!$add_featured) {
1481 
+                    $not_featured = " AND is_featured = 0 ";
1482 
+        }
1456 1483
1457 1484 
         $arrImages = $wpdb->get_results(
1458 1485 
             $wpdb->prepare(

@@ -1473,8 +1500,9 @@  discard block
 
 block discarded – undo
1473 1500
1474 1501 
                 $file_info = pathinfo($attechment->file);
1475 1502
1476 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
1477 
-                    $sub_dir = stripslashes_deep($file_info['dirname']);
1503 
+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
1504 
+                                    $sub_dir = stripslashes_deep($file_info['dirname']);
1505 
+                }
1478 1506
1479 1507 
                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
1480 1508 
                 $uploads_baseurl = $uploads['baseurl'];

@@ -1519,9 +1547,9 @@  discard block
 
 block discarded – undo
1519 1547 
             $default_img = '';
1520 1548 
             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1521 1549 
             $post_type = get_post_type($post_id);
1522 
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1523 
-                $default_img = $default_catimg['src'];
1524 
-            elseif ($no_images) {
1550 
+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
1551 
+                            $default_img = $default_catimg['src'];
1552 
+            } elseif ($no_images) {
1525 1553 
                 $default_img = get_option('geodir_listing_no_img');
1526 1554 
             }
1527 1555 
 

@@ -1556,8 +1584,9 @@  discard block
 
 block discarded – undo
1556 1584 
                 $return_arr[] = (object)$img_arr;
1557 1585
1558 1586 
                 return $return_arr;
1559 
-            } else
1560 
-                return false;
1587 
+            } else {
1588 
+                            return false;
1589 
+            }
1561 1590 
         }
1562 1591 
     }
1563 1592 
 }

@@ -1618,8 +1647,9 @@  discard block
 
 block discarded – undo
1618 1647 
                         $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);
1619 1648 
                     } else if ($image->width < ($max_size->h)) {
1620 1649 
                         $width_per = round((($image->width / $max_size->w) * 100), 2);
1621 
-                    } else
1622 
-                        $width_per = 100;
1650 
+                    } else {
1651 
+                                            $width_per = 100;
1652 
+                    }
1623 1653 
                 }
1624 1654
1625 1655 
                 if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

@@ -1627,7 +1657,7 @@  discard block
 
 block discarded – undo
1627 1657 
                 } else {
1628 1658 
                     if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
1629 1659 
                         $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1630 
-                    }else{
1660 
+                    } else{
1631 1661 
                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1632 1662 
                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';
1633 1663 
                         $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

@@ -1642,8 +1672,9 @@  discard block
 
 block discarded – undo
1642 1672 
             echo $html;
1643 1673 
         } elseif (!empty($html)) {
1644 1674 
             return $html;
1645 
-        } else
1646 
-            return false;
1675 
+        } else {
1676 
+                    return false;
1677 
+        }
1647 1678 
     }
1648 1679 
 }
1649 1680 
 

@@ -1681,8 +1712,9 @@  discard block
 
 block discarded – undo
1681 1712 
                 $post_obj = get_post($post_id);
1682 1713
1683 1714 
                 $cat_ids = array('0');
1684 
-                if (is_array($tt_ids))
1685 
-                    $cat_ids = $tt_ids;
1715 
+                if (is_array($tt_ids)) {
1716 
+                                    $cat_ids = $tt_ids;
1717 
+                }
1686 1718
1687 1719
1688 1720 
                 if (!empty($cat_ids)) {

@@ -1739,8 +1771,9 @@  discard block
 
 block discarded – undo
1739 1771 
                         $json .= '}';
1740 1772
1741 1773
1742 
-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))
1743 
-                            $post_marker_json = $json;
1774 
+                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) {
1775 
+                                                    $post_marker_json = $json;
1776 
+                        }
1744 1777
1745 1778
1746 1779 
                         if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

@@ -1771,10 +1804,13 @@  discard block
 
 block discarded – undo
1771 1804 
                 if (!empty($post_term) && is_array($post_term)) {
1772 1805 
                     $categories = implode(',', $post_term);
1773 1806
1774 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
1807 
+                    if ($categories != '' && $categories != 0) {
1808 
+                    	$categories = ',' . $categories . ',';
1809 
+                    }
1775 1810
1776 
-                    if (empty($post_marker_json))
1777 
-                        $post_marker_json = isset($json) ? $json : '';
1811 
+                    if (empty($post_marker_json)) {
1812 
+                                            $post_marker_json = isset($json) ? $json : '';
1813 
+                    }
1778 1814
1779 1815 
                     if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
1780 1816 
 

@@ -1813,8 +1849,9 @@  discard block
 
 block discarded – undo
1813 1849
1814 1850 
                                 }
1815 1851
1816 
-                                if ($default_category == '')
1817 
-                                    $default_category = $categories[0];
1852 
+                                if ($default_category == '') {
1853 
+                                                                    $default_category = $categories[0];
1854 
+                                }
1818 1855
1819 1856 
                                 geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');
1820 1857 
 

@@ -1955,7 +1992,7 @@  discard block
 
 block discarded – undo
1955 1992 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"
1956 1993 
                                                src="<?php echo $post_images[0]; ?>"/></a></div>
1957 1994 
                             <?php
1958 
-                            }else{
1995 
+                            } else{
1959 1996 
                                 echo '<div class="geodir-bubble_image"></div>';
1960 1997 
                             }
1961 1998 
                         } else {

@@ -1963,7 +2000,7 @@  discard block
 
 block discarded – undo
1963 2000 
                                 ?>
1964 2001 
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
1965 2002 
                             <?php
1966 
-                            }else{
2003 
+                            } else{
1967 2004 
                                 echo '<div class="geodir-bubble_image"></div>';
1968 2005 
                             }
1969 2006 
                         }

@@ -2044,10 +2081,11 @@  discard block
 
 block discarded – undo
2044 2081 
      */
2045 2082 
     function geodir_new_post_default_status()
2046 2083 
     {
2047 
-        if (get_option('geodir_new_post_default_status'))
2048 
-            return get_option('geodir_new_post_default_status');
2049 
-        else
2050 
-            return 'publish';
2084 
+        if (get_option('geodir_new_post_default_status')) {
2085 
+                    return get_option('geodir_new_post_default_status');
2086 
+        } else {
2087 
+                    return 'publish';
2088 
+        }
2051 2089
2052 2090 
     }
2053 2091 
 }

@@ -2198,8 +2236,9 @@  discard block
 
 block discarded – undo
2198 2236
2199 2237 
         $all_postypes = geodir_get_posttypes();
2200 2238
2201 
-        if (!in_array($post_type, $all_postypes))
2202 
-            return false;
2239 
+        if (!in_array($post_type, $all_postypes)) {
2240 
+                    return false;
2241 
+        }
2203 2242
2204 2243 
         $table = $plugin_prefix . $post_type . '_detail';
2205 2244 
 

@@ -2467,8 +2506,9 @@  discard block
 
 block discarded – undo
2467 2506 
         $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
2468 2507
2469 2508 
         $user_meta_data = '';
2470 
-        if (isset($current_user->data->ID))
2471 
-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2509 
+        if (isset($current_user->data->ID)) {
2510 
+                    $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2511 
+        }
2472 2512
2473 2513 
         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
2474 2514 
             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

@@ -2481,8 +2521,9 @@  discard block
 
 block discarded – undo
2481 2521
2482 2522 
             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
2483 2523 
                 $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
2484 
-            } else
2485 
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2524 
+            } else {
2525 
+                            $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2526 
+            }
2486 2527
2487 2528 
             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
2488 2529 
                                                                                         href="javascript:void(0);"

@@ -2545,14 +2586,16 @@  discard block
 
 block discarded – undo
2545 2586 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
2546 2587
2547 2588 
             $cat_post_count = $wpdb->get_var($count_query);
2548 
-            if (empty($cat_post_count) || is_wp_error($cat_post_count))
2549 
-                $cat_post_count = 0;
2589 
+            if (empty($cat_post_count) || is_wp_error($cat_post_count)) {
2590 
+                            $cat_post_count = 0;
2591 
+            }
2550 2592
2551 2593 
             return $cat_post_count;
2552 2594
2553 
-        } else
2554 
-
2555 
-            return $term->count;
2595 
+        } else {
2596 
+
2597 
+            return $term->count;
2598 
+        }
2556 2599 
     }
2557 2600 
     return false;
2558 2601 
 

@@ -2599,13 +2642,15 @@  discard block
 
 block discarded – undo
2599 2642 
 		return $length;
2600 2643 
 	}
2601 2644
2602 
-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
2603 
-        $length = get_option('geodir_desc_word_limit');
2604 
-    elseif (get_query_var('excerpt_length'))
2605 
-        $length = get_query_var('excerpt_length');
2645 
+    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit')) {
2646 
+            $length = get_option('geodir_desc_word_limit');
2647 
+    } elseif (get_query_var('excerpt_length')) {
2648 
+            $length = get_query_var('excerpt_length');
2649 
+    }
2606 2650
2607 
-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
2608 
-        $length = get_option('geodir_author_desc_word_limit');
2651 
+    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit')) {
2652 
+            $length = get_option('geodir_author_desc_word_limit');
2653 
+    }
2609 2654
2610 2655 
     return $length;
2611 2656 
 }

@@ -2738,10 +2783,11 @@  discard block
 
 block discarded – undo
2738 2783 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)
2739 2784 
 {
2740 2785 
     $listing_author_id = geodir_get_listing_author($listing_id);
2741 
-    if ($listing_author_id == $user_id)
2742 
-        return true;
2743 
-    else
2744 
-        return false;
2786 
+    if ($listing_author_id == $user_id) {
2787 
+            return true;
2788 
+    } else {
2789 
+            return false;
2790 
+    }
2745 2791
2746 2792 
 }
2747 2793 
 

@@ -2790,10 +2836,11 @@  discard block
 
 block discarded – undo
2790 2836 
     $pattern = '/-\d+x\d+\./';
2791 2837 
     preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
2792 2838
2793 
-    if (empty($matches))
2794 
-        return '';
2795 
-    else
2796 
-        return $file;
2839 
+    if (empty($matches)) {
2840 
+            return '';
2841 
+    } else {
2842 
+            return $file;
2843 
+    }
2797 2844
2798 2845 
 }
2799 2846 
 

@@ -2878,8 +2925,9 @@  discard block
 
 block discarded – undo
2878 2925 
     } else {
2879 2926 
         //set_post_thumbnail($post_id,-1);
2880 2927
2881 
-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
2882 
-            wp_delete_attachment($post_thumbnail_id);
2928 
+        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
2929 
+                    wp_delete_attachment($post_thumbnail_id);
2930 
+        }
2883 2931
2884 2932 
     }
2885 2933 
 }

@@ -2964,8 +3012,9 @@  discard block
 
 block discarded – undo
2964 3012
2965 3013 
     global $wpdb;
2966 3014
2967 
-    if ($listing_type == '')
2968 
-        $listing_type = 'gd_place';
3015 
+    if ($listing_type == '') {
3016 
+            $listing_type = 'gd_place';
3017 
+    }
2969 3018
2970 3019 
     $fields_info = array();
2971 3020 
 

@@ -2988,8 +3037,9 @@  discard block
 
 block discarded – undo
2988 3037
2989 3038 
                 $fields_info[$prefix . 'address'] = $data->field_type;
2990 3039
2991 
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
2992 
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
3040 
+                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
3041 
+                                    $fields_info[$prefix . 'zip'] = $data->field_type;
3042 
+                }
2993 3043
2994 3044 
             } else {
2995 3045
Please login to merge, or discard this patch.
Spacing   +208 added lines, -208 removed lines patch added patch discarded remove patch 
@@ -26,11 +26,11 @@  discard block
 
 block discarded – undo
26 26
27 27 
     if (!isset($default_cat) || empty($default_cat)) {
28 28 
         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
29 
-    }else{
30 
-        if(!is_int($default_cat)){
29 
+    } else {
30 
+        if (!is_int($default_cat)) {
31 31 
             $category = get_term_by('name', $default_cat, $taxonomy);
32 
-            if(isset($category->term_id)){
33 
-                $default_cat =  $category->term_id;
32 
+            if (isset($category->term_id)) {
33 
+                $default_cat = $category->term_id;
34 34 
             }
35 35 
         }
36 36 
 

@@ -58,7 +58,7 @@  discard block
 
 block discarded – undo
58 58
59 59 
     if ($default_pos === false) {
60 60
61 
-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);
61 
+        $change_cat_str = str_replace($default_cat.',y:', $default_cat.',y,d:', $change_cat_str);
62 62
63 63 
     }
64 64 
 

@@ -145,7 +145,7 @@  discard block
 
 block discarded – undo
145 145
146 146 
             $gd_post = $post;
147 147 
             if (!empty($gd_post) && is_array($gd_post)) {
148 
-                $gd_post = (object)$post;
148 
+                $gd_post = (object) $post;
149 149
150 150 
                 // Fix WPML duplicate.
151 151 
                 if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {

@@ -239,7 +239,7 @@  discard block
 
 block discarded – undo
239 239 
         $send_post_submit_mail = false;
240 240
241 241 
         // unhook this function so it doesn't loop infinitely
242 
-        remove_action('save_post', 'geodir_post_information_save',10,2);
242 
+        remove_action('save_post', 'geodir_post_information_save', 10, 2);
243 243
244 244 
         if (isset($request_info['pid']) && $request_info['pid'] != '') {
245 245 
             $post['ID'] = $request_info['pid'];

@@ -263,13 +263,13 @@  discard block
 
 block discarded – undo
263 263 
         }
264 264
265 265 
         // re-hook this function
266 
-        add_action('save_post', 'geodir_post_information_save',10,2);
266 
+        add_action('save_post', 'geodir_post_information_save', 10, 2);
267 267
268 268 
         $post_tags = '';
269 269 
         if (!isset($request_info['post_tags'])) {
270 270
271 271 
             $post_type = $request_info['listing_type'];
272 
-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
272 
+            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));
273 273
274 274 
         }
275 275 
 

@@ -287,13 +287,13 @@  discard block
 
 block discarded – undo
287 287 
         $payment_info = array();
288 288 
         $package_info = array();
289 289
290 
-        $package_info = (array)geodir_post_package_info($package_info, $post);
290 
+        $package_info = (array) geodir_post_package_info($package_info, $post);
291 291
292 292 
         $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');
293 293
294 294 
         if (!empty($package_info) && !$post_package_id) {
295 295 
             if (isset($package_info['days']) && $package_info['days'] != 0) {
296 
-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
296 
+                $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));
297 297 
             } else {
298 298 
                 $payment_info['expire_date'] = 'Never';
299 299 
             }

@@ -314,8 +314,8 @@  discard block
 
 block discarded – undo
314 314 
             $extrafields = $val['extra_fields'];
315 315
316 316 
             if (trim($type) == 'address') {
317 
-                $prefix = $name . '_';
318 
-                $address = $prefix . 'address';
317 
+                $prefix = $name.'_';
318 
+                $address = $prefix.'address';
319 319
320 320 
                 if (isset($request_info[$address]) && $request_info[$address] != '') {
321 321 
                     $gd_post_info[$address] = wp_slash($request_info[$address]);

@@ -325,59 +325,59 @@  discard block
 
 block discarded – undo
325 325 
                     $extrafields = unserialize($extrafields);
326 326
327 327
328 
-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
328 
+                    if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {
329 329
330 330 
                         $location_result = geodir_get_default_location();
331 331
332 
-                        $gd_post_info[$prefix . 'city'] = $location_result->city;
333 
-                        $gd_post_info[$prefix . 'region'] = $location_result->region;
334 
-                        $gd_post_info[$prefix . 'country'] = $location_result->country;
332 
+                        $gd_post_info[$prefix.'city'] = $location_result->city;
333 
+                        $gd_post_info[$prefix.'region'] = $location_result->region;
334 
+                        $gd_post_info[$prefix.'country'] = $location_result->country;
335 335
336 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
336 
+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location
337 337
338 338 
                     } else {
339 339
340 
-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];
341 
-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];
342 
-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];
340 
+                        $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city'];
341 
+                        $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region'];
342 
+                        $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country'];
343 343
344 344 
                         //----------set post locations when import dummy data-------
345 345 
                         $location_result = geodir_get_default_location();
346 346
347 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
347 
+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location
348 348 
                         //-----------------------------------------------------------------
349 349
350 350 
                     }
351 351
352 352
353 
-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
354 
-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];
353 
+                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {
354 
+                        $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip'];
355 355 
                     }
356 356
357 357
358 358 
                     if (isset($extrafields['show_map']) && $extrafields['show_map']) {
359 359
360 
-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
361 
-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];
360 
+                        if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {
361 
+                            $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude'];
362 362 
                         }
363 363
364 
-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
365 
-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];
364 
+                        if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {
365 
+                            $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude'];
366 366 
                         }
367 367
368 
-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
369 
-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];
368 
+                        if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {
369 
+                            $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview'];
370 370 
                         }
371 371
372 
-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
373 
-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];
372 
+                        if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {
373 
+                            $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom'];
374 374 
                         }
375 375
376 376 
                     }
377 377
378 378 
                     // show lat lng
379 
-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
380 
-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];
379 
+                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {
380 
+                        $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng'];
381 381 
                     }
382 382 
                 }
383 383 
 

@@ -403,16 +403,16 @@  discard block
 
 block discarded – undo
403 403
404 404 
                         // check if we need to change the format or not
405 405 
                         $date_format_len = strlen(str_replace(' ', '', $date_format));
406 
-                        if($date_format_len>5){// if greater then 5 then it's the old style format.
406 
+                        if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
407 407
408 
-                            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
409 
-                            $replace = array('d','j','l','m','n','F','Y');//PHP date format
408 
+                            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
409 
+                            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
410 410
411 411 
                             $date_format = str_replace($search, $replace, $date_format);
412 412
413 413 
                             $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
414 414
415 
-                        }else{
415 
+                        } else {
416 416 
                             $post_htmlvar_value = $request_info[$name];
417 417 
                         }
418 418 
 

@@ -426,7 +426,7 @@  discard block
 
 block discarded – undo
426 426 
                 if (isset($request_info[$name])) {
427 427 
                     $gd_post_info[$name] = $request_info[$name];
428 428 
                 } else {
429 
-                    if (isset($request_info['gd_field_' . $name])) {
429 
+                    if (isset($request_info['gd_field_'.$name])) {
430 430 
                         $gd_post_info[$name] = ''; /* fix de-select for multiselect */
431 431 
                     }
432 432 
                 }

@@ -486,7 +486,7 @@  discard block
 
 block discarded – undo
486 486 
         }
487 487
488 488 
         if (is_array($post_tags)) {
489 
-            $taxonomy = $request_info['listing_type'] . '_tags';
489 
+            $taxonomy = $request_info['listing_type'].'_tags';
490 490 
             wp_set_object_terms($last_post_id, $post_tags, $taxonomy);
491 491 
         }
492 492 
 

@@ -498,7 +498,7 @@  discard block
 
 block discarded – undo
498 498 
                 $tmpimgArr = trim($request_info['post_images'], ",");
499 499 
                 $tmpimgArr = explode(",", $tmpimgArr);
500 500 
                 geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);
501 
-            } else{
501 
+            } else {
502 502 
                 geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);
503 503 
             }
504 504 
 

@@ -579,7 +579,7 @@  discard block
 
 block discarded – undo
579 579 
     if (!in_array($post_type, $all_postypes))
580 580 
         return false;
581 581
582 
-    $table = $plugin_prefix . $post_type . '_detail';
582 
+    $table = $plugin_prefix.$post_type.'_detail';
583 583
584 584 
     /**
585 585 
      * Apply Filter to change Post info

@@ -589,7 +589,7 @@  discard block
 
 block discarded – undo
589 589 
      * @since 1.0.0
590 590 
      * @package GeoDirectory
591 591 
      */
592 
-    $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
592 
+    $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd
593 593 
 			  WHERE p.ID = pd.post_id
594 594 
 			  AND pd.post_id = %d", $post_id));
595 595 
 

@@ -652,7 +652,7 @@  discard block
 
 block discarded – undo
652 652
653 653 
         $post_type = get_post_type($post_id);
654 654
655 
-        $table = $plugin_prefix . $post_type . '_detail';
655 
+        $table = $plugin_prefix.$post_type.'_detail';
656 656
657 657 
         /**
658 658 
          * Filter to change Post info

@@ -673,7 +673,7 @@  discard block
 
 block discarded – undo
673 673
674 674 
             $columns = $wpdb->get_col("show columns from $table");
675 675 
             foreach ($postmeta as $mkey => $mval) {
676 
-                if(in_array($mkey,$columns)) {
676 
+                if (in_array($mkey, $columns)) {
677 677 
                     if (is_array($mval)) {
678 678 
                         $mval = implode(",", $mval);
679 679 
                     }

@@ -702,12 +702,12 @@  discard block
 
 block discarded – undo
702 702 
              */
703 703 
             do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
704 704
705 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
705 
+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
706 706
707 707 
                 $query_string_array[] = $post_id;
708 708 
                 $wpdb->query(
709 709 
                     $wpdb->prepare(
710 
-                        "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d",
710 
+                        "UPDATE ".$table." SET ".$query_string_escaped." where post_id =%d",
711 711 
                         $query_string_array
712 712 
                     )
713 713 
                 );

@@ -718,7 +718,7 @@  discard block
 
 block discarded – undo
718 718 
                 array_unshift($query_string_array, $post_id);
719 719 
                 $wpdb->query(
720 720 
                     $wpdb->prepare(
721 
-                        "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped,
721 
+                        "INSERT INTO ".$table." SET post_id = %d,".$query_string_escaped,
722 722 
                         $query_string_array
723 723 
                     )
724 724 
                 );

@@ -764,7 +764,7 @@  discard block
 
 block discarded – undo
764 764
765 765 
         $post_type = get_post_type($post_id);
766 766
767 
-        $table = $plugin_prefix . $post_type . '_detail';
767 
+        $table = $plugin_prefix.$post_type.'_detail';
768 768
769 769 
         if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
770 770 
 

@@ -772,11 +772,11 @@  discard block
 
 block discarded – undo
772 772 
                 $meta_value = implode(",", $meta_value);
773 773 
             }
774 774
775 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
775 
+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
776 776
777 777 
                 $wpdb->query(
778 778 
                     $wpdb->prepare(
779 
-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",
779 
+                        "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d",
780 780 
                         array($post_id)
781 781 
                     )
782 782 
                 );

@@ -785,7 +785,7 @@  discard block
 
 block discarded – undo
785 785
786 786 
                 $wpdb->query(
787 787 
                     $wpdb->prepare(
788 
-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",
788 
+                        "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'",
789 789 
                         array($post_id)
790 790 
                     )
791 791 
                 );

@@ -818,14 +818,14 @@  discard block
 
 block discarded – undo
818 818
819 819 
         $post_type = get_post_type($post_id);
820 820
821 
-        $table = $plugin_prefix . $post_type . '_detail';
821 
+        $table = $plugin_prefix.$post_type.'_detail';
822 822
823 823 
         if (is_array($postmeta) && !empty($postmeta) && $post_id) {
824 824 
             $post_meta_set_query = '';
825 825
826 826 
             foreach ($postmeta as $mkey) {
827 827 
                 if ($mval != '')
828 
-                    $post_meta_set_query .= $mkey . " = '', ";
828 
+                    $post_meta_set_query .= $mkey." = '', ";
829 829 
             }
830 830
831 831 
             $post_meta_set_query = trim($post_meta_set_query, ", ");

@@ -834,11 +834,11 @@  discard block
 
 block discarded – undo
834 834 
                 return false;
835 835 
             }
836 836
837 
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
837 
+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
838 838
839 839 
                 $wpdb->query(
840 840 
                     $wpdb->prepare(
841 
-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",
841 
+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d",
842 842 
                         array($post_id)
843 843 
                     )
844 844 
                 );

@@ -847,11 +847,11 @@  discard block
 
 block discarded – undo
847 847 
             }
848 848
849 849 
         } elseif ($postmeta != '' && $post_id) {
850 
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
850 
+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
851 851
852 852 
                 $wpdb->query(
853 853 
                     $wpdb->prepare(
854 
-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",
854 
+                        "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d",
855 855 
                         array($post_id)
856 856 
                     )
857 857 
                 );

@@ -893,10 +893,10 @@  discard block
 
 block discarded – undo
893 893 
         if (!in_array($post_type, $all_postypes))
894 894 
             return false;
895 895
896 
-        $table = $plugin_prefix . $post_type . '_detail';
896 
+        $table = $plugin_prefix.$post_type.'_detail';
897 897
898 
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
899 
-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
898 
+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {
899 
+            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));
900 900 
             if ($meta_value && $meta_value !== '') {
901 901 
                 return maybe_serialize($meta_value);
902 902 
             } else

@@ -929,13 +929,13 @@  discard block
 
 block discarded – undo
929 929
930 930 
         $post_type = get_post_type($post_id);
931 931
932 
-        $table = $plugin_prefix . $post_type . '_detail';
932 
+        $table = $plugin_prefix.$post_type.'_detail';
933 933
934 934 
         $post_images = geodir_get_images($post_id);
935 935
936 936 
         $wpdb->query(
937 937 
             $wpdb->prepare(
938 
-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",
938 
+                "UPDATE ".$table." SET featured_image = '' where post_id =%d",
939 939 
                 array($post_id)
940 940 
             )
941 941 
         );

@@ -965,12 +965,12 @@  discard block
 
 block discarded – undo
965 965 
                 $file_path = '';
966 966 
                 /* --------- start ------- */
967 967
968 
-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
968 
+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));
969 969
970 970 
                 $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
971 971
972 972
973 
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
973 
+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
974 974
975 975 
                     /* --------- end ------- */
976 976 
                     $curr_img_url = $post_image[$m];

@@ -1014,7 +1014,7 @@  discard block
 
 block discarded – undo
1014 1014 
                     // If the uploaded file is the right format
1015 1015 
                     if (in_array($uploaded_file_type, $allowed_file_types)) {
1016 1016 
                         if (!function_exists('wp_handle_upload')) {
1017 
-                            require_once(ABSPATH . 'wp-admin/includes/file.php');
1017 
+                            require_once(ABSPATH.'wp-admin/includes/file.php');
1018 1018 
                         }
1019 1019
1020 1020 
                         if (!is_dir($geodir_uploadpath)) {

@@ -1022,41 +1022,41 @@  discard block
 
 block discarded – undo
1022 1022 
                         }
1023 1023
1024 1024 
                         $external_img = false;
1025 
-                        if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
1025 
+                        if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {
1026 1026 
                         } else {
1027 1027 
                             $external_img = true;
1028 1028 
                         }
1029 1029
1030 1030 
                         if ($dummy || $external_img) {
1031 1031 
                             $uploaded_file = array();
1032 
-                            $uploaded = (array)fetch_remote_file($curr_img_url);
1032 
+                            $uploaded = (array) fetch_remote_file($curr_img_url);
1033 1033
1034 1034 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {
1035 1035 
                                 $new_name = basename($uploaded['file']);
1036 1036 
                                 $uploaded_file = $uploaded;
1037 
-                            }else{
1038 
-                                print_r($uploaded);exit;
1037 
+                            } else {
1038 
+                                print_r($uploaded); exit;
1039 1039 
                             }
1040 1040 
                             $external_img = false;
1041 1041 
                         } else {
1042 
-                            $new_name = $post_id . '_' . $file_name;
1042 
+                            $new_name = $post_id.'_'.$file_name;
1043 1043
1044 1044 
                             if ($curr_img_dir == $sub_dir) {
1045 
-                                $img_path = $geodir_uploadpath . '/' . $filename;
1046 
-                                $img_url = $geodir_uploadurl . '/' . $filename;
1045 
+                                $img_path = $geodir_uploadpath.'/'.$filename;
1046 
+                                $img_url = $geodir_uploadurl.'/'.$filename;
1047 1047 
                             } else {
1048 
-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1049 
-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1048 
+                                $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;
1049 
+                                $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;
1050 1050 
                             }
1051 1051
1052 1052 
                             $uploaded_file = '';
1053 1053
1054 1054 
                             if (file_exists($img_path)) {
1055 
-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1055 
+                                $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);
1056 1056 
                                 $file_path = '';
1057 
-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
1057 
+                            } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {
1058 1058 
                                 $uploaded_file = true;
1059 
-                                $file_path = $curr_img_dir . '/' . $filename;
1059 
+                                $file_path = $curr_img_dir.'/'.$filename;
1060 1060 
                             }
1061 1061
1062 1062 
                             if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

@@ -1065,14 +1065,14 @@  discard block
 
 block discarded – undo
1065 1065
1066 1066 
                         if (!empty($uploaded_file)) {
1067 1067 
                             if (!isset($file_path) || !$file_path) {
1068 
-                                $file_path = $sub_dir . '/' . $new_name;
1068 
+                                $file_path = $sub_dir.'/'.$new_name;
1069 1069 
                             }
1070 1070
1071 
-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
1071 
+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);
1072 1072
1073 1073 
                             if ($menu_order == 1) {
1074 1074
1075 
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1075 
+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1076 1076
1077 1077 
                             }
1078 1078 
 

@@ -1090,12 +1090,12 @@  discard block
 
 block discarded – undo
1090 1090
1091 1091 
                             foreach ($attachment as $key => $val) {
1092 1092 
                                 if ($val != '')
1093 
-                                    $attachment_set .= $key . " = '" . $val . "', ";
1093 
+                                    $attachment_set .= $key." = '".$val."', ";
1094 1094 
                             }
1095 1095
1096 1096 
                             $attachment_set = trim($attachment_set, ", ");
1097 1097
1098 
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
1098 
+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
1099 1099
1100 1100 
                             $valid_file_ids[] = $wpdb->insert_id;
1101 1101 
                         }

@@ -1106,17 +1106,17 @@  discard block
 
 block discarded – undo
1106 1106 
                 } else {
1107 1107 
                     $valid_file_ids[] = $find_image;
1108 1108
1109 
-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
1109 
+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);
1110 1110
1111 1111 
                     $wpdb->query(
1112 1112 
                         $wpdb->prepare(
1113 
-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
1113 
+                            "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d",
1114 1114 
                             array($menu_order, $split_img_path[1], $post_id)
1115 1115 
                         )
1116 1116 
                     );
1117 1117
1118 1118 
                     if ($menu_order == 1)
1119 
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1119 
+                        $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1120 1120
1121 1121 
                 }
1122 1122 
 

@@ -1140,9 +1140,9 @@  discard block
 
 block discarded – undo
1140 1140
1141 1141 
                 foreach ($post_images as $img) {
1142 1142
1143 
-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
1143 
+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {
1144 1144
1145 
-                        $invalid_files[] = (object)array('src' => $img->src);
1145 
+                        $invalid_files[] = (object) array('src' => $img->src);
1146 1146
1147 1147 
                     }
1148 1148 
 

@@ -1150,12 +1150,12 @@  discard block
 
 block discarded – undo
1150 1150
1151 1151 
             }
1152 1152
1153 
-            $invalid_files = (object)$invalid_files;
1153 
+            $invalid_files = (object) $invalid_files;
1154 1154 
         }
1155 1155
1156 1156 
         $remove_files[] = $post_id;
1157 1157
1158 
-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1158 
+        $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));
1159 1159
1160 1160 
         if (!empty($invalid_files))
1161 1161 
             geodir_remove_attachments($invalid_files);

@@ -1195,7 +1195,7 @@  discard block
 
 block discarded – undo
1195 1195 
 			rmdir($dirPath);
1196 1196 
 	}	*/
1197 1197
1198 
-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;
1198 
+    $dirname = $uploads_dir.'/temp_'.$current_user->ID;
1199 1199 
     geodir_delete_directory($dirname);
1200 1200 
 }
1201 1201 
 

@@ -1217,10 +1217,10 @@  discard block
 
 block discarded – undo
1217 1217 
         return false;
1218 1218 
     while ($file = readdir($dir_handle)) {
1219 1219 
         if ($file != "." && $file != "..") {
1220 
-            if (!is_dir($dirname . "/" . $file))
1221 
-                unlink($dirname . "/" . $file);
1220 
+            if (!is_dir($dirname."/".$file))
1221 
+                unlink($dirname."/".$file);
1222 1222 
             else
1223 
-                geodir_delete_directory($dirname . '/' . $file);
1223 
+                geodir_delete_directory($dirname.'/'.$file);
1224 1224 
         }
1225 1225 
     }
1226 1226 
     closedir($dir_handle);

@@ -1249,8 +1249,8 @@  discard block
 
 block discarded – undo
1249 1249 
             foreach ($postcurr_images as $postimg) {
1250 1250 
                 $image_name_arr = explode('/', $postimg->src);
1251 1251 
                 $filename = end($image_name_arr);
1252 
-                if (file_exists($uploads_dir . '/' . $filename))
1253 
-                    unlink($uploads_dir . '/' . $filename);
1252 
+                if (file_exists($uploads_dir.'/'.$filename))
1253 
+                    unlink($uploads_dir.'/'.$filename);
1254 1254 
             }
1255 1255
1256 1256 
         } // endif

@@ -1291,7 +1291,7 @@  discard block
 
 block discarded – undo
1291 1291 
         }
1292 1292
1293 1293 
         if (!in_array($post_type, geodir_get_posttypes())) {
1294 
-            return false;// if not a GD CPT return;
1294 
+            return false; // if not a GD CPT return;
1295 1295 
         }
1296 1296
1297 1297 
 

@@ -1299,22 +1299,22 @@  discard block
 
 block discarded – undo
1299 1299 
          * Filter to force the list images to be smaller.
1300 1300 
          * @since 1.6.18
1301 1301 
          */
1302 
-        if( $size=='list-thumb' && apply_filters('geodir_use_small_list_img',false) ){
1303 
-            $fimg = get_the_post_thumbnail_url($post_id,'medium');
1304 
-            if($fimg){
1302 
+        if ($size == 'list-thumb' && apply_filters('geodir_use_small_list_img', false)) {
1303 
+            $fimg = get_the_post_thumbnail_url($post_id, 'medium');
1304 
+            if ($fimg) {
1305 1305 
                 $uploads = wp_upload_dir();
1306 1306 
                 $uploads_baseurl = $uploads['baseurl'];
1307 
-                $file = str_replace($uploads_baseurl,'',$fimg);
1307 
+                $file = str_replace($uploads_baseurl, '', $fimg);
1308 1308 
             }
1309 1309 
         }
1310 1310
1311 
-        $table = $plugin_prefix . $post_type . '_detail';
1311 
+        $table = $plugin_prefix.$post_type.'_detail';
1312 1312
1313 1313 
         if (!$file) {
1314 1314 
             if (isset($post->featured_image)) {
1315 1315 
                 $file = $post->featured_image;
1316 1316 
             } else {
1317 
-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
1317 
+                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));
1318 1318 
             }
1319 1319 
         }
1320 1320 
 

@@ -1333,7 +1333,7 @@  discard block
 
 block discarded – undo
1333 1333
1334 1334 
             $file_name = $file_info['basename'];
1335 1335
1336 
-            $uploads_url = $uploads_baseurl . $sub_dir;
1336 
+            $uploads_url = $uploads_baseurl.$sub_dir;
1337 1337 
             /*
1338 1338 
              * Allows the filter of image src for such things as CDN change.
1339 1339 
              *

@@ -1343,8 +1343,8 @@  discard block
 
 block discarded – undo
1343 1343 
              * @param string $uploads_url The server upload directory url.
1344 1344 
              * @param string $uploads_baseurl The uploads dir base url.
1345 1345 
              */
1346 
-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1347 
-            $img_arr['path'] = $uploads_path . '/' . $file_name;
1346 
+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
1347 
+            $img_arr['path'] = $uploads_path.'/'.$file_name;
1348 1348 
             $width = 0;
1349 1349 
             $height = 0;
1350 1350 
             if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1387,7 +1387,7 @@  discard block
 
 block discarded – undo
1387 1387 
                 $file_name = $file_info['basename'];
1388 1388
1389 1389 
                 $img_arr['src'] = $default_img;
1390 
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
1390 
+                $img_arr['path'] = $uploads_path.'/'.$file_name;
1391 1391
1392 1392 
                 $width = 0;
1393 1393 
                 $height = 0;

@@ -1404,7 +1404,7 @@  discard block
 
 block discarded – undo
1404 1404 
         }
1405 1405
1406 1406 
         if (!empty($img_arr))
1407 
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
1407 
+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );
1408 1408 
         else
1409 1409 
             return false;
1410 1410 
     }

@@ -1467,7 +1467,7 @@  discard block
 
 block discarded – undo
1467 1467
1468 1468 
         $arrImages = $wpdb->get_results(
1469 1469 
             $wpdb->prepare(
1470 
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",
1470 
+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ",
1471 1471 
                 array('%image%', $post_id)
1472 1472 
             )
1473 1473 
         );

@@ -1493,7 +1493,7 @@  discard block
 
 block discarded – undo
1493 1493
1494 1494 
                 $file_name = $file_info['basename'];
1495 1495
1496 
-                $uploads_url = $uploads_baseurl . $sub_dir;
1496 
+                $uploads_url = $uploads_baseurl.$sub_dir;
1497 1497 
                 /*
1498 1498 
                 * Allows the filter of image src for such things as CDN change.
1499 1499 
                 *

@@ -1503,8 +1503,8 @@  discard block
 
 block discarded – undo
1503 1503 
                 * @param string $uploads_url The server upload directory url.
1504 1504 
                 * @param string $uploads_baseurl The uploads dir base url.
1505 1505 
                 */
1506 
-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1507 
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
1506 
+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
1507 
+                $img_arr['path'] = $uploads_path.'/'.$file_name;
1508 1508 
                 $width = 0;
1509 1509 
                 $height = 0;
1510 1510 
                 if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1521,11 +1521,11 @@  discard block
 
 block discarded – undo
1521 1521 
                 $img_arr['content'] = $attechment->content; // add the description to the array
1522 1522 
                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
1523 1523
1524 
-                $return_arr[] = (object)$img_arr;
1524 
+                $return_arr[] = (object) $img_arr;
1525 1525
1526 1526 
                 $counter++;
1527 1527 
             }
1528 
-            return (object)$return_arr;
1528 
+            return (object) $return_arr;
1529 1529 
         } else if ($no_images) {
1530 1530 
             $default_img = '';
1531 1531 
             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

@@ -1564,7 +1564,7 @@  discard block
 
 block discarded – undo
1564 1564 
                 $img_arr['title'] = $file_info['filename']; // add the title to the array
1565 1565 
                 $img_arr['content'] = $file_info['filename']; // add the description to the array
1566 1566
1567 
-                $return_arr[] = (object)$img_arr;
1567 
+                $return_arr[] = (object) $img_arr;
1568 1568
1569 1569 
                 return $return_arr;
1570 1570 
             } else

@@ -1591,8 +1591,8 @@  discard block
 
 block discarded – undo
1591 1591
1592 1592 
         $html = '';
1593 1593 
         if (!empty($request)) {
1594 
-            if (!is_object($request)){
1595 
-                $request = (object)$request;
1594 
+            if (!is_object($request)) {
1595 
+                $request = (object) $request;
1596 1596 
             }
1597 1597
1598 1598 
             if (isset($request->src) && !isset($request->path)) {

@@ -1606,7 +1606,7 @@  discard block
 
 block discarded – undo
1606 1606 
             $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
1607 1607 
             $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
1608 1608 
             if (strpos($img_no_http, $upload_no_http) !== false) {
1609 
-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
1609 
+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);
1610 1610 
             }
1611 1611
1612 1612 
             $width = 0;

@@ -1621,7 +1621,7 @@  discard block
 
 block discarded – undo
1621 1621 
             $image->width = $width;
1622 1622 
             $image->height = $height;
1623 1623
1624 
-            $max_size = (object)geodir_get_imagesize($size);
1624 
+            $max_size = (object) geodir_get_imagesize($size);
1625 1625
1626 1626 
             if (!is_wp_error($max_size)) {
1627 1627 
                 if ($image->width) {

@@ -1633,15 +1633,15 @@  discard block
 
 block discarded – undo
1633 1633 
                         $width_per = 100;
1634 1634 
                 }
1635 1635
1636 
-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
1637 
-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
1636 
+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {
1637 
+                    $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'"  /></div>';
1638 1638 
                 } else {
1639 
-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
1640 
-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1641 
-                    }else{
1639 
+                    if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {
1640 
+                        $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');"></div>';
1641 
+                    } else {
1642 1642 
                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1643 1643 
                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';
1644 
-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
1644 
+                        $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
1645 1645
1646 1646 
                     }
1647 1647 
 

@@ -1677,15 +1677,15 @@  discard block
 
 block discarded – undo
1677 1677
1678 1678 
         $post_type = get_post_type($post_id);
1679 1679
1680 
-        $table = $plugin_prefix . $post_type . '_detail';
1680 
+        $table = $plugin_prefix.$post_type.'_detail';
1681 1681
1682 1682 
         if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
1683 1683
1684 
-            if ($taxonomy == $post_type . '_tags') {
1684 
+            if ($taxonomy == $post_type.'_tags') {
1685 1685 
                 if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
1686 1686 
                     geodir_save_post_meta($post_id, 'post_tags', $terms);
1687 1687 
                 }
1688 
-            } elseif ($taxonomy == $post_type . 'category') {
1688 
+            } elseif ($taxonomy == $post_type.'category') {
1689 1689 
                 $srcharr = array('"', '\\');
1690 1690 
                 $replarr = array("&quot;", '');
1691 1691 
 

@@ -1707,7 +1707,7 @@  discard block
 
 block discarded – undo
1707 1707
1708 1708 
                     $wpdb->get_var(
1709 1709 
                         $wpdb->prepare(
1710 
-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
1710 
+                            "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ",
1711 1711 
                             $cat_ids_array_del
1712 1712 
                         )
1713 1713 
                     );

@@ -1715,7 +1715,7 @@  discard block
 
 block discarded – undo
1715 1715
1716 1716 
                     $post_term = $wpdb->get_col(
1717 1717 
                         $wpdb->prepare(
1718 
-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
1718 
+                            "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id",
1719 1719 
                             $cat_ids_array
1720 1720 
                         )
1721 1721 
                     );

@@ -1737,16 +1737,16 @@  discard block
 
 block discarded – undo
1737 1737 
                         $lat = geodir_get_post_meta($post_id, 'post_latitude', true);
1738 1738 
                         $lng = geodir_get_post_meta($post_id, 'post_longitude', true);
1739 1739
1740 
-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
1741 
-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
1740 
+                        $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
1741 
+                        $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true);
1742 1742
1743 1743 
                         $json = '{';
1744 
-                        $json .= '"id":"' . $post_id . '",';
1745 
-                        $json .= '"lat_pos": "' . $lat . '",';
1746 
-                        $json .= '"long_pos": "' . $lng . '",';
1747 
-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
1748 
-                        $json .= '"icon":"' . $term_icon . '",';
1749 
-                        $json .= '"group":"catgroup' . $cat_id . '"';
1744 
+                        $json .= '"id":"'.$post_id.'",';
1745 
+                        $json .= '"lat_pos": "'.$lat.'",';
1746 
+                        $json .= '"long_pos": "'.$lng.'",';
1747 
+                        $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",';
1748 
+                        $json .= '"icon":"'.$term_icon.'",';
1749 
+                        $json .= '"group":"catgroup'.$cat_id.'"';
1750 1750 
                         $json .= '}';
1751 1751
1752 1752 
 

@@ -1754,9 +1754,9 @@  discard block
 
 block discarded – undo
1754 1754 
                             $post_marker_json = $json;
1755 1755
1756 1756
1757 
-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
1757 
+                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
1758 1758
1759 
-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
1759 
+                            $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET
1760 1760 
 										post_title = %s,
1761 1761 
 										json = %s
1762 1762 
 										WHERE post_id = %d AND cat_id = %d ",

@@ -1764,7 +1764,7 @@  discard block
 
 block discarded – undo
1764 1764
1765 1765 
                         } else {
1766 1766
1767 
-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
1767 
+                            $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET
1768 1768 
 										post_id = %d,
1769 1769 
 										post_title = %s,
1770 1770 
 										cat_id = %d,

@@ -1782,17 +1782,17 @@  discard block
 
 block discarded – undo
1782 1782 
                 if (!empty($post_term) && is_array($post_term)) {
1783 1783 
                     $categories = implode(',', $post_term);
1784 1784
1785 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
1785 
+                    if ($categories != '' && $categories != 0) $categories = ','.$categories.',';
1786 1786
1787 1787 
                     if (empty($post_marker_json))
1788 1788 
                         $post_marker_json = isset($json) ? $json : '';
1789 1789
1790 
-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
1790 
+                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
1791 1791
1792 1792 
                         $wpdb->query(
1793 1793 
                             $wpdb->prepare(
1794 
-                                "UPDATE " . $table . " SET
1795 
-								" . $taxonomy . " = %s,
1794 
+                                "UPDATE ".$table." SET
1795 
+								" . $taxonomy." = %s,
1796 1796 
 								marker_json = %s
1797 1797 
 								where post_id = %d",
1798 1798 
                                 array($categories, $post_marker_json, $post_id)

@@ -1813,7 +1813,7 @@  discard block
 
 block discarded – undo
1813 1813
1814 1814 
                                     $wpdb->query(
1815 1815 
                                         $wpdb->prepare(
1816 
-                                            "UPDATE " . $table . " SET
1816 
+                                            "UPDATE ".$table." SET
1817 1817 
 											default_category = %s
1818 1818 
 											where post_id = %d",
1819 1819 
                                             array($categories[0], $post_id)

@@ -1838,9 +1838,9 @@  discard block
 
 block discarded – undo
1838 1838
1839 1839 
                         $wpdb->query(
1840 1840 
                             $wpdb->prepare(
1841 
-                                "INSERT INTO " . $table . " SET
1841 
+                                "INSERT INTO ".$table." SET
1842 1842 
 								post_id = %d,
1843 
-								" . $taxonomy . " = %s,
1843 
+								" . $taxonomy." = %s,
1844 1844 
 								marker_json = %s ",
1845 1845
1846 1846 
                                 array($post_id, $categories, $post_marker_json)

@@ -1972,7 +1972,7 @@  discard block
 
 block discarded – undo
1972 1972 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"
1973 1973 
                                                src="<?php echo $post_images[0]; ?>"/></a></div>
1974 1974 
                             <?php
1975 
-                            }else{
1975 
+                            } else {
1976 1976 
                                 echo '<div class="geodir-bubble_image"></div>';
1977 1977 
                             }
1978 1978 
                         } else {

@@ -1980,7 +1980,7 @@  discard block
 
 block discarded – undo
1980 1980 
                                 ?>
1981 1981 
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
1982 1982 
                             <?php
1983 
-                            }else{
1983 
+                            } else {
1984 1984 
                                 echo '<div class="geodir-bubble_image"></div>';
1985 1985 
                             }
1986 1986 
                         }

@@ -2010,7 +2010,7 @@  discard block
 
 block discarded – undo
2010 2010 
                              * @param object $postinfo_obj The posts info as an object.
2011 2011 
                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
2012 2012 
                              */
2013 
-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
2013 
+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);
2014 2014 
                             ?>
2015 2015 
                         </div>
2016 2016 
                         <?php

@@ -2020,9 +2020,9 @@  discard block
 
 block discarded – undo
2020 2020 
                             <div class="geodir-bubble-meta-fade"></div>
2021 2021 
                             <div class="geodir-bubble-meta-bottom">
2022 2022 
                                 <?php if ($rating_star != '') { ?>
2023 
-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>
2023 
+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>
2024 2024 
                                 <?php } ?>
2025 
-                                <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>
2025 
+                                <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>
2026 2026 
                                 <span class="geodir-bubble-reviews">
2027 2027 
                                     <a href="<?php echo get_comments_link($ID); ?>" class="geodir-pcomments"><i class="fa fa-comments"></i> <?php echo get_comments_number($ID); ?></a>
2028 2028 
                                 </span>

@@ -2084,11 +2084,11 @@  discard block
 
 block discarded – undo
2084 2084
2085 2085 
         $post_type = get_post_type($post_id);
2086 2086
2087 
-        $table = $plugin_prefix . $post_type . '_detail';
2087 
+        $table = $plugin_prefix.$post_type.'_detail';
2088 2088
2089 2089 
         $wpdb->query(
2090 2090 
             $wpdb->prepare(
2091 
-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
2091 
+                "UPDATE ".$table." SET post_status=%s WHERE post_id=%d",
2092 2092 
                 array($status, $post_id)
2093 2093 
             )
2094 2094 
         );

@@ -2160,18 +2160,18 @@  discard block
 
 block discarded – undo
2160 2160
2161 2161 
         $post_type = get_post_type($post_id);
2162 2162
2163 
-        $table = $plugin_prefix . $post_type . '_detail';
2163 
+        $table = $plugin_prefix.$post_type.'_detail';
2164 2164
2165 2165 
         $wpdb->query(
2166 2166 
             $wpdb->prepare(
2167 
-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
2167 
+                "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d",
2168 2168 
                 array($updatingpost, $temppost)
2169 2169 
             )
2170 2170 
         );
2171 2171
2172 2172 
         $wpdb->query(
2173 2173 
             $wpdb->prepare(
2174 
-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2174 
+                "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d",
2175 2175 
                 array($updatingpost, $temppost)
2176 2176 
             )
2177 2177 
         );

@@ -2180,7 +2180,7 @@  discard block
 
 block discarded – undo
2180 2180
2181 2181 
         $wpdb->query(
2182 2182 
             $wpdb->prepare(
2183 
-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2183 
+                "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d",
2184 2184 
                 array($updatingpost, $temppost)
2185 2185 
             )
2186 2186 
         );

@@ -2218,12 +2218,12 @@  discard block
 
 block discarded – undo
2218 2218 
         if (!in_array($post_type, $all_postypes))
2219 2219 
             return false;
2220 2220
2221 
-        $table = $plugin_prefix . $post_type . '_detail';
2221 
+        $table = $plugin_prefix.$post_type.'_detail';
2222 2222
2223 2223 
         /* Delete custom post meta*/
2224 2224 
         $wpdb->query(
2225 2225 
             $wpdb->prepare(
2226 
-                "DELETE FROM " . $table . " WHERE `post_id` = %d",
2226 
+                "DELETE FROM ".$table." WHERE `post_id` = %d",
2227 2227 
                 array($deleted_postid)
2228 2228 
             )
2229 2229 
         );

@@ -2232,7 +2232,7 @@  discard block
 
 block discarded – undo
2232 2232
2233 2233 
         $wpdb->query(
2234 2234 
             $wpdb->prepare(
2235 
-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
2235 
+                "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d",
2236 2236 
                 array($deleted_postid)
2237 2237 
             )
2238 2238 
         );

@@ -2242,7 +2242,7 @@  discard block
 
 block discarded – undo
2242 2242
2243 2243 
         $wpdb->query(
2244 2244 
             $wpdb->prepare(
2245 
-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
2245 
+                "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d",
2246 2246 
                 array($deleted_postid)
2247 2247 
             )
2248 2248 
         );

@@ -2314,7 +2314,7 @@  discard block
 
 block discarded – undo
2314 2314 
          */
2315 2315 
         do_action('geodir_before_add_from_favorite', $post_id);
2316 2316
2317 
-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';
2317 
+        echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>';
2318 2318
2319 2319 
         /**
2320 2320 
          * Called after adding the post from favourites.

@@ -2393,7 +2393,7 @@  discard block
 
 block discarded – undo
2393 2393 
          */
2394 2394 
         do_action('geodir_before_remove_from_favorite', $post_id);
2395 2395
2396 
-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';
2396 
+        echo '<a href="javascript:void(0);"  title="'.$add_favourite_text.'" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>';
2397 2397
2398 2398 
         /**
2399 2399 
          * Called after removing the post from favourites.

@@ -2488,24 +2488,24 @@  discard block
 
 block discarded – undo
2488 2488 
             $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2489 2489
2490 2490 
         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
2491 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
2491 
+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a
2492 2492 
                 class="geodir-removetofav-icon" href="javascript:void(0);"
2493 
-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"
2494 
-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>
2493 
+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"
2494 
+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>
2495 2495 
             </a>   </span><?php
2496 2496
2497 2497 
         } else {
2498 2498
2499 2499 
             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
2500 
-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
2500 
+                $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\'';
2501 2501 
             } else
2502 
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2502 
+                $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';
2503 2503
2504 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
2504 
+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"
2505 2505 
                                                                                         href="javascript:void(0);"
2506 
-                                                                                        onclick="<?php echo $script_text;?>"
2507 
-                                                                                        title="<?php echo $add_favourite_text;?>"><i
2508 
-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>
2506 
+                                                                                        onclick="<?php echo $script_text; ?>"
2507 
+                                                                                        title="<?php echo $add_favourite_text; ?>"><i
2508 
+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>
2509 2509 
         <?php }
2510 2510 
     }
2511 2511 
 }

@@ -2535,7 +2535,7 @@  discard block
 
 block discarded – undo
2535 2535
2536 2536 
             $post_type = $taxonomy_obj->object_type[0];
2537 2537
2538 
-            $table = $plugin_prefix . $post_type . '_detail';
2538 
+            $table = $plugin_prefix.$post_type.'_detail';
2539 2539
2540 2540 
             /**
2541 2541 
              * Filter to modify the 'join' query

@@ -2558,8 +2558,8 @@  discard block
 
 block discarded – undo
2558 2558 
             $where = apply_filters('geodir_cat_post_count_where', $where, $term);
2559 2559
2560 2560 
             $count_query = "SELECT count(post_id) FROM
2561 
-							" . $table . " as pd " . $join . "
2562 
-							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
2561 
+							" . $table." as pd ".$join."
2562 
+							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;
2563 2563
2564 2564 
             $cat_post_count = $wpdb->get_var($count_query);
2565 2565 
             if (empty($cat_post_count) || is_wp_error($cat_post_count))

@@ -2642,7 +2642,7 @@  discard block
 
 block discarded – undo
2642 2642 
     global $post;
2643 2643 
     $all_postypes = geodir_get_posttypes();
2644 2644 
     if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
2645 
-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';
2645 
+        return ' <a href="'.get_permalink($post->ID).'">'.READ_MORE_TXT.'</a>';
2646 2646 
     }
2647 2647
2648 2648 
     return $more;

@@ -2669,14 +2669,14 @@  discard block
 
 block discarded – undo
2669 2669 
     if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
2670 2670
2671 2671 
         $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
2672 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
2672 
+        $table = $plugin_prefix.$geodir_post_type.'_detail';
2673 2673
2674 2674 
         $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
2675 
-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
2675 
+        $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png';
2676 2676
2677 2677 
         $posts = $wpdb->get_results(
2678 2678 
             $wpdb->prepare(
2679 
-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
2679 
+                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ",
2680 2680 
                 array($term_id, $taxonomy)
2681 2681 
             )
2682 2682 
         );

@@ -2688,19 +2688,19 @@  discard block
 
 block discarded – undo
2688 2688 
                 $lng = $post_obj->post_longitude;
2689 2689
2690 2690 
                 $json = '{';
2691 
-                $json .= '"id":"' . $post_obj->post_id . '",';
2692 
-                $json .= '"lat_pos": "' . $lat . '",';
2693 
-                $json .= '"long_pos": "' . $lng . '",';
2694 
-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
2695 
-                $json .= '"icon":"' . $term_icon . '",';
2696 
-                $json .= '"group":"catgroup' . $term_id . '"';
2691 
+                $json .= '"id":"'.$post_obj->post_id.'",';
2692 
+                $json .= '"lat_pos": "'.$lat.'",';
2693 
+                $json .= '"long_pos": "'.$lng.'",';
2694 
+                $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",';
2695 
+                $json .= '"icon":"'.$term_icon.'",';
2696 
+                $json .= '"group":"catgroup'.$term_id.'"';
2697 2697 
                 $json .= '}';
2698 2698
2699 2699 
                 if ($post_obj->default_category == $term_id) {
2700 2700
2701 2701 
                     $wpdb->query(
2702 2702 
                         $wpdb->prepare(
2703 
-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",
2703 
+                            "UPDATE ".$table." SET marker_json = %s where post_id = %d",
2704 2704 
                             array($json, $post_obj->post_id)
2705 2705 
                         )
2706 2706 
                     );

@@ -2708,7 +2708,7 @@  discard block
 
 block discarded – undo
2708 2708
2709 2709 
                 $wpdb->query(
2710 2710 
                     $wpdb->prepare(
2711 
-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
2711 
+                        "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d",
2712 2712 
                         array($json, $post_obj->post_id, $term_id)
2713 2713 
                     )
2714 2714 
                 );

@@ -2832,7 +2832,7 @@  discard block
 
 block discarded – undo
2832 2832 
 //	print_r($uploads ) ;
2833 2833 
     $post_first_image = $wpdb->get_results(
2834 2834 
         $wpdb->prepare(
2835 
-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
2835 
+            "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1  ", array($post_id)
2836 2836 
         )
2837 2837 
     );
2838 2838 
 

@@ -2853,9 +2853,9 @@  discard block
 
 block discarded – undo
2853 2853
2854 2854 
         $post_type = get_post_type($post_id);
2855 2855
2856 
-        $table_name = $plugin_prefix . $post_type . '_detail';
2856 
+        $table_name = $plugin_prefix.$post_type.'_detail';
2857 2857
2858 
-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
2858 
+        $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);
2859 2859
2860 2860 
         $new_attachment_name = basename($post_first_image[0]->file);
2861 2861 
 

@@ -2868,11 +2868,11 @@  discard block
 
 block discarded – undo
2868 2868 
                 wp_delete_attachment($post_thumbnail_id);
2869 2869
2870 2870 
             }
2871 
-            $filename = $uploads['basedir'] . $post_first_image[0]->file;
2871 
+            $filename = $uploads['basedir'].$post_first_image[0]->file;
2872 2872
2873 2873 
             $attachment = array(
2874 2874 
                 'post_mime_type' => $post_first_image[0]->mime_type,
2875 
-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
2875 
+                'guid' => $uploads['baseurl'].$post_first_image[0]->file,
2876 2876 
                 'post_parent' => $post_id,
2877 2877 
                 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
2878 2878 
                 'post_content' => ''

@@ -2885,7 +2885,7 @@  discard block
 
 block discarded – undo
2885 2885
2886 2886 
                 set_post_thumbnail($post_id, $id);
2887 2887
2888 
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
2888 
+                require_once(ABSPATH.'wp-admin/includes/image.php');
2889 2889 
                 wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
2890 2890
2891 2891 
             }

@@ -2918,35 +2918,35 @@  discard block
 
 block discarded – undo
2918 2918 
         $post_id = absint($_POST['post_id']);
2919 2919 
         $upload_dir = wp_upload_dir();
2920 2920 
         $post_type = get_post_type($_POST['post_id']);
2921 
-        $table = $plugin_prefix . $post_type . '_detail';
2921 
+        $table = $plugin_prefix.$post_type.'_detail';
2922 2922
2923 2923 
         $post_arr = $wpdb->get_results($wpdb->prepare(
2924 
-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2924 
+            "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2925 2925 
             array($post_id)
2926 2926 
         )
2927 2927 
             , ARRAY_A);
2928 2928
2929 2929 
         $arrImages = $wpdb->get_results(
2930 2930 
             $wpdb->prepare(
2931 
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2931 
+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2932 2932 
                 array('%image%', $post_id)
2933 2933 
             )
2934 2934 
         );
2935 2935 
         if ($arrImages) {
2936 2936 
             $image_arr = array();
2937 2937 
             foreach ($arrImages as $img) {
2938 
-                $image_arr[] = $upload_dir['baseurl'] . $img->file;
2938 
+                $image_arr[] = $upload_dir['baseurl'].$img->file;
2939 2939 
             }
2940 2940 
             $comma_separated = implode(",", $image_arr);
2941 2941 
             $post_arr[0]['post_images'] = $comma_separated;
2942 2942 
         }
2943 2943
2944 2944
2945 
-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
2945 
+        $cats = $post_arr[0][$post_arr[0]['post_type'].'category'];
2946 2946 
         $cat_arr = array_filter(explode(",", $cats));
2947 2947 
         $trans_cat = array();
2948 2948 
         foreach ($cat_arr as $cat) {
2949 
-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
2949 
+            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'].'category', false);
2950 2950 
         }
2951 2951
2952 2952 
 

@@ -2988,7 +2988,7 @@  discard block
 
 block discarded – undo
2988 2988
2989 2989 
     $get_data = $wpdb->get_results(
2990 2990 
         $wpdb->prepare(
2991 
-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
2991 
+            "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'",
2992 2992 
             array($listing_type)
2993 2993 
         )
2994 2994 
     );

@@ -3001,12 +3001,12 @@  discard block
 
 block discarded – undo
3001 3001
3002 3002 
                 $extra_fields = unserialize($data->extra_fields);
3003 3003
3004 
-                $prefix = $data->htmlvar_name . '_';
3004 
+                $prefix = $data->htmlvar_name.'_';
3005 3005
3006 
-                $fields_info[$prefix . 'address'] = $data->field_type;
3006 
+                $fields_info[$prefix.'address'] = $data->field_type;
3007 3007
3008 3008 
                 if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3009 
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
3009 
+                    $fields_info[$prefix.'zip'] = $data->field_type;
3010 3010
3011 3011 
             } else {
3012 3012 
 

@@ -3104,13 +3104,13 @@  discard block
 
 block discarded – undo
3104 3104 
  * @since 1.4.9
3105 3105 
  * @package GeoDirectory
3106 3106 
  */
3107 
-function geodir_fb_like_thumbnail(){
3107 
+function geodir_fb_like_thumbnail() {
3108 3108
3109 3109 
     // return if not a single post
3110 
-    if(!is_single()){return;}
3110 
+    if (!is_single()) {return; }
3111 3111
3112 3112 
     global $post;
3113 
-    if(isset($post->featured_image) && $post->featured_image){
3113 
+    if (isset($post->featured_image) && $post->featured_image) {
3114 3114 
         $upload_dir = wp_upload_dir();
3115 3115 
         $thumb = $upload_dir['baseurl'].$post->featured_image;
3116 3116 
         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
Please login to merge, or discard this patch.
Indentation   +2264 added lines, -2264 removed lines patch added patch discarded remove patch 
@@ -20,492 +20,492 @@  discard block
 
 block discarded – undo
20 20 
 function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '')
21 21 
 {
22 22
23 
-    $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);
24 
-    if (!empty($post_cat_ids))
25 
-        $post_cat_array = explode(",", trim($post_cat_ids, ","));
26 
-
27 
-    if (!isset($default_cat) || empty($default_cat)) {
28 
-        $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
29 
-    }else{
30 
-        if(!is_int($default_cat)){
31 
-            $category = get_term_by('name', $default_cat, $taxonomy);
32 
-            if(isset($category->term_id)){
33 
-                $default_cat =  $category->term_id;
34 
-            }
35 
-        }
23 
+	$post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);
24 
+	if (!empty($post_cat_ids))
25 
+		$post_cat_array = explode(",", trim($post_cat_ids, ","));
26 
+
27 
+	if (!isset($default_cat) || empty($default_cat)) {
28 
+		$default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
29 
+	}else{
30 
+		if(!is_int($default_cat)){
31 
+			$category = get_term_by('name', $default_cat, $taxonomy);
32 
+			if(isset($category->term_id)){
33 
+				$default_cat =  $category->term_id;
34 
+			}
35 
+		}
36 36
37 
-    }
37 
+	}
38 38
39 39
40 
-    geodir_save_post_meta($post_id, 'default_category', $default_cat);
40 
+	geodir_save_post_meta($post_id, 'default_category', $default_cat);
41 41
42 
-    if (isset($category_str) && empty($category_str)) {
42 
+	if (isset($category_str) && empty($category_str)) {
43 43
44 
-        $post_cat_str = '';
45 
-        $post_categories = array();
46 
-        if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
47 
-            $post_cat_str = implode(",y:#", $post_cat_array);
48 
-            $post_cat_str .= ",y:";
49 
-            $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
50 
-        }
51 
-        $post_categories[$taxonomy] = $post_cat_str;
52 
-        $category_str = $post_categories;
53 
-    }
44 
+		$post_cat_str = '';
45 
+		$post_categories = array();
46 
+		if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
47 
+			$post_cat_str = implode(",y:#", $post_cat_array);
48 
+			$post_cat_str .= ",y:";
49 
+			$post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
50 
+		}
51 
+		$post_categories[$taxonomy] = $post_cat_str;
52 
+		$category_str = $post_categories;
53 
+	}
54 54
55 
-    $change_cat_str = $category_str[$taxonomy];
55 
+	$change_cat_str = $category_str[$taxonomy];
56 56
57 
-    $default_pos = strpos($change_cat_str, 'd:');
57 
+	$default_pos = strpos($change_cat_str, 'd:');
58 58
59 
-    if ($default_pos === false) {
59 
+	if ($default_pos === false) {
60 60
61 
-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);
61 
+		$change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);
62 62
63 
-    }
63 
+	}
64 64
65 
-    $category_str[$taxonomy] = $change_cat_str;
65 
+	$category_str[$taxonomy] = $change_cat_str;
66 66
67 
-    update_post_meta($post_id, 'post_categories', $category_str);
67 
+	update_post_meta($post_id, 'post_categories', $category_str);
68 68
69 69 
 }
70 70
71 71
72 72 
 if (!function_exists('geodir_save_listing')) {
73 
-    /**
74 
-     * Saves listing in the database using given information.
75 
-     *
76 
-     * @since 1.0.0
77 
-     * @since 1.5.4 New parameter $wp_error added.
78 
-     * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED
79 
-     * @package GeoDirectory
80 
-     * @global object $wpdb WordPress Database object.
81 
-     * @global object $post The current post object.
82 
-     * @global object $current_user Current user object.
83 
-     * @global object $gd_session GeoDirectory Session object.
84 
-     * @param array $request_info {
85 
-     *    Array of request info arguments.
86 
-     *
87 
-     *    @type string $action                                  Ajax action name.
88 
-     *    @type string $geodir_ajax                             Ajax type.
89 
-     *    @type string $ajax_action                             Ajax action.
90 
-     *    @type string $listing_type                            Listing type.
91 
-     *    @type string $pid                                     Default Post ID.
92 
-     *    @type string $preview                                 Todo Desc needed.
93 
-     *    @type string $add_listing_page_id                     Add listing page ID.
94 
-     *    @type string $post_title                              Listing title.
95 
-     *    @type string $post_desc                               Listing Description.
96 
-     *    @type string $post_tags                               Listing tags.
97 
-     *    @type array  $cat_limit                               Category limit.
98 
-     *    @type array  $post_category                           Category IDs.
99 
-     *    @type array  $post_category_str                       Category string.
100 
-     *    @type string $post_default_category                   Default category ID.
101 
-     *    @type string $post_address                            Listing address.
102 
-     *    @type string $geodir_location_add_listing_country_val Add listing country value.
103 
-     *    @type string $post_country                            Listing country.
104 
-     *    @type string $geodir_location_add_listing_region_val  Add listing region value.
105 
-     *    @type string $post_region                             Listing region.
106 
-     *    @type string $geodir_location_add_listing_city_val    Add listing city value.
107 
-     *    @type string $post_city                               Listing city.
108 
-     *    @type string $post_zip                                Listing zip.
109 
-     *    @type string $post_latitude                           Listing latitude.
110 
-     *    @type string $post_longitude                          Listing longitude.
111 
-     *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".
112 
-     *    @type string $post_mapzoom                            Listing mapzoom Default "9".
113 
-     *    @type string $geodir_timing                           Business timing info.
114 
-     *    @type string $geodir_contact                          Contact number.
115 
-     *    @type string $geodir_email                            Business contact email.
116 
-     *    @type string $geodir_website                          Business website.
117 
-     *    @type string $geodir_twitter                          Twitter link.
118 
-     *    @type string $geodir_facebook                         Facebook link.
119 
-     *    @type string $geodir_video                            Video link.
120 
-     *    @type string $geodir_special_offers                   Special offers.
121 
-     *    @type string $post_images                             Post image urls.
122 
-     *    @type string $post_imagesimage_limit                  Post images limit.
123 
-     *    @type string $post_imagestotImg                       Todo Desc needed.
124 
-     *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.
125 
-     *    @type string $geodir_spamblocker                      Todo Desc needed.
126 
-     *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.
127 
-     *
128 
-     * }
129 
-     * @param bool $dummy Optional. Is this a dummy listing? Default false.
130 
-     * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.
131 
-     * @return int|string|WP_Error Created post id or WP_Error on failure.
132 
-     */
133 
-    function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)
134 
-    {
135 
-        global $wpdb, $current_user, $gd_session;
136 
-
137 
-        $last_post_id = '';
138 
-
139 
-        if ($gd_session->get('listing') && !$dummy) {
140 
-            $request_info = array();
141 
-            $request_session = $gd_session->get('listing');
142 
-            $request_info = array_merge($_REQUEST, $request_session);
143 
-        } else if (!$gd_session->get('listing') && !$dummy) {
144 
-            global $post;
73 
+	/**
74 
+	 * Saves listing in the database using given information.
75 
+	 *
76 
+	 * @since 1.0.0
77 
+	 * @since 1.5.4 New parameter $wp_error added.
78 
+	 * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED
79 
+	 * @package GeoDirectory
80 
+	 * @global object $wpdb WordPress Database object.
81 
+	 * @global object $post The current post object.
82 
+	 * @global object $current_user Current user object.
83 
+	 * @global object $gd_session GeoDirectory Session object.
84 
+	 * @param array $request_info {
85 
+	 *    Array of request info arguments.
86 
+	 *
87 
+	 *    @type string $action                                  Ajax action name.
88 
+	 *    @type string $geodir_ajax                             Ajax type.
89 
+	 *    @type string $ajax_action                             Ajax action.
90 
+	 *    @type string $listing_type                            Listing type.
91 
+	 *    @type string $pid                                     Default Post ID.
92 
+	 *    @type string $preview                                 Todo Desc needed.
93 
+	 *    @type string $add_listing_page_id                     Add listing page ID.
94 
+	 *    @type string $post_title                              Listing title.
95 
+	 *    @type string $post_desc                               Listing Description.
96 
+	 *    @type string $post_tags                               Listing tags.
97 
+	 *    @type array  $cat_limit                               Category limit.
98 
+	 *    @type array  $post_category                           Category IDs.
99 
+	 *    @type array  $post_category_str                       Category string.
100 
+	 *    @type string $post_default_category                   Default category ID.
101 
+	 *    @type string $post_address                            Listing address.
102 
+	 *    @type string $geodir_location_add_listing_country_val Add listing country value.
103 
+	 *    @type string $post_country                            Listing country.
104 
+	 *    @type string $geodir_location_add_listing_region_val  Add listing region value.
105 
+	 *    @type string $post_region                             Listing region.
106 
+	 *    @type string $geodir_location_add_listing_city_val    Add listing city value.
107 
+	 *    @type string $post_city                               Listing city.
108 
+	 *    @type string $post_zip                                Listing zip.
109 
+	 *    @type string $post_latitude                           Listing latitude.
110 
+	 *    @type string $post_longitude                          Listing longitude.
111 
+	 *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".
112 
+	 *    @type string $post_mapzoom                            Listing mapzoom Default "9".
113 
+	 *    @type string $geodir_timing                           Business timing info.
114 
+	 *    @type string $geodir_contact                          Contact number.
115 
+	 *    @type string $geodir_email                            Business contact email.
116 
+	 *    @type string $geodir_website                          Business website.
117 
+	 *    @type string $geodir_twitter                          Twitter link.
118 
+	 *    @type string $geodir_facebook                         Facebook link.
119 
+	 *    @type string $geodir_video                            Video link.
120 
+	 *    @type string $geodir_special_offers                   Special offers.
121 
+	 *    @type string $post_images                             Post image urls.
122 
+	 *    @type string $post_imagesimage_limit                  Post images limit.
123 
+	 *    @type string $post_imagestotImg                       Todo Desc needed.
124 
+	 *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.
125 
+	 *    @type string $geodir_spamblocker                      Todo Desc needed.
126 
+	 *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.
127 
+	 *
128 
+	 * }
129 
+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.
130 
+	 * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.
131 
+	 * @return int|string|WP_Error Created post id or WP_Error on failure.
132 
+	 */
133 
+	function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)
134 
+	{
135 
+		global $wpdb, $current_user, $gd_session;
136 
+
137 
+		$last_post_id = '';
138 
+
139 
+		if ($gd_session->get('listing') && !$dummy) {
140 
+			$request_info = array();
141 
+			$request_session = $gd_session->get('listing');
142 
+			$request_info = array_merge($_REQUEST, $request_session);
143 
+		} else if (!$gd_session->get('listing') && !$dummy) {
144 
+			global $post;
145 145
146 
-            $gd_post = $post;
147 
-            if (!empty($gd_post) && is_array($gd_post)) {
148 
-                $gd_post = (object)$post;
146 
+			$gd_post = $post;
147 
+			if (!empty($gd_post) && is_array($gd_post)) {
148 
+				$gd_post = (object)$post;
149 149
150 
-                // Fix WPML duplicate.
151 
-                if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
152 
-                    return false;
153 
-                }
154 
-            }
150 
+				// Fix WPML duplicate.
151 
+				if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
152 
+					return false;
153 
+				}
154 
+			}
155 155
156 
-            $request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);
157 
-            $request_info['post_title'] = $request_info['post_title'];
158 
-            $request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid']));
159 
-            $request_info['post_desc'] = $request_info['content'];
160 
-        } else if (!$dummy) {
161 
-            return false;
162 
-        }
163 
-
164 
-        /**
165 
-         * Filter the request_info array.
166 
-         *
167 
-         * You can use this filter to modify request_info array.
168 
-         *
169 
-         * @since 1.0.0
170 
-         * @package GeoDirectory
171 
-         * @param array $request_info See {@see geodir_save_listing()} for accepted args.
172 
-         */
173 
-        $request_info = apply_filters('geodir_action_get_request_info', $request_info);
174 
-
175 
-        // Check if we need to save post location as new location
176 
-        $location_result = geodir_get_default_location();
177 
-
178 
-        if ($location_result->location_id > 0) {
179 
-            if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
180 
-                $request_info['post_location'] = array(
181 
-                    'city' => $request_info['post_city'],
182 
-                    'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',
183 
-                    'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',
184 
-                    'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',
185 
-                    'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''
186 
-                );
187 
-
188 
-                $post_location_info = $request_info['post_location'];
189 
-
190 
-                if ($location_id = geodir_add_new_location($post_location_info)) {
191 
-                    $post_location_id = $location_id;
192 
-                }
193 
-            } else {
194 
-                $post_location_id = $location_result->location_id;
195 
-            }
196 
-        } else {
197 
-            $post_location_id = $location_result->location_id;
198 
-        }
199 
-
200 
-        if ($dummy) {
201 
-            $post_status = 'publish';
202 
-        } else {
203 
-            $post_status = geodir_new_post_default_status();
204 
-        }
205 
-
206 
-        if (isset($request_info['pid']) && $request_info['pid'] != '') {
207 
-            $post_status = get_post_status($request_info['pid']);
208 
-        }
209 
-
210 
-        /* fix change of slug on every title edit */
211 
-        if (!isset($request_info['post_name'])) {
212 
-            $request_info['post_name'] = $request_info['post_title'];
213 
-
214 
-            if (!empty($request_info['pid'])) {
215 
-                $post_info = get_post($request_info['pid']);
216 
-
217 
-                if (!empty($post_info) && isset($post_info->post_name)) {
218 
-                    $request_info['post_name'] = $post_info->post_name;
219 
-                }
220 
-            }
221 
-        }
222 
-
223 
-        $post = array(
224 
-            'post_content' => $request_info['post_desc'],
225 
-            'post_status' => $post_status,
226 
-            'post_title' => $request_info['post_title'],
227 
-            'post_name' => $request_info['post_name'],
228 
-            'post_type' => $request_info['listing_type']
229 
-        );
230 
-
231 
-        /**
232 
-         * Called before a listing is saved to the database.
233 
-         *
234 
-         * @since 1.0.0
235 
-         * @param object $post The post object.
236 
-         */
237 
-        do_action_ref_array('geodir_before_save_listing', $post);
156 
+			$request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);
157 
+			$request_info['post_title'] = $request_info['post_title'];
158 
+			$request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid']));
159 
+			$request_info['post_desc'] = $request_info['content'];
160 
+		} else if (!$dummy) {
161 
+			return false;
162 
+		}
163 
+
164 
+		/**
165 
+		 * Filter the request_info array.
166 
+		 *
167 
+		 * You can use this filter to modify request_info array.
168 
+		 *
169 
+		 * @since 1.0.0
170 
+		 * @package GeoDirectory
171 
+		 * @param array $request_info See {@see geodir_save_listing()} for accepted args.
172 
+		 */
173 
+		$request_info = apply_filters('geodir_action_get_request_info', $request_info);
174 
+
175 
+		// Check if we need to save post location as new location
176 
+		$location_result = geodir_get_default_location();
177 
+
178 
+		if ($location_result->location_id > 0) {
179 
+			if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
180 
+				$request_info['post_location'] = array(
181 
+					'city' => $request_info['post_city'],
182 
+					'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',
183 
+					'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',
184 
+					'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',
185 
+					'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''
186 
+				);
187 
+
188 
+				$post_location_info = $request_info['post_location'];
189 
+
190 
+				if ($location_id = geodir_add_new_location($post_location_info)) {
191 
+					$post_location_id = $location_id;
192 
+				}
193 
+			} else {
194 
+				$post_location_id = $location_result->location_id;
195 
+			}
196 
+		} else {
197 
+			$post_location_id = $location_result->location_id;
198 
+		}
238 199
239 
-        $send_post_submit_mail = false;
200 
+		if ($dummy) {
201 
+			$post_status = 'publish';
202 
+		} else {
203 
+			$post_status = geodir_new_post_default_status();
204 
+		}
240 205
241 
-        // unhook this function so it doesn't loop infinitely
242 
-        remove_action('save_post', 'geodir_post_information_save',10,2);
206 
+		if (isset($request_info['pid']) && $request_info['pid'] != '') {
207 
+			$post_status = get_post_status($request_info['pid']);
208 
+		}
243 209
244 
-        if (isset($request_info['pid']) && $request_info['pid'] != '') {
245 
-            $post['ID'] = $request_info['pid'];
210 
+		/* fix change of slug on every title edit */
211 
+		if (!isset($request_info['post_name'])) {
212 
+			$request_info['post_name'] = $request_info['post_title'];
246 213
247 
-            $last_post_id = wp_update_post($post, $wp_error);
248 
-        } else {
249 
-            $last_post_id = wp_insert_post($post, $wp_error);
214 
+			if (!empty($request_info['pid'])) {
215 
+				$post_info = get_post($request_info['pid']);
250 216
251 
-            if (!$dummy && $last_post_id) {
252 
-                $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)
253 
-                //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
254 
-            }
255 
-        }
217 
+				if (!empty($post_info) && isset($post_info->post_name)) {
218 
+					$request_info['post_name'] = $post_info->post_name;
219 
+				}
220 
+			}
221 
+		}
222 
+
223 
+		$post = array(
224 
+			'post_content' => $request_info['post_desc'],
225 
+			'post_status' => $post_status,
226 
+			'post_title' => $request_info['post_title'],
227 
+			'post_name' => $request_info['post_name'],
228 
+			'post_type' => $request_info['listing_type']
229 
+		);
230 
+
231 
+		/**
232 
+		 * Called before a listing is saved to the database.
233 
+		 *
234 
+		 * @since 1.0.0
235 
+		 * @param object $post The post object.
236 
+		 */
237 
+		do_action_ref_array('geodir_before_save_listing', $post);
238 
+
239 
+		$send_post_submit_mail = false;
240 
+
241 
+		// unhook this function so it doesn't loop infinitely
242 
+		remove_action('save_post', 'geodir_post_information_save',10,2);
243 
+
244 
+		if (isset($request_info['pid']) && $request_info['pid'] != '') {
245 
+			$post['ID'] = $request_info['pid'];
246 
+
247 
+			$last_post_id = wp_update_post($post, $wp_error);
248 
+		} else {
249 
+			$last_post_id = wp_insert_post($post, $wp_error);
250 
+
251 
+			if (!$dummy && $last_post_id) {
252 
+				$send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)
253 
+				//geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
254 
+			}
255 
+		}
256 256
257 
-        if ($wp_error && is_wp_error($last_post_id)) {
258 
-            return $last_post_id; // Return WP_Error on save failure.
259 
-        }
257 
+		if ($wp_error && is_wp_error($last_post_id)) {
258 
+			return $last_post_id; // Return WP_Error on save failure.
259 
+		}
260 260
261 
-        if (!$last_post_id) {
262 
-            return false; // Save failure.
263 
-        }
261 
+		if (!$last_post_id) {
262 
+			return false; // Save failure.
263 
+		}
264 264
265 
-        // re-hook this function
266 
-        add_action('save_post', 'geodir_post_information_save',10,2);
265 
+		// re-hook this function
266 
+		add_action('save_post', 'geodir_post_information_save',10,2);
267 267
268 
-        $post_tags = '';
269 
-        if (!isset($request_info['post_tags'])) {
268 
+		$post_tags = '';
269 
+		if (!isset($request_info['post_tags'])) {
270 270
271 
-            $post_type = $request_info['listing_type'];
272 
-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
271 
+			$post_type = $request_info['listing_type'];
272 
+			$post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
273 273
274 
-        }
274 
+		}
275 275
276 
-        $gd_post_info = array(
277 
-            "post_title" => $request_info['post_title'],
278 
-            "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,
279 
-            "post_status" => $post_status,
280 
-            "post_location_id" => $post_location_id,
281 
-            "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',
282 
-            "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',
283 
-            "submit_time" => time(),
284 
-            "submit_ip" => $_SERVER['REMOTE_ADDR'],
285 
-        );
276 
+		$gd_post_info = array(
277 
+			"post_title" => $request_info['post_title'],
278 
+			"post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,
279 
+			"post_status" => $post_status,
280 
+			"post_location_id" => $post_location_id,
281 
+			"claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',
282 
+			"businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',
283 
+			"submit_time" => time(),
284 
+			"submit_ip" => $_SERVER['REMOTE_ADDR'],
285 
+		);
286 286
287 
-        $payment_info = array();
288 
-        $package_info = array();
287 
+		$payment_info = array();
288 
+		$package_info = array();
289 289
290 
-        $package_info = (array)geodir_post_package_info($package_info, $post);
290 
+		$package_info = (array)geodir_post_package_info($package_info, $post);
291 291
292 
-        $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');
292 
+		$post_package_id = geodir_get_post_meta($last_post_id, 'package_id');
293 293
294 
-        if (!empty($package_info) && !$post_package_id) {
295 
-            if (isset($package_info['days']) && $package_info['days'] != 0) {
296 
-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
297 
-            } else {
298 
-                $payment_info['expire_date'] = 'Never';
299 
-            }
294 
+		if (!empty($package_info) && !$post_package_id) {
295 
+			if (isset($package_info['days']) && $package_info['days'] != 0) {
296 
+				$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
297 
+			} else {
298 
+				$payment_info['expire_date'] = 'Never';
299 
+			}
300 300
301 
-            $payment_info['package_id'] = $package_info['pid'];
302 
-            $payment_info['alive_days'] = $package_info['days'];
303 
-            $payment_info['is_featured'] = $package_info['is_featured'];
301 
+			$payment_info['package_id'] = $package_info['pid'];
302 
+			$payment_info['alive_days'] = $package_info['days'];
303 
+			$payment_info['is_featured'] = $package_info['is_featured'];
304 304
305 
-            $gd_post_info = array_merge($gd_post_info, $payment_info);
306 
-        }
305 
+			$gd_post_info = array_merge($gd_post_info, $payment_info);
306 
+		}
307 307
308 
-        $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
308 
+		$custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
309 309
310 
-        foreach ($custom_metaboxes as $key => $val):
310 
+		foreach ($custom_metaboxes as $key => $val):
311 311
312 
-            $name = $val['name'];
313 
-            $type = $val['type'];
314 
-            $extrafields = $val['extra_fields'];
312 
+			$name = $val['name'];
313 
+			$type = $val['type'];
314 
+			$extrafields = $val['extra_fields'];
315 315
316 
-            if (trim($type) == 'address') {
317 
-                $prefix = $name . '_';
318 
-                $address = $prefix . 'address';
316 
+			if (trim($type) == 'address') {
317 
+				$prefix = $name . '_';
318 
+				$address = $prefix . 'address';
319 319
320 
-                if (isset($request_info[$address]) && $request_info[$address] != '') {
321 
-                    $gd_post_info[$address] = wp_slash($request_info[$address]);
322 
-                }
320 
+				if (isset($request_info[$address]) && $request_info[$address] != '') {
321 
+					$gd_post_info[$address] = wp_slash($request_info[$address]);
322 
+				}
323 323
324 
-                if ($extrafields != '') {
325 
-                    $extrafields = unserialize($extrafields);
324 
+				if ($extrafields != '') {
325 
+					$extrafields = unserialize($extrafields);
326 326
327 327
328 
-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
328 
+					if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
329 329
330 
-                        $location_result = geodir_get_default_location();
330 
+						$location_result = geodir_get_default_location();
331 331
332 
-                        $gd_post_info[$prefix . 'city'] = $location_result->city;
333 
-                        $gd_post_info[$prefix . 'region'] = $location_result->region;
334 
-                        $gd_post_info[$prefix . 'country'] = $location_result->country;
332 
+						$gd_post_info[$prefix . 'city'] = $location_result->city;
333 
+						$gd_post_info[$prefix . 'region'] = $location_result->region;
334 
+						$gd_post_info[$prefix . 'country'] = $location_result->country;
335 335
336 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
336 
+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
337 337
338 
-                    } else {
338 
+					} else {
339 339
340 
-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];
341 
-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];
342 
-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];
340 
+						$gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];
341 
+						$gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];
342 
+						$gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];
343 343
344 
-                        //----------set post locations when import dummy data-------
345 
-                        $location_result = geodir_get_default_location();
344 
+						//----------set post locations when import dummy data-------
345 
+						$location_result = geodir_get_default_location();
346 346
347 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
348 
-                        //-----------------------------------------------------------------
347 
+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
348 
+						//-----------------------------------------------------------------
349 349
350 
-                    }
350 
+					}
351 351
352 352
353 
-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
354 
-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];
355 
-                    }
353 
+					if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
354 
+						$gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];
355 
+					}
356 356
357 357
358 
-                    if (isset($extrafields['show_map']) && $extrafields['show_map']) {
358 
+					if (isset($extrafields['show_map']) && $extrafields['show_map']) {
359 359
360 
-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
361 
-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];
362 
-                        }
360 
+						if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
361 
+							$gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];
362 
+						}
363 363
364 
-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
365 
-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];
366 
-                        }
364 
+						if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
365 
+							$gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];
366 
+						}
367 367
368 
-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
369 
-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];
370 
-                        }
368 
+						if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
369 
+							$gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];
370 
+						}
371 371
372 
-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
373 
-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];
374 
-                        }
372 
+						if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
373 
+							$gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];
374 
+						}
375 375
376 
-                    }
376 
+					}
377 377
378 
-                    // show lat lng
379 
-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
380 
-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];
381 
-                    }
382 
-                }
378 
+					// show lat lng
379 
+					if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
380 
+						$gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];
381 
+					}
382 
+				}
383 383
384 
-            } elseif (trim($type) == 'file') {
385 
-                if (isset($request_info[$name])) {
386 
-                    $request_files = array();
387 
-                    if ($request_info[$name] != '')
388 
-                        $request_files = explode(",", $request_info[$name]);
384 
+			} elseif (trim($type) == 'file') {
385 
+				if (isset($request_info[$name])) {
386 
+					$request_files = array();
387 
+					if ($request_info[$name] != '')
388 
+						$request_files = explode(",", $request_info[$name]);
389 389
390 
-                    $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;
391 
-                    geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);
392 
-                }
393 
-            } elseif (trim($type) == 'datepicker') {
394 
-                if (isset($request_info[$name])) {
395 
-                    $datetime = '';
390 
+					$extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;
391 
+					geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);
392 
+				}
393 
+			} elseif (trim($type) == 'datepicker') {
394 
+				if (isset($request_info[$name])) {
395 
+					$datetime = '';
396 396
397 
-                    if (!empty($request_info[$name])) {
398 
-                        $date_format = geodir_default_date_format();
399 
-                        if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
400 
-                            $extra_fields = unserialize($val['extra_fields']);
401 
-                            $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;
402 
-                        }
403 
-
404 
-                        // check if we need to change the format or not
405 
-                        $date_format_len = strlen(str_replace(' ', '', $date_format));
406 
-                        if($date_format_len>5){// if greater then 5 then it's the old style format.
397 
+					if (!empty($request_info[$name])) {
398 
+						$date_format = geodir_default_date_format();
399 
+						if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
400 
+							$extra_fields = unserialize($val['extra_fields']);
401 
+							$date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;
402 
+						}
407 403
408 
-                            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
409 
-                            $replace = array('d','j','l','m','n','F','Y');//PHP date format
404 
+						// check if we need to change the format or not
405 
+						$date_format_len = strlen(str_replace(' ', '', $date_format));
406 
+						if($date_format_len>5){// if greater then 5 then it's the old style format.
410 407
411 
-                            $date_format = str_replace($search, $replace, $date_format);
408 
+							$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
409 
+							$replace = array('d','j','l','m','n','F','Y');//PHP date format
412 410
413 
-                            $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
411 
+							$date_format = str_replace($search, $replace, $date_format);
414 412
415 
-                        }else{
416 
-                            $post_htmlvar_value = $request_info[$name];
417 
-                        }
413 
+							$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
418 414
419 
-                        $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d
420 
-                        $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated
421 
-                    }
415 
+						}else{
416 
+							$post_htmlvar_value = $request_info[$name];
417 
+						}
422 418
423 
-                    $gd_post_info[$name] = $datetime;
424 
-                }
425 
-            } else if ($type == 'multiselect') {
426 
-                if (isset($request_info[$name])) {
427 
-                    $gd_post_info[$name] = $request_info[$name];
428 
-                } else {
429 
-                    if (isset($request_info['gd_field_' . $name])) {
430 
-                        $gd_post_info[$name] = ''; /* fix de-select for multiselect */
431 
-                    }
432 
-                }
433 
-            } else if (isset($request_info[$name])) {
434 
-                $gd_post_info[$name] = $request_info[$name];
435 
-            }
419 
+						$post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d
420 
+						$datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated
421 
+					}
422 
+
423 
+					$gd_post_info[$name] = $datetime;
424 
+				}
425 
+			} else if ($type == 'multiselect') {
426 
+				if (isset($request_info[$name])) {
427 
+					$gd_post_info[$name] = $request_info[$name];
428 
+				} else {
429 
+					if (isset($request_info['gd_field_' . $name])) {
430 
+						$gd_post_info[$name] = ''; /* fix de-select for multiselect */
431 
+					}
432 
+				}
433 
+			} else if (isset($request_info[$name])) {
434 
+				$gd_post_info[$name] = $request_info[$name];
435 
+			}
436 436
437 
-        endforeach;
437 
+		endforeach;
438 438
439 
-        if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
440 
-            $gd_post_info['post_dummy'] = $request_info['post_dummy'];
441 
-        }
439 
+		if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
440 
+			$gd_post_info['post_dummy'] = $request_info['post_dummy'];
441 
+		}
442 442
443 
-        // Save post detail info in detail table
444 
-        if (!empty($gd_post_info)) {
445 
-            geodir_save_post_info($last_post_id, $gd_post_info);
446 
-        }
443 
+		// Save post detail info in detail table
444 
+		if (!empty($gd_post_info)) {
445 
+			geodir_save_post_info($last_post_id, $gd_post_info);
446 
+		}
447 447
448 448
449 
-        // Set categories to the listing
450 
-        if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
451 
-            $post_category = array();
449 
+		// Set categories to the listing
450 
+		if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
451 
+			$post_category = array();
452 452
453 
-            foreach ($request_info['post_category'] as $taxonomy => $cat) {
453 
+			foreach ($request_info['post_category'] as $taxonomy => $cat) {
454 454
455 
-                if ($dummy)
456 
-                    $post_category = $cat;
457 
-                else {
455 
+				if ($dummy)
456 
+					$post_category = $cat;
457 
+				else {
458 458
459 
-                    if (!is_array($cat) && strstr($cat, ','))
460 
-                        $cat = explode(',', $cat);
459 
+					if (!is_array($cat) && strstr($cat, ','))
460 
+						$cat = explode(',', $cat);
461 461
462 
-                    if (!empty($cat) && is_array($cat))
463 
-                        $post_category = array_map('intval', $cat);
464 
-                }
462 
+					if (!empty($cat) && is_array($cat))
463 
+						$post_category = array_map('intval', $cat);
464 
+				}
465 465
466 
-                wp_set_object_terms($last_post_id, $post_category, $taxonomy);
467 
-            }
466 
+				wp_set_object_terms($last_post_id, $post_category, $taxonomy);
467 
+			}
468 468
469 
-            $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';
469 
+			$post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';
470 470
471 
-            $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';
472 
-            geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);
471 
+			$post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';
472 
+			geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);
473 473
474 
-        }
474 
+		}
475 475
476 
-        $post_tags = '';
477 
-        // Set tags to the listing
478 
-        if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
479 
-            $post_tags = explode(",", $request_info['post_tags']);
480 
-        } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
481 
-            if ($dummy)
482 
-                $post_tags = $request_info['post_tags'];
483 
-        } else {
484 
-            if ($dummy)
485 
-                $post_tags = array($request_info['post_title']);
486 
-        }
476 
+		$post_tags = '';
477 
+		// Set tags to the listing
478 
+		if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
479 
+			$post_tags = explode(",", $request_info['post_tags']);
480 
+		} elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
481 
+			if ($dummy)
482 
+				$post_tags = $request_info['post_tags'];
483 
+		} else {
484 
+			if ($dummy)
485 
+				$post_tags = array($request_info['post_title']);
486 
+		}
487 487
488 
-        if (is_array($post_tags)) {
489 
-            $taxonomy = $request_info['listing_type'] . '_tags';
490 
-            wp_set_object_terms($last_post_id, $post_tags, $taxonomy);
491 
-        }
488 
+		if (is_array($post_tags)) {
489 
+			$taxonomy = $request_info['listing_type'] . '_tags';
490 
+			wp_set_object_terms($last_post_id, $post_tags, $taxonomy);
491 
+		}
492 492
493 493
494 
-        // Insert attachment
494 
+		// Insert attachment
495 495
496 
-        if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
497 
-            if (!$dummy) {
498 
-                $tmpimgArr = trim($request_info['post_images'], ",");
499 
-                $tmpimgArr = explode(",", $tmpimgArr);
500 
-                geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);
501 
-            } else{
502 
-                geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);
503 
-            }
496 
+		if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
497 
+			if (!$dummy) {
498 
+				$tmpimgArr = trim($request_info['post_images'], ",");
499 
+				$tmpimgArr = explode(",", $tmpimgArr);
500 
+				geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);
501 
+			} else{
502 
+				geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);
503 
+			}
504 504
505 505
506 
-        } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
506 
+		} elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
507 507
508 
-            /* Delete Attachments
508 
+			/* Delete Attachments
509 509 
 			$postcurr_images = geodir_get_images($last_post_id);
510 510
511 511 
 			$wpdb->query(

@@ -521,34 +521,34 @@  discard block
 
 block discarded – undo
521 521 
 			geodir_save_post_info($last_post_id, $gd_post_featured_img);
522 522 
 			*/
523 523
524 
-        }
524 
+		}
525 525
526 
-        geodir_remove_temp_images();
527 
-        geodir_set_wp_featured_image($last_post_id);
526 
+		geodir_remove_temp_images();
527 
+		geodir_set_wp_featured_image($last_post_id);
528 528
529 
-        /**
530 
-         * Called after a listing is saved to the database and before any email have been sent.
531 
-         *
532 
-         * @since 1.0.0
533 
-         * @param int $last_post_id The saved post ID.
534 
-         * @param array $request_info The post details in an array.
535 
-         * @see 'geodir_after_save_listinginfo'
536 
-         */
537 
-        do_action('geodir_after_save_listing', $last_post_id, $request_info);
529 
+		/**
530 
+		 * Called after a listing is saved to the database and before any email have been sent.
531 
+		 *
532 
+		 * @since 1.0.0
533 
+		 * @param int $last_post_id The saved post ID.
534 
+		 * @param array $request_info The post details in an array.
535 
+		 * @see 'geodir_after_save_listinginfo'
536 
+		 */
537 
+		do_action('geodir_after_save_listing', $last_post_id, $request_info);
538 538
539 
-        //die;
539 
+		//die;
540 540
541 
-        if ($send_post_submit_mail) { // if new post send out email
542 
-            $to_name = geodir_get_client_name($current_user->ID);
543 
-            geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
544 
-        }
545 
-        /*
541 
+		if ($send_post_submit_mail) { // if new post send out email
542 
+			$to_name = geodir_get_client_name($current_user->ID);
543 
+			geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
544 
+		}
545 
+		/*
546 546 
          * Unset the session so we don't loop.
547 547 
          */
548 
-        $gd_session->un_set('listing');
549 
-        return $last_post_id;
548 
+		$gd_session->un_set('listing');
549 
+		return $last_post_id;
550 550
551 
-    }
551 
+	}
552 552
553 553 
 }
554 554 
 

@@ -567,599 +567,599 @@  discard block
 
 block discarded – undo
567 567 
 function geodir_get_post_info($post_id = '')
568 568 
 {
569 569
570 
-    global $wpdb, $plugin_prefix, $post, $post_info;
570 
+	global $wpdb, $plugin_prefix, $post, $post_info;
571 571
572 
-    if ($post_id == '' && !empty($post))
573 
-        $post_id = $post->ID;
572 
+	if ($post_id == '' && !empty($post))
573 
+		$post_id = $post->ID;
574 574
575 
-    $post_type = get_post_type($post_id);
575 
+	$post_type = get_post_type($post_id);
576 576
577 
-    $all_postypes = geodir_get_posttypes();
577 
+	$all_postypes = geodir_get_posttypes();
578 578
579 
-    if (!in_array($post_type, $all_postypes))
580 
-        return false;
579 
+	if (!in_array($post_type, $all_postypes))
580 
+		return false;
581 581
582 
-    $table = $plugin_prefix . $post_type . '_detail';
582 
+	$table = $plugin_prefix . $post_type . '_detail';
583 583
584 
-    /**
585 
-     * Apply Filter to change Post info
586 
-     *
587 
-     * You can use this filter to change Post info.
588 
-     *
589 
-     * @since 1.0.0
590 
-     * @package GeoDirectory
591 
-     */
592 
-    $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
584 
+	/**
585 
+	 * Apply Filter to change Post info
586 
+	 *
587 
+	 * You can use this filter to change Post info.
588 
+	 *
589 
+	 * @since 1.0.0
590 
+	 * @package GeoDirectory
591 
+	 */
592 
+	$query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
593 593 
 			  WHERE p.ID = pd.post_id
594 594 
 			  AND pd.post_id = %d", $post_id));
595 595
596 
-    $post_detail = $wpdb->get_row($query);
596 
+	$post_detail = $wpdb->get_row($query);
597 597
598 
-    return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;
598 
+	return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;
599 599
600 600 
 }
601 601
602 602
603 603 
 if (!function_exists('geodir_save_post_info')) {
604 
-    /**
605 
-     * Saves post detail info in detail table.
606 
-     *
607 
-     * @since 1.0.0
608 
-     * @package GeoDirectory
609 
-     * @global object $wpdb WordPress Database object.
610 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
611 
-     * @param int $post_id The post ID.
612 
-     * @param array $postinfo_array {
613 
-     *    Post info that needs to be saved in detail table.
614 
-     *
615 
-     *    @type string $post_title              Listing title.
616 
-     *    @type string $post_tags               Listing tags.
617 
-     *    @type string $post_status             Listing post status.
618 
-     *    @type string $post_location_id        Listing location ID.
619 
-     *    @type string $claimed                 Todo Desc needed.
620 
-     *    @type string $businesses              Todo Desc needed.
621 
-     *    @type int    $submit_time             Submitted time in unix timestamp.
622 
-     *    @type string $submit_ip               Submitted IP.
623 
-     *    @type string $expire_date             Listing expiration date.
624 
-     *    @type int    $package_id              Listing package ID.
625 
-     *    @type int    $alive_days              Todo Desc needed.
626 
-     *    @type int    $is_featured             Is this a featured listing?.
627 
-     *    @type string $post_address            Listing address.
628 
-     *    @type string $post_city               Listing city.
629 
-     *    @type string $post_region             Listing region.
630 
-     *    @type string $post_country            Listing country.
631 
-     *    @type string $post_locations          Listing locations.
632 
-     *    @type string $post_zip                Listing zip.
633 
-     *    @type string $post_latitude           Listing latitude.
634 
-     *    @type string $post_longitude          Listing longitude.
635 
-     *    @type string $post_mapview            Listing mapview. Default "ROADMAP".
636 
-     *    @type string $post_mapzoom            Listing mapzoom Default "9".
637 
-     *    @type string $geodir_timing           Business timing info.
638 
-     *    @type string $geodir_contact          Contact number.
639 
-     *    @type string $geodir_email            Business contact email.
640 
-     *    @type string $geodir_website          Business website.
641 
-     *    @type string $geodir_twitter          Twitter link.
642 
-     *    @type string $geodir_facebook         Facebook link.
643 
-     *    @type string $geodir_video            Video link.
644 
-     *    @type string $geodir_special_offers   Special offers.
645 
-     *
646 
-     * }
647 
-     * @return bool
648 
-     */
649 
-    function geodir_save_post_info($post_id, $postinfo_array = array())
650 
-    {
651 
-        global $wpdb, $plugin_prefix;
652 
-
653 
-        $post_type = get_post_type($post_id);
654 
-
655 
-        $table = $plugin_prefix . $post_type . '_detail';
656 
-
657 
-        /**
658 
-         * Filter to change Post info
659 
-         *
660 
-         * You can use this filter to change Post info.
661 
-         *
662 
-         * @since 1.0.0
663 
-         * @package GeoDirectory
664 
-         * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
665 
-         * @param int $post_id The post ID.
666 
-         */
667 
-        $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
604 
+	/**
605 
+	 * Saves post detail info in detail table.
606 
+	 *
607 
+	 * @since 1.0.0
608 
+	 * @package GeoDirectory
609 
+	 * @global object $wpdb WordPress Database object.
610 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
611 
+	 * @param int $post_id The post ID.
612 
+	 * @param array $postinfo_array {
613 
+	 *    Post info that needs to be saved in detail table.
614 
+	 *
615 
+	 *    @type string $post_title              Listing title.
616 
+	 *    @type string $post_tags               Listing tags.
617 
+	 *    @type string $post_status             Listing post status.
618 
+	 *    @type string $post_location_id        Listing location ID.
619 
+	 *    @type string $claimed                 Todo Desc needed.
620 
+	 *    @type string $businesses              Todo Desc needed.
621 
+	 *    @type int    $submit_time             Submitted time in unix timestamp.
622 
+	 *    @type string $submit_ip               Submitted IP.
623 
+	 *    @type string $expire_date             Listing expiration date.
624 
+	 *    @type int    $package_id              Listing package ID.
625 
+	 *    @type int    $alive_days              Todo Desc needed.
626 
+	 *    @type int    $is_featured             Is this a featured listing?.
627 
+	 *    @type string $post_address            Listing address.
628 
+	 *    @type string $post_city               Listing city.
629 
+	 *    @type string $post_region             Listing region.
630 
+	 *    @type string $post_country            Listing country.
631 
+	 *    @type string $post_locations          Listing locations.
632 
+	 *    @type string $post_zip                Listing zip.
633 
+	 *    @type string $post_latitude           Listing latitude.
634 
+	 *    @type string $post_longitude          Listing longitude.
635 
+	 *    @type string $post_mapview            Listing mapview. Default "ROADMAP".
636 
+	 *    @type string $post_mapzoom            Listing mapzoom Default "9".
637 
+	 *    @type string $geodir_timing           Business timing info.
638 
+	 *    @type string $geodir_contact          Contact number.
639 
+	 *    @type string $geodir_email            Business contact email.
640 
+	 *    @type string $geodir_website          Business website.
641 
+	 *    @type string $geodir_twitter          Twitter link.
642 
+	 *    @type string $geodir_facebook         Facebook link.
643 
+	 *    @type string $geodir_video            Video link.
644 
+	 *    @type string $geodir_special_offers   Special offers.
645 
+	 *
646 
+	 * }
647 
+	 * @return bool
648 
+	 */
649 
+	function geodir_save_post_info($post_id, $postinfo_array = array())
650 
+	{
651 
+		global $wpdb, $plugin_prefix;
652 
+
653 
+		$post_type = get_post_type($post_id);
654 
+
655 
+		$table = $plugin_prefix . $post_type . '_detail';
656 
+
657 
+		/**
658 
+		 * Filter to change Post info
659 
+		 *
660 
+		 * You can use this filter to change Post info.
661 
+		 *
662 
+		 * @since 1.0.0
663 
+		 * @package GeoDirectory
664 
+		 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
665 
+		 * @param int $post_id The post ID.
666 
+		 */
667 
+		$postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
668 
+
669 
+		$query_string_escaped = '';
670 
+		$query_string_array = array();
671 
+
672 
+		if (!empty($postmeta) && $post_id) {
673 
+
674 
+			$columns = $wpdb->get_col("show columns from $table");
675 
+			foreach ($postmeta as $mkey => $mval) {
676 
+				if(in_array($mkey,$columns)) {
677 
+					if (is_array($mval)) {
678 
+						$mval = implode(",", $mval);
679 
+					}
680 
+					$query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above
681 
+					$query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare
668 682
669 
-        $query_string_escaped = '';
670 
-        $query_string_array = array();
683 
+				}
684 
+			}
671 685
672 
-        if (!empty($postmeta) && $post_id) {
686 
+			$query_string_escaped = trim($query_string_escaped, ", ");
673 687
674 
-            $columns = $wpdb->get_col("show columns from $table");
675 
-            foreach ($postmeta as $mkey => $mval) {
676 
-                if(in_array($mkey,$columns)) {
677 
-                    if (is_array($mval)) {
678 
-                        $mval = implode(",", $mval);
679 
-                    }
680 
-                    $query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above
681 
-                    $query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare
688 
+			if (empty($query_string_array) || trim($query_string_escaped) == '') {
689 
+				return false;
690 
+			}
682 691
683 
-                }
684 
-            }
692 
+			$query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
685 693
686 
-            $query_string_escaped = trim($query_string_escaped, ", ");
687 694
688 
-            if (empty($query_string_array) || trim($query_string_escaped) == '') {
689 
-                return false;
690 
-            }
695 
+			/**
696 
+			 * Called before saving the listing info.
697 
+			 *
698 
+			 * @since 1.0.0
699 
+			 * @package GeoDirectory
700 
+			 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
701 
+			 * @param int $post_id The post ID.
702 
+			 */
703 
+			do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
691 704
692 
-            $query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
705 
+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
693 706
707 
+				$query_string_array[] = $post_id;
708 
+				$wpdb->query(
709 
+					$wpdb->prepare(
710 
+						"UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d",
711 
+						$query_string_array
712 
+					)
713 
+				);
694 714
695 
-            /**
696 
-             * Called before saving the listing info.
697 
-             *
698 
-             * @since 1.0.0
699 
-             * @package GeoDirectory
700 
-             * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
701 
-             * @param int $post_id The post ID.
702 
-             */
703 
-            do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
704 715
705 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
716 
+			} else {
706 717
707 
-                $query_string_array[] = $post_id;
708 
-                $wpdb->query(
709 
-                    $wpdb->prepare(
710 
-                        "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d",
711 
-                        $query_string_array
712 
-                    )
713 
-                );
718 
+				array_unshift($query_string_array, $post_id);
719 
+				$wpdb->query(
720 
+					$wpdb->prepare(
721 
+						"INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped,
722 
+						$query_string_array
723 
+					)
724 
+				);
725 
+
726 
+			}
714 727
728 
+			/**
729 
+			 * Called after saving the listing info.
730 
+			 *
731 
+			 * @since 1.0.0
732 
+			 * @package GeoDirectory
733 
+			 * @param array $postinfo_array Post info that needs to be saved in detail table.
734 
+			 * @param int $post_id The post ID.
735 
+			 * @see 'geodir_after_save_listing'
736 
+			 */
737 
+			do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
738 
+
739 
+			return true;
740 
+		} else
741 
+			return false;
715 742
716 
-            } else {
743 
+	}
744 
+}
717 745
718 
-                array_unshift($query_string_array, $post_id);
719 
-                $wpdb->query(
720 
-                    $wpdb->prepare(
721 
-                        "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped,
722 
-                        $query_string_array
723 
-                    )
724 
-                );
725 
-
726 
-            }
727 746
728 
-            /**
729 
-             * Called after saving the listing info.
730 
-             *
731 
-             * @since 1.0.0
732 
-             * @package GeoDirectory
733 
-             * @param array $postinfo_array Post info that needs to be saved in detail table.
734 
-             * @param int $post_id The post ID.
735 
-             * @see 'geodir_after_save_listing'
736 
-             */
737 
-            do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
747 
+if (!function_exists('geodir_save_post_meta')) {
748 
+	/**
749 
+	 * Save or update post custom fields.
750 
+	 *
751 
+	 * @since 1.0.0
752 
+	 * @package GeoDirectory
753 
+	 * @global object $wpdb WordPress Database object.
754 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
755 
+	 * @param int $post_id The post ID.
756 
+	 * @param string $postmeta Detail table column name.
757 
+	 * @param string $meta_value Detail table column value.
758 
+	 * @return void|bool
759 
+	 */
760 
+	function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')
761 
+	{
762 
+
763 
+		global $wpdb, $plugin_prefix;
764 
+
765 
+		$post_type = get_post_type($post_id);
766 
+
767 
+		$table = $plugin_prefix . $post_type . '_detail';
768 
+
769 
+		if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
770 
+
771 
+			if (is_array($meta_value)) {
772 
+				$meta_value = implode(",", $meta_value);
773 
+			}
738 774
739 
-            return true;
740 
-        } else
741 
-            return false;
775 
+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
742 776
743 
-    }
744 
-}
777 
+				$wpdb->query(
778 
+					$wpdb->prepare(
779 
+						"UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",
780 
+						array($post_id)
781 
+					)
782 
+				);
745 783
784 
+			} else {
746 785
747 
-if (!function_exists('geodir_save_post_meta')) {
748 
-    /**
749 
-     * Save or update post custom fields.
750 
-     *
751 
-     * @since 1.0.0
752 
-     * @package GeoDirectory
753 
-     * @global object $wpdb WordPress Database object.
754 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
755 
-     * @param int $post_id The post ID.
756 
-     * @param string $postmeta Detail table column name.
757 
-     * @param string $meta_value Detail table column value.
758 
-     * @return void|bool
759 
-     */
760 
-    function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')
761 
-    {
762 
-
763 
-        global $wpdb, $plugin_prefix;
764 
-
765 
-        $post_type = get_post_type($post_id);
766 
-
767 
-        $table = $plugin_prefix . $post_type . '_detail';
768 
-
769 
-        if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
770 
-
771 
-            if (is_array($meta_value)) {
772 
-                $meta_value = implode(",", $meta_value);
773 
-            }
774 
-
775 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
776 
-
777 
-                $wpdb->query(
778 
-                    $wpdb->prepare(
779 
-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",
780 
-                        array($post_id)
781 
-                    )
782 
-                );
783 
-
784 
-            } else {
785 
-
786 
-                $wpdb->query(
787 
-                    $wpdb->prepare(
788 
-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",
789 
-                        array($post_id)
790 
-                    )
791 
-                );
792 
-            }
793 
-
794 
-
795 
-        } else
796 
-            return false;
797 
-    }
786 
+				$wpdb->query(
787 
+					$wpdb->prepare(
788 
+						"INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",
789 
+						array($post_id)
790 
+					)
791 
+				);
792 
+			}
793 
+
794 
+
795 
+		} else
796 
+			return false;
797 
+	}
798 798 
 }
799 799
800 800 
 if (!function_exists('geodir_delete_post_meta')) {
801 
-    /**
802 
-     * Delete post custom fields.
803 
-     *
804 
-     * @since 1.0.0
805 
-     * @package GeoDirectory
806 
-     * @global object $wpdb WordPress Database object.
807 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
808 
-     * @param int $post_id The post ID.
809 
-     * @param string $postmeta Detail table column name.
810 
-     * @todo check if this is depreciated
811 
-     * @todo Fix unknown variable mval
812 
-     * @return bool
813 
-     */
814 
-    function geodir_delete_post_meta($post_id, $postmeta)
815 
-    {
816 
-
817 
-        global $wpdb, $plugin_prefix;
818 
-
819 
-        $post_type = get_post_type($post_id);
820 
-
821 
-        $table = $plugin_prefix . $post_type . '_detail';
822 
-
823 
-        if (is_array($postmeta) && !empty($postmeta) && $post_id) {
824 
-            $post_meta_set_query = '';
825 
-
826 
-            foreach ($postmeta as $mkey) {
827 
-                if ($mval != '')
828 
-                    $post_meta_set_query .= $mkey . " = '', ";
829 
-            }
830 
-
831 
-            $post_meta_set_query = trim($post_meta_set_query, ", ");
801 
+	/**
802 
+	 * Delete post custom fields.
803 
+	 *
804 
+	 * @since 1.0.0
805 
+	 * @package GeoDirectory
806 
+	 * @global object $wpdb WordPress Database object.
807 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
808 
+	 * @param int $post_id The post ID.
809 
+	 * @param string $postmeta Detail table column name.
810 
+	 * @todo check if this is depreciated
811 
+	 * @todo Fix unknown variable mval
812 
+	 * @return bool
813 
+	 */
814 
+	function geodir_delete_post_meta($post_id, $postmeta)
815 
+	{
816 
+
817 
+		global $wpdb, $plugin_prefix;
818 
+
819 
+		$post_type = get_post_type($post_id);
820 
+
821 
+		$table = $plugin_prefix . $post_type . '_detail';
822 
+
823 
+		if (is_array($postmeta) && !empty($postmeta) && $post_id) {
824 
+			$post_meta_set_query = '';
825 
+
826 
+			foreach ($postmeta as $mkey) {
827 
+				if ($mval != '')
828 
+					$post_meta_set_query .= $mkey . " = '', ";
829 
+			}
830 
+
831 
+			$post_meta_set_query = trim($post_meta_set_query, ", ");
832 832
833 
-            if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
834 
-                return false;
835 
-            }
836 
-
837 
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
838 
-
839 
-                $wpdb->query(
840 
-                    $wpdb->prepare(
841 
-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",
842 
-                        array($post_id)
843 
-                    )
844 
-                );
845 
-
846 
-                return true;
847 
-            }
848 
-
849 
-        } elseif ($postmeta != '' && $post_id) {
850 
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
851 
-
852 
-                $wpdb->query(
853 
-                    $wpdb->prepare(
854 
-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",
855 
-                        array($post_id)
856 
-                    )
857 
-                );
858 
-
859 
-                return true;
860 
-            }
861 
-
862 
-        } else
863 
-            return false;
864 
-    }
833 
+			if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
834 
+				return false;
835 
+			}
836 
+
837 
+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
838 
+
839 
+				$wpdb->query(
840 
+					$wpdb->prepare(
841 
+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",
842 
+						array($post_id)
843 
+					)
844 
+				);
845 
+
846 
+				return true;
847 
+			}
848 
+
849 
+		} elseif ($postmeta != '' && $post_id) {
850 
+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
851 
+
852 
+				$wpdb->query(
853 
+					$wpdb->prepare(
854 
+						"UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",
855 
+						array($post_id)
856 
+					)
857 
+				);
858 
+
859 
+				return true;
860 
+			}
861 
+
862 
+		} else
863 
+			return false;
864 
+	}
865 865 
 }
866 866
867 867
868 868 
 if (!function_exists('geodir_get_post_meta')) {
869 
-    /**
870 
-     * Get post custom meta.
871 
-     *
872 
-     * @since 1.0.0
873 
-     * @package GeoDirectory
874 
-     * @global object $wpdb WordPress Database object.
875 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
876 
-     * @param int $post_id The post ID.
877 
-     * @param string $meta_key The meta key to retrieve.
878 
-     * @param bool $single Optional. Whether to return a single value. Default false.
879 
-     * @todo single variable not yet implemented.
880 
-     * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.
881 
-     */
882 
-    function geodir_get_post_meta($post_id, $meta_key, $single = false)
883 
-    {
884 
-        if (!$post_id) {
885 
-            return false;
886 
-        }
887 
-        global $wpdb, $plugin_prefix;
888 
-
889 
-        $all_postypes = geodir_get_posttypes();
890 
-
891 
-        $post_type = get_post_type($post_id);
892 
-
893 
-        if (!in_array($post_type, $all_postypes))
894 
-            return false;
895 
-
896 
-        $table = $plugin_prefix . $post_type . '_detail';
897 
-
898 
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
899 
-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
900 
-            if ($meta_value && $meta_value !== '') {
901 
-                return maybe_serialize($meta_value);
902 
-            } else
903 
-                return $meta_value;
904 
-        } else {
905 
-            return false;
906 
-        }
907 
-    }
869 
+	/**
870 
+	 * Get post custom meta.
871 
+	 *
872 
+	 * @since 1.0.0
873 
+	 * @package GeoDirectory
874 
+	 * @global object $wpdb WordPress Database object.
875 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
876 
+	 * @param int $post_id The post ID.
877 
+	 * @param string $meta_key The meta key to retrieve.
878 
+	 * @param bool $single Optional. Whether to return a single value. Default false.
879 
+	 * @todo single variable not yet implemented.
880 
+	 * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.
881 
+	 */
882 
+	function geodir_get_post_meta($post_id, $meta_key, $single = false)
883 
+	{
884 
+		if (!$post_id) {
885 
+			return false;
886 
+		}
887 
+		global $wpdb, $plugin_prefix;
888 
+
889 
+		$all_postypes = geodir_get_posttypes();
890 
+
891 
+		$post_type = get_post_type($post_id);
892 
+
893 
+		if (!in_array($post_type, $all_postypes))
894 
+			return false;
895 
+
896 
+		$table = $plugin_prefix . $post_type . '_detail';
897 
+
898 
+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
899 
+			$meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
900 
+			if ($meta_value && $meta_value !== '') {
901 
+				return maybe_serialize($meta_value);
902 
+			} else
903 
+				return $meta_value;
904 
+		} else {
905 
+			return false;
906 
+		}
907 
+	}
908 908 
 }
909 909
910 910
911 911 
 if (!function_exists('geodir_save_post_images')) {
912 
-    /**
913 
-     * Save post attachments.
914 
-     *
915 
-     * @since 1.0.0
916 
-     * @package GeoDirectory
917 
-     * @global object $wpdb WordPress Database object.
918 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
919 
-     * @global object $current_user Current user object.
920 
-     * @param int $post_id The post ID.
921 
-     * @param array $post_image Post image urls as an array.
922 
-     * @param bool $dummy Optional. Is this a dummy listing? Default false.
923 
-     */
924 
-    function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)
925 
-    {
912 
+	/**
913 
+	 * Save post attachments.
914 
+	 *
915 
+	 * @since 1.0.0
916 
+	 * @package GeoDirectory
917 
+	 * @global object $wpdb WordPress Database object.
918 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
919 
+	 * @global object $current_user Current user object.
920 
+	 * @param int $post_id The post ID.
921 
+	 * @param array $post_image Post image urls as an array.
922 
+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.
923 
+	 */
924 
+	function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)
925 
+	{
926 926
927 927
928 
-        global $wpdb, $plugin_prefix, $current_user;
928 
+		global $wpdb, $plugin_prefix, $current_user;
929 929
930 
-        $post_type = get_post_type($post_id);
930 
+		$post_type = get_post_type($post_id);
931 931
932 
-        $table = $plugin_prefix . $post_type . '_detail';
932 
+		$table = $plugin_prefix . $post_type . '_detail';
933 933
934 
-        $post_images = geodir_get_images($post_id);
934 
+		$post_images = geodir_get_images($post_id);
935 935
936 
-        $wpdb->query(
937 
-            $wpdb->prepare(
938 
-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",
939 
-                array($post_id)
940 
-            )
941 
-        );
936 
+		$wpdb->query(
937 
+			$wpdb->prepare(
938 
+				"UPDATE " . $table . " SET featured_image = '' where post_id =%d",
939 
+				array($post_id)
940 
+			)
941 
+		);
942 942
943 
-        $invalid_files = $post_images;
944 
-        $valid_file_ids = array();
945 
-        $valid_files_condition = '';
946 
-        $geodir_uploaddir = '';
943 
+		$invalid_files = $post_images;
944 
+		$valid_file_ids = array();
945 
+		$valid_files_condition = '';
946 
+		$geodir_uploaddir = '';
947 947
948 
-        $remove_files = array();
948 
+		$remove_files = array();
949 949
950 
-        if (!empty($post_image)) {
950 
+		if (!empty($post_image)) {
951 951
952 
-            $uploads = wp_upload_dir();
953 
-            $uploads_dir = $uploads['path'];
952 
+			$uploads = wp_upload_dir();
953 
+			$uploads_dir = $uploads['path'];
954 954
955 
-            $geodir_uploadpath = $uploads['path'];
956 
-            $geodir_uploadurl = $uploads['url'];
957 
-            $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';
955 
+			$geodir_uploadpath = $uploads['path'];
956 
+			$geodir_uploadurl = $uploads['url'];
957 
+			$sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';
958 958
959 
-            $invalid_files = array();
960 
-            $postcurr_images = array();
959 
+			$invalid_files = array();
960 
+			$postcurr_images = array();
961 961
962 
-            for ($m = 0; $m < count($post_image); $m++) {
963 
-                $menu_order = $m + 1;
962 
+			for ($m = 0; $m < count($post_image); $m++) {
963 
+				$menu_order = $m + 1;
964 964
965 
-                $file_path = '';
966 
-                /* --------- start ------- */
965 
+				$file_path = '';
966 
+				/* --------- start ------- */
967 967
968 
-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
968 
+				$split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
969 969
970 
-                $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
970 
+				$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
971 971
972 972
973 
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
973 
+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
974 974
975 
-                    /* --------- end ------- */
976 
-                    $curr_img_url = $post_image[$m];
975 
+					/* --------- end ------- */
976 
+					$curr_img_url = $post_image[$m];
977 977
978 
-                    $image_name_arr = explode('/', $curr_img_url);
978 
+					$image_name_arr = explode('/', $curr_img_url);
979 979
980 
-                    $count_image_name_arr = count($image_name_arr) - 2;
980 
+					$count_image_name_arr = count($image_name_arr) - 2;
981 981
982 
-                    $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;
982 
+					$count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;
983 983
984 
-                    $curr_img_dir = $image_name_arr[$count_image_name_arr];
984 
+					$curr_img_dir = $image_name_arr[$count_image_name_arr];
985 985
986 
-                    $filename = end($image_name_arr);
987 
-                    if (strpos($filename, '?') !== false) {
988 
-                        list($filename) = explode('?', $filename);
989 
-                    }
986 
+					$filename = end($image_name_arr);
987 
+					if (strpos($filename, '?') !== false) {
988 
+						list($filename) = explode('?', $filename);
989 
+					}
990 990
991 
-                    $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);
992 
-                    $curr_img_dir = str_replace($filename, "", $curr_img_dir);
991 
+					$curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);
992 
+					$curr_img_dir = str_replace($filename, "", $curr_img_dir);
993 993
994 
-                    $img_name_arr = explode('.', $filename);
994 
+					$img_name_arr = explode('.', $filename);
995 995
996 
-                    $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;
997 
-                    if (!empty($img_name_arr) && count($img_name_arr) > 2) {
998 
-                        $new_img_name_arr = $img_name_arr;
999 
-                        if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
1000 
-                            unset($new_img_name_arr[count($img_name_arr) - 1]);
1001 
-                            $file_title = implode('.', $new_img_name_arr);
1002 
-                        }
1003 
-                    }
1004 
-                    $file_title = sanitize_file_name($file_title);
1005 
-                    $file_name = sanitize_file_name($filename);
996 
+					$file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;
997 
+					if (!empty($img_name_arr) && count($img_name_arr) > 2) {
998 
+						$new_img_name_arr = $img_name_arr;
999 
+						if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
1000 
+							unset($new_img_name_arr[count($img_name_arr) - 1]);
1001 
+							$file_title = implode('.', $new_img_name_arr);
1002 
+						}
1003 
+					}
1004 
+					$file_title = sanitize_file_name($file_title);
1005 
+					$file_name = sanitize_file_name($filename);
1006 1006
1007 
-                    $arr_file_type = wp_check_filetype($filename);
1007 
+					$arr_file_type = wp_check_filetype($filename);
1008 1008
1009 
-                    $uploaded_file_type = $arr_file_type['type'];
1009 
+					$uploaded_file_type = $arr_file_type['type'];
1010 1010
1011 
-                    // Set an array containing a list of acceptable formats
1012 
-                    $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
1011 
+					// Set an array containing a list of acceptable formats
1012 
+					$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
1013 1013
1014 
-                    // If the uploaded file is the right format
1015 
-                    if (in_array($uploaded_file_type, $allowed_file_types)) {
1016 
-                        if (!function_exists('wp_handle_upload')) {
1017 
-                            require_once(ABSPATH . 'wp-admin/includes/file.php');
1018 
-                        }
1014 
+					// If the uploaded file is the right format
1015 
+					if (in_array($uploaded_file_type, $allowed_file_types)) {
1016 
+						if (!function_exists('wp_handle_upload')) {
1017 
+							require_once(ABSPATH . 'wp-admin/includes/file.php');
1018 
+						}
1019 1019
1020 
-                        if (!is_dir($geodir_uploadpath)) {
1021 
-                            mkdir($geodir_uploadpath);
1022 
-                        }
1020 
+						if (!is_dir($geodir_uploadpath)) {
1021 
+							mkdir($geodir_uploadpath);
1022 
+						}
1023 1023
1024 
-                        $external_img = false;
1025 
-                        if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
1026 
-                        } else {
1027 
-                            $external_img = true;
1028 
-                        }
1024 
+						$external_img = false;
1025 
+						if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
1026 
+						} else {
1027 
+							$external_img = true;
1028 
+						}
1029 1029
1030 
-                        if ($dummy || $external_img) {
1031 
-                            $uploaded_file = array();
1032 
-                            $uploaded = (array)fetch_remote_file($curr_img_url);
1030 
+						if ($dummy || $external_img) {
1031 
+							$uploaded_file = array();
1032 
+							$uploaded = (array)fetch_remote_file($curr_img_url);
1033 1033
1034 
-                            if (isset($uploaded['error']) && empty($uploaded['error'])) {
1035 
-                                $new_name = basename($uploaded['file']);
1036 
-                                $uploaded_file = $uploaded;
1037 
-                            }else{
1038 
-                                print_r($uploaded);exit;
1039 
-                            }
1040 
-                            $external_img = false;
1041 
-                        } else {
1042 
-                            $new_name = $post_id . '_' . $file_name;
1034 
+							if (isset($uploaded['error']) && empty($uploaded['error'])) {
1035 
+								$new_name = basename($uploaded['file']);
1036 
+								$uploaded_file = $uploaded;
1037 
+							}else{
1038 
+								print_r($uploaded);exit;
1039 
+							}
1040 
+							$external_img = false;
1041 
+						} else {
1042 
+							$new_name = $post_id . '_' . $file_name;
1043 1043
1044 
-                            if ($curr_img_dir == $sub_dir) {
1045 
-                                $img_path = $geodir_uploadpath . '/' . $filename;
1046 
-                                $img_url = $geodir_uploadurl . '/' . $filename;
1047 
-                            } else {
1048 
-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1049 
-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1050 
-                            }
1044 
+							if ($curr_img_dir == $sub_dir) {
1045 
+								$img_path = $geodir_uploadpath . '/' . $filename;
1046 
+								$img_url = $geodir_uploadurl . '/' . $filename;
1047 
+							} else {
1048 
+								$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1049 
+								$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1050 
+							}
1051 1051
1052 
-                            $uploaded_file = '';
1052 
+							$uploaded_file = '';
1053 1053
1054 
-                            if (file_exists($img_path)) {
1055 
-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1056 
-                                $file_path = '';
1057 
-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
1058 
-                                $uploaded_file = true;
1059 
-                                $file_path = $curr_img_dir . '/' . $filename;
1060 
-                            }
1054 
+							if (file_exists($img_path)) {
1055 
+								$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1056 
+								$file_path = '';
1057 
+							} else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
1058 
+								$uploaded_file = true;
1059 
+								$file_path = $curr_img_dir . '/' . $filename;
1060 
+							}
1061 1061
1062 
-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
1063 
-                                unlink($img_path);
1064 
-                        }
1062 
+							if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
1063 
+								unlink($img_path);
1064 
+						}
1065 1065
1066 
-                        if (!empty($uploaded_file)) {
1067 
-                            if (!isset($file_path) || !$file_path) {
1068 
-                                $file_path = $sub_dir . '/' . $new_name;
1069 
-                            }
1066 
+						if (!empty($uploaded_file)) {
1067 
+							if (!isset($file_path) || !$file_path) {
1068 
+								$file_path = $sub_dir . '/' . $new_name;
1069 
+							}
1070 1070
1071 
-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
1071 
+							$postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
1072 1072
1073 
-                            if ($menu_order == 1) {
1073 
+							if ($menu_order == 1) {
1074 1074
1075 
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1075 
+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1076 1076
1077 
-                            }
1077 
+							}
1078 1078
1079 
-                            // Set up options array to add this file as an attachment
1080 
-                            $attachment = array();
1081 
-                            $attachment['post_id'] = $post_id;
1082 
-                            $attachment['title'] = $file_title;
1083 
-                            $attachment['content'] = '';
1084 
-                            $attachment['file'] = $file_path;
1085 
-                            $attachment['mime_type'] = $uploaded_file_type;
1086 
-                            $attachment['menu_order'] = $menu_order;
1087 
-                            $attachment['is_featured'] = 0;
1079 
+							// Set up options array to add this file as an attachment
1080 
+							$attachment = array();
1081 
+							$attachment['post_id'] = $post_id;
1082 
+							$attachment['title'] = $file_title;
1083 
+							$attachment['content'] = '';
1084 
+							$attachment['file'] = $file_path;
1085 
+							$attachment['mime_type'] = $uploaded_file_type;
1086 
+							$attachment['menu_order'] = $menu_order;
1087 
+							$attachment['is_featured'] = 0;
1088 1088
1089 
-                            $attachment_set = '';
1089 
+							$attachment_set = '';
1090 1090
1091 
-                            foreach ($attachment as $key => $val) {
1092 
-                                if ($val != '')
1093 
-                                    $attachment_set .= $key . " = '" . $val . "', ";
1094 
-                            }
1091 
+							foreach ($attachment as $key => $val) {
1092 
+								if ($val != '')
1093 
+									$attachment_set .= $key . " = '" . $val . "', ";
1094 
+							}
1095 1095
1096 
-                            $attachment_set = trim($attachment_set, ", ");
1096 
+							$attachment_set = trim($attachment_set, ", ");
1097 
+
1098 
+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
1097 1099
1098 
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
1100 
+							$valid_file_ids[] = $wpdb->insert_id;
1101 
+						}
1099 1102
1100 
-                            $valid_file_ids[] = $wpdb->insert_id;
1101 
-                        }
1103 
+					}
1102 1104
1103 
-                    }
1104 1105
1106 
+				} else {
1107 
+					$valid_file_ids[] = $find_image;
1105 1108
1106 
-                } else {
1107 
-                    $valid_file_ids[] = $find_image;
1108 
-
1109 
-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
1109 
+					$postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
1110 1110
1111 
-                    $wpdb->query(
1112 
-                        $wpdb->prepare(
1113 
-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
1114 
-                            array($menu_order, $split_img_path[1], $post_id)
1115 
-                        )
1116 
-                    );
1111 
+					$wpdb->query(
1112 
+						$wpdb->prepare(
1113 
+							"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
1114 
+							array($menu_order, $split_img_path[1], $post_id)
1115 
+						)
1116 
+					);
1117 1117
1118 
-                    if ($menu_order == 1)
1119 
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1118 
+					if ($menu_order == 1)
1119 
+						$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1120 1120
1121 
-                }
1121 
+				}
1122 1122
1123 1123
1124 
-            }
1124 
+			}
1125 1125
1126 
-            if (!empty($valid_file_ids)) {
1126 
+			if (!empty($valid_file_ids)) {
1127 1127
1128 
-                $remove_files = $valid_file_ids;
1128 
+				$remove_files = $valid_file_ids;
1129 1129
1130 
-                $remove_files_length = count($remove_files);
1131 
-                $remove_files_format = array_fill(0, $remove_files_length, '%d');
1132 
-                $format = implode(',', $remove_files_format);
1133 
-                $valid_files_condition = " ID NOT IN ($format) AND ";
1130 
+				$remove_files_length = count($remove_files);
1131 
+				$remove_files_format = array_fill(0, $remove_files_length, '%d');
1132 
+				$format = implode(',', $remove_files_format);
1133 
+				$valid_files_condition = " ID NOT IN ($format) AND ";
1134 1134
1135 
-            }
1135 
+			}
1136 1136
1137 
-            //Get and remove all old images of post from database to set by new order
1137 
+			//Get and remove all old images of post from database to set by new order
1138 1138
1139 
-            if (!empty($post_images)) {
1139 
+			if (!empty($post_images)) {
1140 1140
1141 
-                foreach ($post_images as $img) {
1141 
+				foreach ($post_images as $img) {
1142 1142
1143 
-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
1143 
+					if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
1144 1144
1145 
-                        $invalid_files[] = (object)array('src' => $img->src);
1145 
+						$invalid_files[] = (object)array('src' => $img->src);
1146 1146
1147 
-                    }
1147 
+					}
1148 1148
1149 
-                }
1149 
+				}
1150 1150
1151 
-            }
1151 
+			}
1152 1152
1153 
-            $invalid_files = (object)$invalid_files;
1154 
-        }
1153 
+			$invalid_files = (object)$invalid_files;
1154 
+		}
1155 1155
1156 
-        $remove_files[] = $post_id;
1156 
+		$remove_files[] = $post_id;
1157 1157
1158 
-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1158 
+		$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1159 1159
1160 
-        if (!empty($invalid_files))
1161 
-            geodir_remove_attachments($invalid_files);
1162 
-    }
1160 
+		if (!empty($invalid_files))
1161 
+			geodir_remove_attachments($invalid_files);
1162 
+	}
1163 1163
1164 1164 
 }
1165 1165 
 

@@ -1173,12 +1173,12 @@  discard block
 
 block discarded – undo
1173 1173 
 function geodir_remove_temp_images()
1174 1174 
 {
1175 1175
1176 
-    global $current_user;
1176 
+	global $current_user;
1177 1177
1178 
-    $uploads = wp_upload_dir();
1179 
-    $uploads_dir = $uploads['path'];
1178 
+	$uploads = wp_upload_dir();
1179 
+	$uploads_dir = $uploads['path'];
1180 1180
1181 
-    /*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
1181 
+	/*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
1182 1182
1183 1183 
 			$dirPath = $uploads_dir.'/temp_'.$current_user->data->ID;
1184 1184 
 			if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {

@@ -1195,8 +1195,8 @@  discard block
 
 block discarded – undo
1195 1195 
 			rmdir($dirPath);
1196 1196 
 	}	*/
1197 1197
1198 
-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;
1199 
-    geodir_delete_directory($dirname);
1198 
+	$dirname = $uploads_dir . '/temp_' . $current_user->ID;
1199 
+	geodir_delete_directory($dirname);
1200 1200 
 }
1201 1201
1202 1202 
 

@@ -1210,131 +1210,131 @@  discard block
 
 block discarded – undo
1210 1210 
  */
1211 1211 
 function geodir_delete_directory($dirname)
1212 1212 
 {
1213 
-    $dir_handle = '';
1214 
-    if (is_dir($dirname))
1215 
-        $dir_handle = opendir($dirname);
1216 
-    if (!$dir_handle)
1217 
-        return false;
1218 
-    while ($file = readdir($dir_handle)) {
1219 
-        if ($file != "." && $file != "..") {
1220 
-            if (!is_dir($dirname . "/" . $file))
1221 
-                unlink($dirname . "/" . $file);
1222 
-            else
1223 
-                geodir_delete_directory($dirname . '/' . $file);
1224 
-        }
1225 
-    }
1226 
-    closedir($dir_handle);
1227 
-    rmdir($dirname);
1228 
-    return true;
1213 
+	$dir_handle = '';
1214 
+	if (is_dir($dirname))
1215 
+		$dir_handle = opendir($dirname);
1216 
+	if (!$dir_handle)
1217 
+		return false;
1218 
+	while ($file = readdir($dir_handle)) {
1219 
+		if ($file != "." && $file != "..") {
1220 
+			if (!is_dir($dirname . "/" . $file))
1221 
+				unlink($dirname . "/" . $file);
1222 
+			else
1223 
+				geodir_delete_directory($dirname . '/' . $file);
1224 
+		}
1225 
+	}
1226 
+	closedir($dir_handle);
1227 
+	rmdir($dirname);
1228 
+	return true;
1229 1229
1230 1230 
 }
1231 1231
1232 1232
1233 1233 
 if (!function_exists('geodir_remove_attachments')) {
1234 
-    /**
1235 
-     * Remove post attachments.
1236 
-     *
1237 
-     * @since 1.0.0
1238 
-     * @package GeoDirectory
1239 
-     * @param array $postcurr_images Array of image objects.
1240 
-     */
1241 
-    function geodir_remove_attachments($postcurr_images = array())
1242 
-    {
1243 
-        // Unlink all past images of post
1244 
-        if (!empty($postcurr_images)) {
1245 
-
1246 
-            $uploads = wp_upload_dir();
1247 
-            $uploads_dir = $uploads['path'];
1248 
-
1249 
-            foreach ($postcurr_images as $postimg) {
1250 
-                $image_name_arr = explode('/', $postimg->src);
1251 
-                $filename = end($image_name_arr);
1252 
-                if (file_exists($uploads_dir . '/' . $filename))
1253 
-                    unlink($uploads_dir . '/' . $filename);
1254 
-            }
1255 
-
1256 
-        } // endif
1257 
-        // Unlink all past images of post end
1258 
-    }
1234 
+	/**
1235 
+	 * Remove post attachments.
1236 
+	 *
1237 
+	 * @since 1.0.0
1238 
+	 * @package GeoDirectory
1239 
+	 * @param array $postcurr_images Array of image objects.
1240 
+	 */
1241 
+	function geodir_remove_attachments($postcurr_images = array())
1242 
+	{
1243 
+		// Unlink all past images of post
1244 
+		if (!empty($postcurr_images)) {
1245 
+
1246 
+			$uploads = wp_upload_dir();
1247 
+			$uploads_dir = $uploads['path'];
1248 
+
1249 
+			foreach ($postcurr_images as $postimg) {
1250 
+				$image_name_arr = explode('/', $postimg->src);
1251 
+				$filename = end($image_name_arr);
1252 
+				if (file_exists($uploads_dir . '/' . $filename))
1253 
+					unlink($uploads_dir . '/' . $filename);
1254 
+			}
1255 
+
1256 
+		} // endif
1257 
+		// Unlink all past images of post end
1258 
+	}
1259 1259 
 }
1260 1260
1261 1261 
 if (!function_exists('geodir_get_featured_image')) {
1262 
-    /**
1263 
-     * Gets the post featured image.
1264 
-     *
1265 
-     * @since 1.0.0
1266 
-     * @package GeoDirectory
1267 
-     * @global object $wpdb WordPress Database object.
1268 
-     * @global object $post The current post object.
1269 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
1270 
-     * @param int|string $post_id The post ID.
1271 
-     * @param string $size Optional. Thumbnail size. Default: thumbnail.
1272 
-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
1273 
-     * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.
1274 
-     * @return bool|object Image details as an object.
1275 
-     */
1276 
-    function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)
1277 
-    {
1278 
-
1279 
-        /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail
1262 
+	/**
1263 
+	 * Gets the post featured image.
1264 
+	 *
1265 
+	 * @since 1.0.0
1266 
+	 * @package GeoDirectory
1267 
+	 * @global object $wpdb WordPress Database object.
1268 
+	 * @global object $post The current post object.
1269 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
1270 
+	 * @param int|string $post_id The post ID.
1271 
+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.
1272 
+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
1273 
+	 * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.
1274 
+	 * @return bool|object Image details as an object.
1275 
+	 */
1276 
+	function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)
1277 
+	{
1278 
+
1279 
+		/*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail
1280 1280 
         $img_arr['path'] = '';
1281 1281 
         $img_arr['width'] = '';
1282 1282 
         $img_arr['height'] = '';
1283 1283 
         $img_arr['title'] = '';
1284 1284 
         return (object)$img_arr;*/
1285 
-        global $wpdb, $plugin_prefix, $post;
1285 
+		global $wpdb, $plugin_prefix, $post;
1286 
+
1287 
+		if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
1288 
+			$post_type = $post->post_type;
1289 
+		} else {
1290 
+			$post_type = get_post_type($post_id);
1291 
+		}
1292 
+
1293 
+		if (!in_array($post_type, geodir_get_posttypes())) {
1294 
+			return false;// if not a GD CPT return;
1295 
+		}
1296 
+
1297 
+
1298 
+		/**
1299 
+		 * Filter to force the list images to be smaller.
1300 
+		 * @since 1.6.18
1301 
+		 */
1302 
+		if( $size=='list-thumb' && apply_filters('geodir_use_small_list_img',false) ){
1303 
+			$fimg = get_the_post_thumbnail_url($post_id,'medium');
1304 
+			if($fimg){
1305 
+				$uploads = wp_upload_dir();
1306 
+				$uploads_baseurl = $uploads['baseurl'];
1307 
+				$file = str_replace($uploads_baseurl,'',$fimg);
1308 
+			}
1309 
+		}
1310 
+
1311 
+		$table = $plugin_prefix . $post_type . '_detail';
1286 1312
1287 
-        if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
1288 
-            $post_type = $post->post_type;
1289 
-        } else {
1290 
-            $post_type = get_post_type($post_id);
1291 
-        }
1313 
+		if (!$file) {
1314 
+			if (isset($post->featured_image)) {
1315 
+				$file = $post->featured_image;
1316 
+			} else {
1317 
+				$file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
1318 
+			}
1319 
+		}
1320 
+
1321 
+		if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
1322 
+			$img_arr = array();
1292 1323
1293 
-        if (!in_array($post_type, geodir_get_posttypes())) {
1294 
-            return false;// if not a GD CPT return;
1295 
-        }
1324 
+			$file_info = pathinfo($file);
1325 
+			$sub_dir = '';
1326 
+			if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
1327 
+				$sub_dir = stripslashes_deep($file_info['dirname']);
1328 
+			}
1296 1329
1330 
+			$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
1331 
+			$uploads_baseurl = $uploads['baseurl'];
1332 
+			$uploads_path = $uploads['path'];
1297 1333
1298 
-        /**
1299 
-         * Filter to force the list images to be smaller.
1300 
-         * @since 1.6.18
1301 
-         */
1302 
-        if( $size=='list-thumb' && apply_filters('geodir_use_small_list_img',false) ){
1303 
-            $fimg = get_the_post_thumbnail_url($post_id,'medium');
1304 
-            if($fimg){
1305 
-                $uploads = wp_upload_dir();
1306 
-                $uploads_baseurl = $uploads['baseurl'];
1307 
-                $file = str_replace($uploads_baseurl,'',$fimg);
1308 
-            }
1309 
-        }
1310 
-
1311 
-        $table = $plugin_prefix . $post_type . '_detail';
1312 
-
1313 
-        if (!$file) {
1314 
-            if (isset($post->featured_image)) {
1315 
-                $file = $post->featured_image;
1316 
-            } else {
1317 
-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
1318 
-            }
1319 
-        }
1320 
-
1321 
-        if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
1322 
-            $img_arr = array();
1323 
-
1324 
-            $file_info = pathinfo($file);
1325 
-            $sub_dir = '';
1326 
-            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
1327 
-                $sub_dir = stripslashes_deep($file_info['dirname']);
1328 
-            }
1329 
-
1330 
-            $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
1331 
-            $uploads_baseurl = $uploads['baseurl'];
1332 
-            $uploads_path = $uploads['path'];
1333 
-
1334 
-            $file_name = $file_info['basename'];
1335 
-
1336 
-            $uploads_url = $uploads_baseurl . $sub_dir;
1337 
-            /*
1334 
+			$file_name = $file_info['basename'];
1335 
+
1336 
+			$uploads_url = $uploads_baseurl . $sub_dir;
1337 
+			/*
1338 1338 
              * Allows the filter of image src for such things as CDN change.
1339 1339 
              *
1340 1340 
              * @since 1.5.7

@@ -1343,158 +1343,158 @@  discard block
 
 block discarded – undo
1343 1343 
              * @param string $uploads_url The server upload directory url.
1344 1344 
              * @param string $uploads_baseurl The uploads dir base url.
1345 1345 
              */
1346 
-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1347 
-            $img_arr['path'] = $uploads_path . '/' . $file_name;
1348 
-            $width = 0;
1349 
-            $height = 0;
1350 
-            if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
1351 
-                $imagesize = getimagesize($img_arr['path']);
1352 
-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1353 
-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1354 
-            }
1355 
-            $img_arr['width'] = $width;
1356 
-            $img_arr['height'] = $height;
1357 
-            $img_arr['title'] = '';
1358 
-        } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
1359 
-            foreach ($post_images as $image) {
1360 
-                return $image;
1361 
-            }
1362 
-        } else if ($no_image) {
1363 
-            $img_arr = array();
1364 
-
1365 
-            $default_img = '';
1366 
-            if (isset($post->default_category) && $post->default_category) {
1367 
-                $default_cat = $post->default_category;
1368 
-            } else {
1369 
-                $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1370 
-            }
1371 
-
1372 
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1373 
-                $default_img = $default_catimg['src'];
1374 
-            elseif ($no_image) {
1375 
-                $default_img = get_option('geodir_listing_no_img');
1376 
-            }
1377 
-
1378 
-            if (!empty($default_img)) {
1379 
-                $uploads = wp_upload_dir(); // Array of key => value pairs
1380 
-                $uploads_baseurl = $uploads['baseurl'];
1381 
-                $uploads_path = $uploads['path'];
1382 
-
1383 
-                $img_arr = array();
1384 
-
1385 
-                $file_info = pathinfo($default_img);
1386 
-
1387 
-                $file_name = $file_info['basename'];
1388 
-
1389 
-                $img_arr['src'] = $default_img;
1390 
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
1391 
-
1392 
-                $width = 0;
1393 
-                $height = 0;
1394 
-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
1395 
-                    $imagesize = getimagesize($img_arr['path']);
1396 
-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1397 
-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1398 
-                }
1399 
-                $img_arr['width'] = $width;
1400 
-                $img_arr['height'] = $height;
1401 
-
1402 
-                $img_arr['title'] = ''; // add the title to the array
1403 
-            }
1404 
-        }
1405 
-
1406 
-        if (!empty($img_arr))
1407 
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
1408 
-        else
1409 
-            return false;
1410 
-    }
1346 
+			$img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1347 
+			$img_arr['path'] = $uploads_path . '/' . $file_name;
1348 
+			$width = 0;
1349 
+			$height = 0;
1350 
+			if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
1351 
+				$imagesize = getimagesize($img_arr['path']);
1352 
+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1353 
+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1354 
+			}
1355 
+			$img_arr['width'] = $width;
1356 
+			$img_arr['height'] = $height;
1357 
+			$img_arr['title'] = '';
1358 
+		} elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
1359 
+			foreach ($post_images as $image) {
1360 
+				return $image;
1361 
+			}
1362 
+		} else if ($no_image) {
1363 
+			$img_arr = array();
1364 
+
1365 
+			$default_img = '';
1366 
+			if (isset($post->default_category) && $post->default_category) {
1367 
+				$default_cat = $post->default_category;
1368 
+			} else {
1369 
+				$default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1370 
+			}
1371 
+
1372 
+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1373 
+				$default_img = $default_catimg['src'];
1374 
+			elseif ($no_image) {
1375 
+				$default_img = get_option('geodir_listing_no_img');
1376 
+			}
1377 
+
1378 
+			if (!empty($default_img)) {
1379 
+				$uploads = wp_upload_dir(); // Array of key => value pairs
1380 
+				$uploads_baseurl = $uploads['baseurl'];
1381 
+				$uploads_path = $uploads['path'];
1382 
+
1383 
+				$img_arr = array();
1384 
+
1385 
+				$file_info = pathinfo($default_img);
1386 
+
1387 
+				$file_name = $file_info['basename'];
1388 
+
1389 
+				$img_arr['src'] = $default_img;
1390 
+				$img_arr['path'] = $uploads_path . '/' . $file_name;
1391 
+
1392 
+				$width = 0;
1393 
+				$height = 0;
1394 
+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
1395 
+					$imagesize = getimagesize($img_arr['path']);
1396 
+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1397 
+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1398 
+				}
1399 
+				$img_arr['width'] = $width;
1400 
+				$img_arr['height'] = $height;
1401 
+
1402 
+				$img_arr['title'] = ''; // add the title to the array
1403 
+			}
1404 
+		}
1405 
+
1406 
+		if (!empty($img_arr))
1407 
+			return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
1408 
+		else
1409 
+			return false;
1410 
+	}
1411 1411 
 }
1412 1412
1413 1413 
 if (!function_exists('geodir_show_featured_image')) {
1414 
-    /**
1415 
-     * Gets the post featured image.
1416 
-     *
1417 
-     * @since 1.0.0
1418 
-     * @package GeoDirectory
1419 
-     * @param int|string $post_id The post ID.
1420 
-     * @param string $size Optional. Thumbnail size. Default: thumbnail.
1421 
-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
1422 
-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
1423 
-     * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.
1424 
-     * @return bool|string Returns image html.
1425 
-     */
1426 
-    function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)
1427 
-    {
1428 
-        $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);
1429 
-
1430 
-        $html = geodir_show_image($image, $size, $no_image, false);
1431 
-
1432 
-        if (!empty($html) && $echo) {
1433 
-            echo $html;
1434 
-        } elseif (!empty($html)) {
1435 
-            return $html;
1436 
-        } else
1437 
-            return false;
1438 
-    }
1414 
+	/**
1415 
+	 * Gets the post featured image.
1416 
+	 *
1417 
+	 * @since 1.0.0
1418 
+	 * @package GeoDirectory
1419 
+	 * @param int|string $post_id The post ID.
1420 
+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.
1421 
+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
1422 
+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
1423 
+	 * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.
1424 
+	 * @return bool|string Returns image html.
1425 
+	 */
1426 
+	function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)
1427 
+	{
1428 
+		$image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);
1429 
+
1430 
+		$html = geodir_show_image($image, $size, $no_image, false);
1431 
+
1432 
+		if (!empty($html) && $echo) {
1433 
+			echo $html;
1434 
+		} elseif (!empty($html)) {
1435 
+			return $html;
1436 
+		} else
1437 
+			return false;
1438 
+	}
1439 1439 
 }
1440 1440
1441 1441 
 if (!function_exists('geodir_get_images')) {
1442 
-    /**
1443 
-     * Gets the post images.
1444 
-     *
1445 
-     * @since 1.0.0
1446 
-     * @package GeoDirectory
1447 
-     * @global object $wpdb WordPress Database object.
1448 
-     * @param int $post_id The post ID.
1449 
-     * @param string $img_size Optional. Thumbnail size.
1450 
-     * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.
1451 
-     * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.
1452 
-     * @param int|string $limit Optional. Number of images.
1453 
-     * @return array|bool Returns images as an array. Each item is an object.
1454 
-     */
1455 
-    function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')
1456 
-    {
1457 
-        global $wpdb;
1458 
-        if ($limit) {
1459 
-            $limit_q = " LIMIT $limit ";
1460 
-        } else {
1461 
-            $limit_q = '';
1462 
-        }
1463 
-        $not_featured = '';
1464 
-        $sub_dir = '';
1465 
-        if (!$add_featured)
1466 
-            $not_featured = " AND is_featured = 0 ";
1467 
-
1468 
-        $arrImages = $wpdb->get_results(
1469 
-            $wpdb->prepare(
1470 
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",
1471 
-                array('%image%', $post_id)
1472 
-            )
1473 
-        );
1474 
-
1475 
-        $counter = 0;
1476 
-        $return_arr = array();
1477 
-
1478 
-        if (!empty($arrImages)) {
1479 
-            foreach ($arrImages as $attechment) {
1480 
-
1481 
-                $img_arr = array();
1482 
-                $img_arr['id'] = $attechment->ID;
1483 
-                $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;
1484 
-
1485 
-                $file_info = pathinfo($attechment->file);
1486 
-
1487 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
1488 
-                    $sub_dir = stripslashes_deep($file_info['dirname']);
1489 
-
1490 
-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
1491 
-                $uploads_baseurl = $uploads['baseurl'];
1492 
-                $uploads_path = $uploads['path'];
1493 
-
1494 
-                $file_name = $file_info['basename'];
1495 
-
1496 
-                $uploads_url = $uploads_baseurl . $sub_dir;
1497 
-                /*
1442 
+	/**
1443 
+	 * Gets the post images.
1444 
+	 *
1445 
+	 * @since 1.0.0
1446 
+	 * @package GeoDirectory
1447 
+	 * @global object $wpdb WordPress Database object.
1448 
+	 * @param int $post_id The post ID.
1449 
+	 * @param string $img_size Optional. Thumbnail size.
1450 
+	 * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.
1451 
+	 * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.
1452 
+	 * @param int|string $limit Optional. Number of images.
1453 
+	 * @return array|bool Returns images as an array. Each item is an object.
1454 
+	 */
1455 
+	function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')
1456 
+	{
1457 
+		global $wpdb;
1458 
+		if ($limit) {
1459 
+			$limit_q = " LIMIT $limit ";
1460 
+		} else {
1461 
+			$limit_q = '';
1462 
+		}
1463 
+		$not_featured = '';
1464 
+		$sub_dir = '';
1465 
+		if (!$add_featured)
1466 
+			$not_featured = " AND is_featured = 0 ";
1467 
+
1468 
+		$arrImages = $wpdb->get_results(
1469 
+			$wpdb->prepare(
1470 
+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",
1471 
+				array('%image%', $post_id)
1472 
+			)
1473 
+		);
1474 
+
1475 
+		$counter = 0;
1476 
+		$return_arr = array();
1477 
+
1478 
+		if (!empty($arrImages)) {
1479 
+			foreach ($arrImages as $attechment) {
1480 
+
1481 
+				$img_arr = array();
1482 
+				$img_arr['id'] = $attechment->ID;
1483 
+				$img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;
1484 
+
1485 
+				$file_info = pathinfo($attechment->file);
1486 
+
1487 
+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
1488 
+					$sub_dir = stripslashes_deep($file_info['dirname']);
1489 
+
1490 
+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
1491 
+				$uploads_baseurl = $uploads['baseurl'];
1492 
+				$uploads_path = $uploads['path'];
1493 
+
1494 
+				$file_name = $file_info['basename'];
1495 
+
1496 
+				$uploads_url = $uploads_baseurl . $sub_dir;
1497 
+				/*
1498 1498 
                 * Allows the filter of image src for such things as CDN change.
1499 1499 
                 *
1500 1500 
                 * @since 1.5.7

@@ -1503,520 +1503,520 @@  discard block
 
 block discarded – undo
1503 1503 
                 * @param string $uploads_url The server upload directory url.
1504 1504 
                 * @param string $uploads_baseurl The uploads dir base url.
1505 1505 
                 */
1506 
-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1507 
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
1508 
-                $width = 0;
1509 
-                $height = 0;
1510 
-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
1511 
-                    $imagesize = getimagesize($img_arr['path']);
1512 
-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1513 
-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1514 
-                }
1515 
-                $img_arr['width'] = $width;
1516 
-                $img_arr['height'] = $height;
1517 
-
1518 
-                $img_arr['file'] = $file_name; // add the title to the array
1519 
-                $img_arr['title'] = $attechment->title; // add the title to the array
1520 
-                $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array
1521 
-                $img_arr['content'] = $attechment->content; // add the description to the array
1522 
-                $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
1523 
-
1524 
-                $return_arr[] = (object)$img_arr;
1525 
-
1526 
-                $counter++;
1527 
-            }
1528 
-            return (object)$return_arr;
1529 
-        } else if ($no_images) {
1530 
-            $default_img = '';
1531 
-            $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1532 
-            $post_type = get_post_type($post_id);
1533 
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1534 
-                $default_img = $default_catimg['src'];
1535 
-            elseif ($no_images) {
1536 
-                $default_img = get_option('geodir_listing_no_img');
1537 
-            }
1538 
-
1539 
-            if (!empty($default_img)) {
1540 
-                $uploads = wp_upload_dir(); // Array of key => value pairs
1506 
+				$img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1507 
+				$img_arr['path'] = $uploads_path . '/' . $file_name;
1508 
+				$width = 0;
1509 
+				$height = 0;
1510 
+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
1511 
+					$imagesize = getimagesize($img_arr['path']);
1512 
+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1513 
+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1514 
+				}
1515 
+				$img_arr['width'] = $width;
1516 
+				$img_arr['height'] = $height;
1517 
+
1518 
+				$img_arr['file'] = $file_name; // add the title to the array
1519 
+				$img_arr['title'] = $attechment->title; // add the title to the array
1520 
+				$img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array
1521 
+				$img_arr['content'] = $attechment->content; // add the description to the array
1522 
+				$img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
1523 
+
1524 
+				$return_arr[] = (object)$img_arr;
1525 
+
1526 
+				$counter++;
1527 
+			}
1528 
+			return (object)$return_arr;
1529 
+		} else if ($no_images) {
1530 
+			$default_img = '';
1531 
+			$default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1532 
+			$post_type = get_post_type($post_id);
1533 
+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1534 
+				$default_img = $default_catimg['src'];
1535 
+			elseif ($no_images) {
1536 
+				$default_img = get_option('geodir_listing_no_img');
1537 
+			}
1538 
+
1539 
+			if (!empty($default_img)) {
1540 
+				$uploads = wp_upload_dir(); // Array of key => value pairs
1541 1541
1542 
-                $image_path = $default_img;
1543 
-                if (!path_is_absolute($image_path)) {
1544 
-                    $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);
1545 
-                }
1546 
-
1547 
-                $file_info = pathinfo($default_img);
1548 
-                $file_name = $file_info['basename'];
1549 
-
1550 
-                $width = '';
1551 
-                $height = '';
1552 
-                if (is_file($image_path) && file_exists($image_path)) {
1553 
-                    $imagesize = getimagesize($image_path);
1554 
-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1555 
-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1556 
-                }
1542 
+				$image_path = $default_img;
1543 
+				if (!path_is_absolute($image_path)) {
1544 
+					$image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);
1545 
+				}
1546 
+
1547 
+				$file_info = pathinfo($default_img);
1548 
+				$file_name = $file_info['basename'];
1549 
+
1550 
+				$width = '';
1551 
+				$height = '';
1552 
+				if (is_file($image_path) && file_exists($image_path)) {
1553 
+					$imagesize = getimagesize($image_path);
1554 
+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1555 
+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1556 
+				}
1557 1557
1558 
-                $img_arr = array();
1559 
-                $img_arr['src'] = $default_img;
1560 
-                $img_arr['path'] = $image_path;
1561 
-                $img_arr['width'] = $width;
1562 
-                $img_arr['height'] = $height;
1563 
-                $img_arr['file'] = $file_name; // add the title to the array
1564 
-                $img_arr['title'] = $file_info['filename']; // add the title to the array
1565 
-                $img_arr['content'] = $file_info['filename']; // add the description to the array
1566 
-
1567 
-                $return_arr[] = (object)$img_arr;
1568 
-
1569 
-                return $return_arr;
1570 
-            } else
1571 
-                return false;
1572 
-        }
1573 
-    }
1558 
+				$img_arr = array();
1559 
+				$img_arr['src'] = $default_img;
1560 
+				$img_arr['path'] = $image_path;
1561 
+				$img_arr['width'] = $width;
1562 
+				$img_arr['height'] = $height;
1563 
+				$img_arr['file'] = $file_name; // add the title to the array
1564 
+				$img_arr['title'] = $file_info['filename']; // add the title to the array
1565 
+				$img_arr['content'] = $file_info['filename']; // add the description to the array
1566 
+
1567 
+				$return_arr[] = (object)$img_arr;
1568 
+
1569 
+				return $return_arr;
1570 
+			} else
1571 
+				return false;
1572 
+		}
1573 
+	}
1574 1574 
 }
1575 1575
1576 1576 
 if (!function_exists('geodir_show_image')) {
1577 
-    /**
1578 
-     * Show image using image details.
1579 
-     *
1580 
-     * @since 1.0.0
1581 
-     * @package GeoDirectory
1582 
-     * @param array|object $request Image info either as an array or object.
1583 
-     * @param string $size Optional. Thumbnail size. Default: thumbnail.
1584 
-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
1585 
-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
1586 
-     * @return bool|string Returns image html.
1587 
-     */
1588 
-    function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)
1589 
-    {
1590 
-        $image = new stdClass();
1591 
-
1592 
-        $html = '';
1593 
-        if (!empty($request)) {
1594 
-            if (!is_object($request)){
1595 
-                $request = (object)$request;
1596 
-            }
1597 
-
1598 
-            if (isset($request->src) && !isset($request->path)) {
1599 
-                $request->path = $request->src;
1600 
-            }
1601 
-
1602 
-            /*
1577 
+	/**
1578 
+	 * Show image using image details.
1579 
+	 *
1580 
+	 * @since 1.0.0
1581 
+	 * @package GeoDirectory
1582 
+	 * @param array|object $request Image info either as an array or object.
1583 
+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.
1584 
+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
1585 
+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
1586 
+	 * @return bool|string Returns image html.
1587 
+	 */
1588 
+	function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)
1589 
+	{
1590 
+		$image = new stdClass();
1591 
+
1592 
+		$html = '';
1593 
+		if (!empty($request)) {
1594 
+			if (!is_object($request)){
1595 
+				$request = (object)$request;
1596 
+			}
1597 
+
1598 
+			if (isset($request->src) && !isset($request->path)) {
1599 
+				$request->path = $request->src;
1600 
+			}
1601 
+
1602 
+			/*
1603 1603 
              * getimagesize() works faster from path than url so we try and get path if we can.
1604 1604 
              */
1605 
-            $upload_dir = wp_upload_dir();
1606 
-            $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
1607 
-            $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
1608 
-            if (strpos($img_no_http, $upload_no_http) !== false) {
1609 
-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
1610 
-            }
1605 
+			$upload_dir = wp_upload_dir();
1606 
+			$img_no_http = str_replace(array("http://", "https://"), "", $request->path);
1607 
+			$upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
1608 
+			if (strpos($img_no_http, $upload_no_http) !== false) {
1609 
+				$request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
1610 
+			}
1611 1611
1612 
-            $width = 0;
1613 
-            $height = 0;
1614 
-            if (is_file($request->path) && file_exists($request->path)) {
1615 
-                $imagesize = getimagesize($request->path);
1616 
-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1617 
-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1618 
-            }
1619 
-
1620 
-            $image->src = $request->src;
1621 
-            $image->width = $width;
1622 
-            $image->height = $height;
1623 
-
1624 
-            $max_size = (object)geodir_get_imagesize($size);
1625 
-
1626 
-            if (!is_wp_error($max_size)) {
1627 
-                if ($image->width) {
1628 
-                    if ($image->height >= $image->width) {
1629 
-                        $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);
1630 
-                    } else if ($image->width < ($max_size->h)) {
1631 
-                        $width_per = round((($image->width / $max_size->w) * 100), 2);
1632 
-                    } else
1633 
-                        $width_per = 100;
1634 
-                }
1635 
-
1636 
-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
1637 
-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
1638 
-                } else {
1639 
-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
1640 
-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1641 
-                    }else{
1642 
-                        //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1643 
-                        //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';
1644 
-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
1645 
-
1646 
-                    }
1647 
-
1648 
-                }
1649 
-            }
1650 
-        }
1651 
-
1652 
-        if (!empty($html) && $echo) {
1653 
-            echo $html;
1654 
-        } elseif (!empty($html)) {
1655 
-            return $html;
1656 
-        } else
1657 
-            return false;
1658 
-    }
1659 
-}
1612 
+			$width = 0;
1613 
+			$height = 0;
1614 
+			if (is_file($request->path) && file_exists($request->path)) {
1615 
+				$imagesize = getimagesize($request->path);
1616 
+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
1617 
+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
1618 
+			}
1660 1619
1661 
-if (!function_exists('geodir_set_post_terms')) {
1662 
-    /**
1663 
-     * Set post Categories.
1664 
-     *
1665 
-     * @since 1.0.0
1666 
-     * @package GeoDirectory
1667 
-     * @global object $wpdb WordPress Database object.
1668 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
1669 
-     * @param int $post_id The post ID.
1670 
-     * @param array $terms An array of term objects.
1671 
-     * @param array $tt_ids An array of term taxonomy IDs.
1672 
-     * @param string $taxonomy Taxonomy slug.
1673 
-     */
1674 
-    function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)
1675 
-    {
1676 
-        global $wpdb, $plugin_prefix;
1620 
+			$image->src = $request->src;
1621 
+			$image->width = $width;
1622 
+			$image->height = $height;
1677 1623
1678 
-        $post_type = get_post_type($post_id);
1624 
+			$max_size = (object)geodir_get_imagesize($size);
1679 1625
1680 
-        $table = $plugin_prefix . $post_type . '_detail';
1626 
+			if (!is_wp_error($max_size)) {
1627 
+				if ($image->width) {
1628 
+					if ($image->height >= $image->width) {
1629 
+						$width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);
1630 
+					} else if ($image->width < ($max_size->h)) {
1631 
+						$width_per = round((($image->width / $max_size->w) * 100), 2);
1632 
+					} else
1633 
+						$width_per = 100;
1634 
+				}
1635 
+
1636 
+				if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
1637 
+					$html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
1638 
+				} else {
1639 
+					if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
1640 
+						$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1641 
+					}else{
1642 
+						//$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';
1643 
+						//$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';
1644 
+						$html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
1645 
+
1646 
+					}
1681 1647
1682 
-        if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
1648 
+				}
1649 
+			}
1650 
+		}
1651 
+
1652 
+		if (!empty($html) && $echo) {
1653 
+			echo $html;
1654 
+		} elseif (!empty($html)) {
1655 
+			return $html;
1656 
+		} else
1657 
+			return false;
1658 
+	}
1659 
+}
1683 1660
1684 
-            if ($taxonomy == $post_type . '_tags') {
1685 
-                if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
1686 
-                    geodir_save_post_meta($post_id, 'post_tags', $terms);
1687 
-                }
1688 
-            } elseif ($taxonomy == $post_type . 'category') {
1689 
-                $srcharr = array('"', '\\');
1690 
-                $replarr = array("&quot;", '');
1661 
+if (!function_exists('geodir_set_post_terms')) {
1662 
+	/**
1663 
+	 * Set post Categories.
1664 
+	 *
1665 
+	 * @since 1.0.0
1666 
+	 * @package GeoDirectory
1667 
+	 * @global object $wpdb WordPress Database object.
1668 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
1669 
+	 * @param int $post_id The post ID.
1670 
+	 * @param array $terms An array of term objects.
1671 
+	 * @param array $tt_ids An array of term taxonomy IDs.
1672 
+	 * @param string $taxonomy Taxonomy slug.
1673 
+	 */
1674 
+	function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)
1675 
+	{
1676 
+		global $wpdb, $plugin_prefix;
1677 
+
1678 
+		$post_type = get_post_type($post_id);
1679 
+
1680 
+		$table = $plugin_prefix . $post_type . '_detail';
1681 
+
1682 
+		if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
1683 
+
1684 
+			if ($taxonomy == $post_type . '_tags') {
1685 
+				if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
1686 
+					geodir_save_post_meta($post_id, 'post_tags', $terms);
1687 
+				}
1688 
+			} elseif ($taxonomy == $post_type . 'category') {
1689 
+				$srcharr = array('"', '\\');
1690 
+				$replarr = array("&quot;", '');
1691 1691
1692 
-                $post_obj = get_post($post_id);
1692 
+				$post_obj = get_post($post_id);
1693 1693
1694 
-                $cat_ids = array('0');
1695 
-                if (is_array($tt_ids))
1696 
-                    $cat_ids = $tt_ids;
1694 
+				$cat_ids = array('0');
1695 
+				if (is_array($tt_ids))
1696 
+					$cat_ids = $tt_ids;
1697 1697
1698 1698
1699 
-                if (!empty($cat_ids)) {
1700 
-                    $cat_ids_array = $cat_ids;
1701 
-                    $cat_ids_length = count($cat_ids_array);
1702 
-                    $cat_ids_format = array_fill(0, $cat_ids_length, '%d');
1703 
-                    $format = implode(',', $cat_ids_format);
1699 
+				if (!empty($cat_ids)) {
1700 
+					$cat_ids_array = $cat_ids;
1701 
+					$cat_ids_length = count($cat_ids_array);
1702 
+					$cat_ids_format = array_fill(0, $cat_ids_length, '%d');
1703 
+					$format = implode(',', $cat_ids_format);
1704 1704
1705 
-                    $cat_ids_array_del = $cat_ids_array;
1706 
-                    $cat_ids_array_del[] = $post_id;
1705 
+					$cat_ids_array_del = $cat_ids_array;
1706 
+					$cat_ids_array_del[] = $post_id;
1707 1707
1708 
-                    $wpdb->get_var(
1709 
-                        $wpdb->prepare(
1710 
-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
1711 
-                            $cat_ids_array_del
1712 
-                        )
1713 
-                    );
1708 
+					$wpdb->get_var(
1709 
+						$wpdb->prepare(
1710 
+							"DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
1711 
+							$cat_ids_array_del
1712 
+						)
1713 
+					);
1714 1714
1715 1715
1716 
-                    $post_term = $wpdb->get_col(
1717 
-                        $wpdb->prepare(
1718 
-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
1719 
-                            $cat_ids_array
1720 
-                        )
1721 
-                    );
1716 
+					$post_term = $wpdb->get_col(
1717 
+						$wpdb->prepare(
1718 
+							"SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
1719 
+							$cat_ids_array
1720 
+						)
1721 
+					);
1722 1722
1723 
-                }
1723 
+				}
1724 1724
1725 
-                $post_marker_json = '';
1725 
+				$post_marker_json = '';
1726 1726
1727 
-                if (!empty($post_term)):
1727 
+				if (!empty($post_term)):
1728 1728
1729 
-                    foreach ($post_term as $cat_id):
1729 
+					foreach ($post_term as $cat_id):
1730 1730
1731 
-                        $term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);
1732 
-                        $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';
1731 
+						$term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);
1732 
+						$term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';
1733 1733
1734 
-                        $post_title = $post_obj->title;
1735 
-                        $title = str_replace($srcharr, $replarr, $post_title);
1734 
+						$post_title = $post_obj->title;
1735 
+						$title = str_replace($srcharr, $replarr, $post_title);
1736 1736
1737 
-                        $lat = geodir_get_post_meta($post_id, 'post_latitude', true);
1738 
-                        $lng = geodir_get_post_meta($post_id, 'post_longitude', true);
1737 
+						$lat = geodir_get_post_meta($post_id, 'post_latitude', true);
1738 
+						$lng = geodir_get_post_meta($post_id, 'post_longitude', true);
1739 1739
1740 
-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
1741 
-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
1740 
+						$timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
1741 
+						$timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
1742 1742
1743 
-                        $json = '{';
1744 
-                        $json .= '"id":"' . $post_id . '",';
1745 
-                        $json .= '"lat_pos": "' . $lat . '",';
1746 
-                        $json .= '"long_pos": "' . $lng . '",';
1747 
-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
1748 
-                        $json .= '"icon":"' . $term_icon . '",';
1749 
-                        $json .= '"group":"catgroup' . $cat_id . '"';
1750 
-                        $json .= '}';
1743 
+						$json = '{';
1744 
+						$json .= '"id":"' . $post_id . '",';
1745 
+						$json .= '"lat_pos": "' . $lat . '",';
1746 
+						$json .= '"long_pos": "' . $lng . '",';
1747 
+						$json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
1748 
+						$json .= '"icon":"' . $term_icon . '",';
1749 
+						$json .= '"group":"catgroup' . $cat_id . '"';
1750 
+						$json .= '}';
1751 1751
1752 1752
1753 
-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))
1754 
-                            $post_marker_json = $json;
1753 
+						if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))
1754 
+							$post_marker_json = $json;
1755 1755
1756 1756
1757 
-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
1757 
+						if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
1758 1758
1759 
-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
1759 
+							$json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
1760 1760 
 										post_title = %s,
1761 1761 
 										json = %s
1762 1762 
 										WHERE post_id = %d AND cat_id = %d ",
1763 
-                                array($post_title, $json, $post_id, $cat_id));
1763 
+								array($post_title, $json, $post_id, $cat_id));
1764 1764
1765 
-                        } else {
1765 
+						} else {
1766 1766
1767 
-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
1767 
+							$json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
1768 1768 
 										post_id = %d,
1769 1769 
 										post_title = %s,
1770 1770 
 										cat_id = %d,
1771 1771 
 										json = %s",
1772 
-                                array($post_id, $post_title, $cat_id, $json));
1772 
+								array($post_id, $post_title, $cat_id, $json));
1773 1773
1774 
-                        }
1774 
+						}
1775 1775
1776 
-                        $wpdb->query($json_query);
1776 
+						$wpdb->query($json_query);
1777 1777
1778 
-                    endforeach;
1778 
+					endforeach;
1779 1779
1780 
-                endif;
1780 
+				endif;
1781 1781
1782 
-                if (!empty($post_term) && is_array($post_term)) {
1783 
-                    $categories = implode(',', $post_term);
1782 
+				if (!empty($post_term) && is_array($post_term)) {
1783 
+					$categories = implode(',', $post_term);
1784 1784
1785 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
1785 
+					if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
1786 1786
1787 
-                    if (empty($post_marker_json))
1788 
-                        $post_marker_json = isset($json) ? $json : '';
1787 
+					if (empty($post_marker_json))
1788 
+						$post_marker_json = isset($json) ? $json : '';
1789 1789
1790 
-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
1790 
+					if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
1791 1791
1792 
-                        $wpdb->query(
1793 
-                            $wpdb->prepare(
1794 
-                                "UPDATE " . $table . " SET
1792 
+						$wpdb->query(
1793 
+							$wpdb->prepare(
1794 
+								"UPDATE " . $table . " SET
1795 1795 
 								" . $taxonomy . " = %s,
1796 1796 
 								marker_json = %s
1797 1797 
 								where post_id = %d",
1798 
-                                array($categories, $post_marker_json, $post_id)
1799 
-                            )
1800 
-                        );
1798 
+								array($categories, $post_marker_json, $post_id)
1799 
+							)
1800 
+						);
1801 1801
1802 
-                        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
1802 
+						if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
1803 1803
1804 
-                            $categories = trim($categories, ',');
1804 
+							$categories = trim($categories, ',');
1805 1805
1806 
-                            if ($categories) {
1806 
+							if ($categories) {
1807 1807
1808 
-                                $categories = explode(',', $categories);
1808 
+								$categories = explode(',', $categories);
1809 1809
1810 
-                                $default_category = geodir_get_post_meta($post_id, 'default_category', true);
1810 
+								$default_category = geodir_get_post_meta($post_id, 'default_category', true);
1811 1811
1812 
-                                if (!in_array($default_category, $categories)) {
1812 
+								if (!in_array($default_category, $categories)) {
1813 1813
1814 
-                                    $wpdb->query(
1815 
-                                        $wpdb->prepare(
1816 
-                                            "UPDATE " . $table . " SET
1814 
+									$wpdb->query(
1815 
+										$wpdb->prepare(
1816 
+											"UPDATE " . $table . " SET
1817 1817 
 											default_category = %s
1818 1818 
 											where post_id = %d",
1819 
-                                            array($categories[0], $post_id)
1820 
-                                        )
1821 
-                                    );
1819 
+											array($categories[0], $post_id)
1820 
+										)
1821 
+									);
1822 1822
1823 
-                                    $default_category = $categories[0];
1823 
+									$default_category = $categories[0];
1824 1824
1825 
-                                }
1825 
+								}
1826 1826
1827 
-                                if ($default_category == '')
1828 
-                                    $default_category = $categories[0];
1827 
+								if ($default_category == '')
1828 
+									$default_category = $categories[0];
1829 1829
1830 
-                                geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');
1830 
+								geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');
1831 1831
1832 
-                            }
1832 
+							}
1833 1833
1834 
-                        }
1834 
+						}
1835 1835
1836 1836
1837 
-                    } else {
1837 
+					} else {
1838 1838
1839 
-                        $wpdb->query(
1840 
-                            $wpdb->prepare(
1841 
-                                "INSERT INTO " . $table . " SET
1839 
+						$wpdb->query(
1840 
+							$wpdb->prepare(
1841 
+								"INSERT INTO " . $table . " SET
1842 1842 
 								post_id = %d,
1843 1843 
 								" . $taxonomy . " = %s,
1844 1844 
 								marker_json = %s ",
1845 1845
1846 
-                                array($post_id, $categories, $post_marker_json)
1847 
-                            )
1848 
-                        );
1849 
-                    }
1850 
-                }
1851 
-            }
1852 
-        }
1853 
-    }
1846 
+								array($post_id, $categories, $post_marker_json)
1847 
+							)
1848 
+						);
1849 
+					}
1850 
+				}
1851 
+			}
1852 
+		}
1853 
+	}
1854 1854 
 }
1855 1855
1856 1856 
 if (!function_exists('geodir_get_infowindow_html')) {
1857 
-    /**
1858 
-     * Set post Map Marker info html.
1859 
-     *
1860 
-     * @since 1.0.0
1861 
-     * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".
1862 
-     * @since 1.6.16 Changes for disable review stars for certain post type.
1863 
-     * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info.
1864 
-     * @package GeoDirectory
1865 
-     * @global array $geodir_addon_list List of active GeoDirectory extensions.
1866 
-     * @global object $gd_session GeoDirectory Session object.
1867 
-     * @param object $postinfo_obj The post details object.
1868 
-     * @param string $post_preview Is this a post preview?.
1869 
-     * @global object $post WordPress Post object.
1870 
-     * @return mixed|string|void
1871 
-     */
1872 
-    function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
1873 
-        global $preview, $post, $gd_session;
1874 
-        $srcharr = array("'", "/", "-", '"', '\\');
1875 
-        $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
1876 
-
1877 
-        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
1878 
-            $ID = '';
1879 
-            $plink = '';
1880 
-
1881 
-            if (isset($postinfo_obj->pid)) {
1882 
-                $ID = $postinfo_obj->pid;
1883 
-                $plink = get_permalink($ID);
1884 
-            }
1885 
-
1886 
-            $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));
1887 
-            $lat = $postinfo_obj->post_latitude;
1888 
-            $lng = $postinfo_obj->post_longitude;
1889 
-        } else {
1890 
-            $ID = $postinfo_obj->post_id;
1891 
-            $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan
1892 
-            $title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08
1893 
-            $plink = get_permalink($ID);
1894 
-            $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));
1895 
-            $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));
1896 
-        }
1857 
+	/**
1858 
+	 * Set post Map Marker info html.
1859 
+	 *
1860 
+	 * @since 1.0.0
1861 
+	 * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".
1862 
+	 * @since 1.6.16 Changes for disable review stars for certain post type.
1863 
+	 * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info.
1864 
+	 * @package GeoDirectory
1865 
+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.
1866 
+	 * @global object $gd_session GeoDirectory Session object.
1867 
+	 * @param object $postinfo_obj The post details object.
1868 
+	 * @param string $post_preview Is this a post preview?.
1869 
+	 * @global object $post WordPress Post object.
1870 
+	 * @return mixed|string|void
1871 
+	 */
1872 
+	function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
1873 
+		global $preview, $post, $gd_session;
1874 
+		$srcharr = array("'", "/", "-", '"', '\\');
1875 
+		$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
1876 
+
1877 
+		if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
1878 
+			$ID = '';
1879 
+			$plink = '';
1880 
+
1881 
+			if (isset($postinfo_obj->pid)) {
1882 
+				$ID = $postinfo_obj->pid;
1883 
+				$plink = get_permalink($ID);
1884 
+			}
1885 
+
1886 
+			$title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));
1887 
+			$lat = $postinfo_obj->post_latitude;
1888 
+			$lng = $postinfo_obj->post_longitude;
1889 
+		} else {
1890 
+			$ID = $postinfo_obj->post_id;
1891 
+			$title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan
1892 
+			$title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08
1893 
+			$plink = get_permalink($ID);
1894 
+			$lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));
1895 
+			$lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));
1896 
+		}
1897 1897
1898 
-        // Some theme overwrites global gd listing $post
1899 
-        if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
1900 
-            $post = geodir_get_post_info($ID);
1901 
-        }
1898 
+		// Some theme overwrites global gd listing $post
1899 
+		if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
1900 
+			$post = geodir_get_post_info($ID);
1901 
+		}
1902 1902
1903 
-        $post_type = $ID ? get_post_type($ID) : '';
1904 
-
1905 
-        // filter field as per price package
1906 
-        global $geodir_addon_list;
1907 
-        if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
1908 
-            $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;
1909 
-            $field_name = 'geodir_contact';
1910 
-            if (!check_field_visibility($package_id, $field_name, $post_type)) {
1911 
-                $contact = '';
1912 
-            }
1913 
-
1914 
-            $field_name = 'geodir_timing';
1915 
-            if (!check_field_visibility($package_id, $field_name, $post_type)) {
1916 
-                $timing = '';
1917 
-            }
1918 
-        }
1919 
-
1920 
-        if ($lat && $lng) {
1921 
-            ob_start(); ?>
1903 
+		$post_type = $ID ? get_post_type($ID) : '';
1904 
+
1905 
+		// filter field as per price package
1906 
+		global $geodir_addon_list;
1907 
+		if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
1908 
+			$package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;
1909 
+			$field_name = 'geodir_contact';
1910 
+			if (!check_field_visibility($package_id, $field_name, $post_type)) {
1911 
+				$contact = '';
1912 
+			}
1913 
+
1914 
+			$field_name = 'geodir_timing';
1915 
+			if (!check_field_visibility($package_id, $field_name, $post_type)) {
1916 
+				$timing = '';
1917 
+			}
1918 
+		}
1919 
+
1920 
+		if ($lat && $lng) {
1921 
+			ob_start(); ?>
1922 1922 
             <div class="gd-bubble" style="">
1923 1923 
                 <div class="gd-bubble-inside">
1924 1924 
                     <?php
1925 
-                    $comment_count = '';
1926 
-                    $rating_star = '';
1927 
-                    if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
1928 
-                        $rating_star = '';
1929 
-                        $comment_count = geodir_get_review_count_total($ID);
1930 
-
1931 
-                        if (!$preview) {
1932 
-                            $post_avgratings = geodir_get_post_rating($ID);
1933 
-
1934 
-                            $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);
1935 
-
1936 
-                            /**
1937 
-                             * Filter to change rating stars
1938 
-                             *
1939 
-                             * You can use this filter to change Rating stars.
1940 
-                             *
1941 
-                             * @since 1.0.0
1942 
-                             * @package GeoDirectory
1943 
-                             * @param string $rating_star Rating stars.
1944 
-                             * @param float $post_avgratings Average ratings of the post.
1945 
-                             * @param int $ID The post ID.
1946 
-                             */
1947 
-                            $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
1948 
-                        }
1949 
-                    }
1950 
-                    ?>
1925 
+					$comment_count = '';
1926 
+					$rating_star = '';
1927 
+					if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
1928 
+						$rating_star = '';
1929 
+						$comment_count = geodir_get_review_count_total($ID);
1930 
+
1931 
+						if (!$preview) {
1932 
+							$post_avgratings = geodir_get_post_rating($ID);
1933 
+
1934 
+							$rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);
1935 
+
1936 
+							/**
1937 
+							 * Filter to change rating stars
1938 
+							 *
1939 
+							 * You can use this filter to change Rating stars.
1940 
+							 *
1941 
+							 * @since 1.0.0
1942 
+							 * @package GeoDirectory
1943 
+							 * @param string $rating_star Rating stars.
1944 
+							 * @param float $post_avgratings Average ratings of the post.
1945 
+							 * @param int $ID The post ID.
1946 
+							 */
1947 
+							$rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
1948 
+						}
1949 
+					}
1950 
+					?>
1951 1951 
                     <div class="geodir-bubble_desc">
1952 1952 
                         <h4>
1953 1953 
                             <a href="<?php if ($plink != '') {
1954 
-                                echo $plink;
1955 
-                            } else {
1956 
-                                echo 'javascript:void(0);';
1957 
-                            } ?>"><?php echo $title; ?></a>
1954 
+								echo $plink;
1955 
+							} else {
1956 
+								echo 'javascript:void(0);';
1957 
+							} ?>"><?php echo $title; ?></a>
1958 1958 
                         </h4>
1959 1959 
                         <?php
1960 
-                        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
1961 
-                            $post_images = array();
1962 
-                            if (!empty($postinfo_obj->post_images)) {
1963 
-                                $post_images = explode(",", $postinfo_obj->post_images);
1964 
-                            }
1965 
-
1966 
-                            if (!empty($post_images)) {
1967 
-                                ?>
1960 
+						if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
1961 
+							$post_images = array();
1962 
+							if (!empty($postinfo_obj->post_images)) {
1963 
+								$post_images = explode(",", $postinfo_obj->post_images);
1964 
+							}
1965 
+
1966 
+							if (!empty($post_images)) {
1967 
+								?>
1968 1968 
                                 <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {
1969 
-                                        echo $plink;
1970 
-                                    } else {
1971 
-                                        echo 'javascript:void(0);';
1972 
-                                    } ?>"><img alt="bubble image" style="max-height:50px;"
1969 
+										echo $plink;
1970 
+									} else {
1971 
+										echo 'javascript:void(0);';
1972 
+									} ?>"><img alt="bubble image" style="max-height:50px;"
1973 1973 
                                                src="<?php echo $post_images[0]; ?>"/></a></div>
1974 1974 
                             <?php
1975 
-                            }else{
1976 
-                                echo '<div class="geodir-bubble_image"></div>';
1977 
-                            }
1978 
-                        } else {
1979 
-                            if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
1980 
-                                ?>
1975 
+							}else{
1976 
+								echo '<div class="geodir-bubble_image"></div>';
1977 
+							}
1978 
+						} else {
1979 
+							if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
1980 
+								?>
1981 1981 
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
1982 1982 
                             <?php
1983 
-                            }else{
1984 
-                                echo '<div class="geodir-bubble_image"></div>';
1985 
-                            }
1986 
-                        }
1987 
-                        ?>
1983 
+							}else{
1984 
+								echo '<div class="geodir-bubble_image"></div>';
1985 
+							}
1986 
+						}
1987 
+						?>
1988 1988 
                         <div class="geodir-bubble-meta-side">
1989 1989 
                             <?php
1990 
-                            /**
1991 
-                             * Fires before the meta info in the map info window.
1992 
-                             *
1993 
-                             * This can be used to add more info to the map info window before the normal meta info.
1994 
-                             *
1995 
-                             * @since 1.5.4
1996 
-                             * @param int $ID The post id.
1997 
-                             * @param object $postinfo_obj The posts info as an object.
1998 
-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
1999 
-                             */
2000 
-                            do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
2001 
-
2002 
-                            echo geodir_show_listing_info('mapbubble');
2003 
-
2004 
-                            /**
2005 
-                             * Fires after the meta info in the map info window.
2006 
-                             *
2007 
-                             * This can be used to add more info to the map info window after the normal meta info.
2008 
-                             *
2009 
-                             * @since 1.4.2
2010 
-                             * @param object $postinfo_obj The posts info as an object.
2011 
-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
2012 
-                             */
2013 
-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
2014 
-                            ?>
1990 
+							/**
1991 
+							 * Fires before the meta info in the map info window.
1992 
+							 *
1993 
+							 * This can be used to add more info to the map info window before the normal meta info.
1994 
+							 *
1995 
+							 * @since 1.5.4
1996 
+							 * @param int $ID The post id.
1997 
+							 * @param object $postinfo_obj The posts info as an object.
1998 
+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
1999 
+							 */
2000 
+							do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
2001 
+
2002 
+							echo geodir_show_listing_info('mapbubble');
2003 
+
2004 
+							/**
2005 
+							 * Fires after the meta info in the map info window.
2006 
+							 *
2007 
+							 * This can be used to add more info to the map info window after the normal meta info.
2008 
+							 *
2009 
+							 * @since 1.4.2
2010 
+							 * @param object $postinfo_obj The posts info as an object.
2011 
+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
2012 
+							 */
2013 
+							do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
2014 
+							?>
2015 2015 
                         </div>
2016 2016 
                         <?php
2017 
-                        if ($ID) {
2018 
-                            $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
2019 
-                            ?>
2017 
+						if ($ID) {
2018 
+							$post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
2019 
+							?>
2020 2020 
                             <div class="geodir-bubble-meta-fade"></div>
2021 2021 
                             <div class="geodir-bubble-meta-bottom">
2022 2022 
                                 <?php if ($rating_star != '') { ?>

@@ -2032,69 +2032,69 @@  discard block
 
 block discarded – undo
2032 2032 
                 </div>
2033 2033 
             </div>
2034 2034 
             <?php
2035 
-            $html = ob_get_clean();
2036 
-            /**
2037 
-             * Filter to change infowindow html
2038 
-             *
2039 
-             * You can use this filter to change infowindow html.
2040 
-             *
2041 
-             * @since 1.0.0
2042 
-             * @package GeoDirectory
2043 
-             * @param string $html Infowindow html.
2044 
-             * @param object $postinfo_obj The Post object.
2045 
-             * @param bool|string $post_preview Is this a post preview?
2046 
-             */
2047 
-            $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
2048 
-            return $html;
2049 
-        }
2050 
-    }
2035 
+			$html = ob_get_clean();
2036 
+			/**
2037 
+			 * Filter to change infowindow html
2038 
+			 *
2039 
+			 * You can use this filter to change infowindow html.
2040 
+			 *
2041 
+			 * @since 1.0.0
2042 
+			 * @package GeoDirectory
2043 
+			 * @param string $html Infowindow html.
2044 
+			 * @param object $postinfo_obj The Post object.
2045 
+			 * @param bool|string $post_preview Is this a post preview?
2046 
+			 */
2047 
+			$html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
2048 
+			return $html;
2049 
+		}
2050 
+	}
2051 2051 
 }
2052 2052
2053 2053
2054 2054 
 if (!function_exists('geodir_new_post_default_status')) {
2055 
-    /**
2056 
-     * Default post status for new posts.
2057 
-     *
2058 
-     * @since 1.0.0
2059 
-     * @package GeoDirectory
2060 
-     * @return string Returns the default post status for new posts. Ex: draft, publish etc.
2061 
-     */
2062 
-    function geodir_new_post_default_status()
2063 
-    {
2064 
-        if (get_option('geodir_new_post_default_status'))
2065 
-            return get_option('geodir_new_post_default_status');
2066 
-        else
2067 
-            return 'publish';
2068 
-
2069 
-    }
2055 
+	/**
2056 
+	 * Default post status for new posts.
2057 
+	 *
2058 
+	 * @since 1.0.0
2059 
+	 * @package GeoDirectory
2060 
+	 * @return string Returns the default post status for new posts. Ex: draft, publish etc.
2061 
+	 */
2062 
+	function geodir_new_post_default_status()
2063 
+	{
2064 
+		if (get_option('geodir_new_post_default_status'))
2065 
+			return get_option('geodir_new_post_default_status');
2066 
+		else
2067 
+			return 'publish';
2068 
+
2069 
+	}
2070 2070 
 }
2071 2071
2072 2072 
 if (!function_exists('geodir_change_post_status')) {
2073 
-    /**
2074 
-     * Change post status of a post.
2075 
-     *
2076 
-     * @global object $wpdb WordPress Database object.
2077 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2078 
-     * @param int|string $post_id The post ID.
2079 
-     * @param string $status New post status. Ex: draft, publish etc.
2080 
-     */
2081 
-    function geodir_change_post_status($post_id = '', $status = '')
2082 
-    {
2083 
-        global $wpdb, $plugin_prefix;
2084 
-
2085 
-        $post_type = get_post_type($post_id);
2086 
-
2087 
-        $table = $plugin_prefix . $post_type . '_detail';
2088 
-
2089 
-        $wpdb->query(
2090 
-            $wpdb->prepare(
2091 
-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
2092 
-                array($status, $post_id)
2093 
-            )
2094 
-        );
2095 
-
2096 
-
2097 
-    }
2073 
+	/**
2074 
+	 * Change post status of a post.
2075 
+	 *
2076 
+	 * @global object $wpdb WordPress Database object.
2077 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2078 
+	 * @param int|string $post_id The post ID.
2079 
+	 * @param string $status New post status. Ex: draft, publish etc.
2080 
+	 */
2081 
+	function geodir_change_post_status($post_id = '', $status = '')
2082 
+	{
2083 
+		global $wpdb, $plugin_prefix;
2084 
+
2085 
+		$post_type = get_post_type($post_id);
2086 
+
2087 
+		$table = $plugin_prefix . $post_type . '_detail';
2088 
+
2089 
+		$wpdb->query(
2090 
+			$wpdb->prepare(
2091 
+				"UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
2092 
+				array($status, $post_id)
2093 
+			)
2094 
+		);
2095 
+
2096 
+
2097 
+	}
2098 2098 
 }
2099 2099
2100 2100 
 /**

@@ -2108,13 +2108,13 @@  discard block
 
 block discarded – undo
2108 2108 
  */
2109 2109 
 function geodir_set_post_status($pid, $status)
2110 2110 
 {
2111 
-    if ($pid) {
2112 
-        global $wpdb;
2113 
-        $my_post = array();
2114 
-        $my_post['post_status'] = $status;
2115 
-        $my_post['ID'] = $pid;
2116 
-        $last_postid = wp_update_post($my_post);
2117 
-    }
2111 
+	if ($pid) {
2112 
+		global $wpdb;
2113 
+		$my_post = array();
2114 
+		$my_post['post_status'] = $status;
2115 
+		$my_post['ID'] = $pid;
2116 
+		$last_postid = wp_update_post($my_post);
2117 
+	}
2118 2118 
 }
2119 2119
2120 2120 
 

@@ -2130,384 +2130,384 @@  discard block
 
 block discarded – undo
2130 2130 
  */
2131 2131 
 function geodir_update_poststatus($new_status, $old_status, $post)
2132 2132 
 {
2133 
-    global $wpdb;
2133 
+	global $wpdb;
2134 2134
2135 
-    $geodir_posttypes = geodir_get_posttypes();
2135 
+	$geodir_posttypes = geodir_get_posttypes();
2136 2136
2137 
-    if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
2137 
+	if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
2138 2138
2139 
-        geodir_change_post_status($post->ID, $new_status);
2140 
-    }
2139 
+		geodir_change_post_status($post->ID, $new_status);
2140 
+	}
2141 2141 
 }
2142 2142
2143 2143
2144 2144 
 if (!function_exists('geodir_update_listing_info')) {
2145 
-    /**
2146 
-     * Update post info.
2147 
-     *
2148 
-     * @since 1.0.0
2149 
-     * @package GeoDirectory
2150 
-     * @global object $wpdb WordPress Database object.
2151 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2152 
-     * @param int $updatingpost The updating post ID.
2153 
-     * @param int $temppost The temporary post ID.
2154 
-     * @todo fix post_id variable
2155 
-     */
2156 
-    function geodir_update_listing_info($updatingpost, $temppost)
2157 
-    {
2158 
-
2159 
-        global $wpdb, $plugin_prefix;
2160 
-
2161 
-        $post_type = get_post_type($post_id);
2162 
-
2163 
-        $table = $plugin_prefix . $post_type . '_detail';
2164 
-
2165 
-        $wpdb->query(
2166 
-            $wpdb->prepare(
2167 
-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
2168 
-                array($updatingpost, $temppost)
2169 
-            )
2170 
-        );
2171 
-
2172 
-        $wpdb->query(
2173 
-            $wpdb->prepare(
2174 
-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2175 
-                array($updatingpost, $temppost)
2176 
-            )
2177 
-        );
2178 
-
2179 
-        /* Update Attachments*/
2180 
-
2181 
-        $wpdb->query(
2182 
-            $wpdb->prepare(
2183 
-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2184 
-                array($updatingpost, $temppost)
2185 
-            )
2186 
-        );
2187 
-
2188 
-    }
2145 
+	/**
2146 
+	 * Update post info.
2147 
+	 *
2148 
+	 * @since 1.0.0
2149 
+	 * @package GeoDirectory
2150 
+	 * @global object $wpdb WordPress Database object.
2151 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2152 
+	 * @param int $updatingpost The updating post ID.
2153 
+	 * @param int $temppost The temporary post ID.
2154 
+	 * @todo fix post_id variable
2155 
+	 */
2156 
+	function geodir_update_listing_info($updatingpost, $temppost)
2157 
+	{
2158 
+
2159 
+		global $wpdb, $plugin_prefix;
2160 
+
2161 
+		$post_type = get_post_type($post_id);
2162 
+
2163 
+		$table = $plugin_prefix . $post_type . '_detail';
2164 
+
2165 
+		$wpdb->query(
2166 
+			$wpdb->prepare(
2167 
+				"UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
2168 
+				array($updatingpost, $temppost)
2169 
+			)
2170 
+		);
2171 
+
2172 
+		$wpdb->query(
2173 
+			$wpdb->prepare(
2174 
+				"UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2175 
+				array($updatingpost, $temppost)
2176 
+			)
2177 
+		);
2178 
+
2179 
+		/* Update Attachments*/
2180 
+
2181 
+		$wpdb->query(
2182 
+			$wpdb->prepare(
2183 
+				"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2184 
+				array($updatingpost, $temppost)
2185 
+			)
2186 
+		);
2187 
+
2188 
+	}
2189 2189 
 }
2190 2190
2191 2191
2192 2192 
 if (!function_exists('geodir_delete_listing_info')) {
2193 
-    /**
2194 
-     * Delete Listing info from details table for the given post id.
2195 
-     *
2196 
-     * @since 1.0.0
2197 
-     * @package GeoDirectory
2198 
-     * @global object $wpdb WordPress Database object.
2199 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2200 
-     * @param int $deleted_postid The post ID.
2201 
-     * @param bool $force Optional. Do you want to force delete it? Default: false.
2202 
-     * @return bool|void
2203 
-     */
2204 
-    function geodir_delete_listing_info($deleted_postid, $force = false)
2205 
-    {
2206 
-        global $wpdb, $plugin_prefix;
2207 
-
2208 
-        // check for multisite deletions
2209 
-        if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
2210 
-        } else {
2211 
-            return;
2212 
-        }
2213 
-
2214 
-        $post_type = get_post_type($deleted_postid);
2215 
-
2216 
-        $all_postypes = geodir_get_posttypes();
2217 
-
2218 
-        if (!in_array($post_type, $all_postypes))
2219 
-            return false;
2220 
-
2221 
-        $table = $plugin_prefix . $post_type . '_detail';
2222 
-
2223 
-        /* Delete custom post meta*/
2224 
-        $wpdb->query(
2225 
-            $wpdb->prepare(
2226 
-                "DELETE FROM " . $table . " WHERE `post_id` = %d",
2227 
-                array($deleted_postid)
2228 
-            )
2229 
-        );
2230 
-
2231 
-        /* Delete post map icons*/
2232 
-
2233 
-        $wpdb->query(
2234 
-            $wpdb->prepare(
2235 
-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
2236 
-                array($deleted_postid)
2237 
-            )
2238 
-        );
2239 
-
2240 
-        /* Delete Attachments*/
2241 
-        $postcurr_images = geodir_get_images($deleted_postid);
2242 
-
2243 
-        $wpdb->query(
2244 
-            $wpdb->prepare(
2245 
-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
2246 
-                array($deleted_postid)
2247 
-            )
2248 
-        );
2249 
-        geodir_remove_attachments($postcurr_images);
2250 
-
2251 
-    }
2193 
+	/**
2194 
+	 * Delete Listing info from details table for the given post id.
2195 
+	 *
2196 
+	 * @since 1.0.0
2197 
+	 * @package GeoDirectory
2198 
+	 * @global object $wpdb WordPress Database object.
2199 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2200 
+	 * @param int $deleted_postid The post ID.
2201 
+	 * @param bool $force Optional. Do you want to force delete it? Default: false.
2202 
+	 * @return bool|void
2203 
+	 */
2204 
+	function geodir_delete_listing_info($deleted_postid, $force = false)
2205 
+	{
2206 
+		global $wpdb, $plugin_prefix;
2207 
+
2208 
+		// check for multisite deletions
2209 
+		if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
2210 
+		} else {
2211 
+			return;
2212 
+		}
2213 
+
2214 
+		$post_type = get_post_type($deleted_postid);
2215 
+
2216 
+		$all_postypes = geodir_get_posttypes();
2217 
+
2218 
+		if (!in_array($post_type, $all_postypes))
2219 
+			return false;
2220 
+
2221 
+		$table = $plugin_prefix . $post_type . '_detail';
2222 
+
2223 
+		/* Delete custom post meta*/
2224 
+		$wpdb->query(
2225 
+			$wpdb->prepare(
2226 
+				"DELETE FROM " . $table . " WHERE `post_id` = %d",
2227 
+				array($deleted_postid)
2228 
+			)
2229 
+		);
2230 
+
2231 
+		/* Delete post map icons*/
2232 
+
2233 
+		$wpdb->query(
2234 
+			$wpdb->prepare(
2235 
+				"DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
2236 
+				array($deleted_postid)
2237 
+			)
2238 
+		);
2239 
+
2240 
+		/* Delete Attachments*/
2241 
+		$postcurr_images = geodir_get_images($deleted_postid);
2242 
+
2243 
+		$wpdb->query(
2244 
+			$wpdb->prepare(
2245 
+				"DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
2246 
+				array($deleted_postid)
2247 
+			)
2248 
+		);
2249 
+		geodir_remove_attachments($postcurr_images);
2250 
+
2251 
+	}
2252 2252 
 }
2253 2253
2254 2254
2255 2255 
 if (!function_exists('geodir_add_to_favorite')) {
2256 
-    /**
2257 
-     * This function would add listing to favorite listing.
2258 
-     *
2259 
-     * @since 1.0.0
2260 
-     * @package GeoDirectory
2261 
-     * @global object $current_user Current user object.
2262 
-     * @param int $post_id The post ID.
2263 
-     */
2264 
-    function geodir_add_to_favorite($post_id)
2265 
-    {
2266 
-
2267 
-        global $current_user;
2268 
-
2269 
-        /**
2270 
-         * Filter to modify "Unfavorite" text
2271 
-         *
2272 
-         * You can use this filter to rename "Unfavorite" text to something else.
2273 
-         *
2274 
-         * @since 1.0.0
2275 
-         * @package GeoDirectory
2276 
-         */
2277 
-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
2278 
-
2279 
-        /**
2280 
-         * Filter to modify "Remove from Favorites" text
2281 
-         *
2282 
-         * You can use this filter to rename "Remove from Favorites" text to something else.
2283 
-         *
2284 
-         * @since 1.0.0
2285 
-         * @package GeoDirectory
2286 
-         */
2287 
-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
2288 
-
2289 
-        /**
2290 
-         * Filter to modify "fa fa-heart" icon
2291 
-         *
2292 
-         * You can use this filter to change "fa fa-heart" icon to something else.
2293 
-         *
2294 
-         * @since 1.0.0
2295 
-         * @package GeoDirectory
2296 
-         */
2297 
-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
2298 
-
2299 
-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2300 
-        $user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array();
2301 
-
2302 
-        if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
2303 
-            $user_meta_data[] = $post_id;
2304 
-        }
2305 
-
2306 
-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);
2307 
-
2308 
-        /**
2309 
-         * Called before adding the post from favourites.
2310 
-         *
2311 
-         * @since 1.0.0
2312 
-         * @package GeoDirectory
2313 
-         * @param int $post_id The post ID.
2314 
-         */
2315 
-        do_action('geodir_before_add_from_favorite', $post_id);
2316 
-
2317 
-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';
2318 
-
2319 
-        /**
2320 
-         * Called after adding the post from favourites.
2321 
-         *
2322 
-         * @since 1.0.0
2323 
-         * @package GeoDirectory
2324 
-         * @param int $post_id The post ID.
2325 
-         */
2326 
-        do_action('geodir_after_add_from_favorite', $post_id);
2256 
+	/**
2257 
+	 * This function would add listing to favorite listing.
2258 
+	 *
2259 
+	 * @since 1.0.0
2260 
+	 * @package GeoDirectory
2261 
+	 * @global object $current_user Current user object.
2262 
+	 * @param int $post_id The post ID.
2263 
+	 */
2264 
+	function geodir_add_to_favorite($post_id)
2265 
+	{
2266 
+
2267 
+		global $current_user;
2268 
+
2269 
+		/**
2270 
+		 * Filter to modify "Unfavorite" text
2271 
+		 *
2272 
+		 * You can use this filter to rename "Unfavorite" text to something else.
2273 
+		 *
2274 
+		 * @since 1.0.0
2275 
+		 * @package GeoDirectory
2276 
+		 */
2277 
+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
2278 
+
2279 
+		/**
2280 
+		 * Filter to modify "Remove from Favorites" text
2281 
+		 *
2282 
+		 * You can use this filter to rename "Remove from Favorites" text to something else.
2283 
+		 *
2284 
+		 * @since 1.0.0
2285 
+		 * @package GeoDirectory
2286 
+		 */
2287 
+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
2288 
+
2289 
+		/**
2290 
+		 * Filter to modify "fa fa-heart" icon
2291 
+		 *
2292 
+		 * You can use this filter to change "fa fa-heart" icon to something else.
2293 
+		 *
2294 
+		 * @since 1.0.0
2295 
+		 * @package GeoDirectory
2296 
+		 */
2297 
+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
2298 
+
2299 
+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2300 
+		$user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array();
2301 
+
2302 
+		if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
2303 
+			$user_meta_data[] = $post_id;
2304 
+		}
2305 
+
2306 
+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);
2307 
+
2308 
+		/**
2309 
+		 * Called before adding the post from favourites.
2310 
+		 *
2311 
+		 * @since 1.0.0
2312 
+		 * @package GeoDirectory
2313 
+		 * @param int $post_id The post ID.
2314 
+		 */
2315 
+		do_action('geodir_before_add_from_favorite', $post_id);
2316 
+
2317 
+		echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';
2318 
+
2319 
+		/**
2320 
+		 * Called after adding the post from favourites.
2321 
+		 *
2322 
+		 * @since 1.0.0
2323 
+		 * @package GeoDirectory
2324 
+		 * @param int $post_id The post ID.
2325 
+		 */
2326 
+		do_action('geodir_after_add_from_favorite', $post_id);
2327 2327
2328 
-    }
2328 
+	}
2329 2329 
 }
2330 2330
2331 2331 
 if (!function_exists('geodir_remove_from_favorite')) {
2332 
-    /**
2333 
-     * This function would remove the favourited property earlier.
2334 
-     *
2335 
-     * @since 1.0.0
2336 
-     * @package GeoDirectory
2337 
-     * @global object $current_user Current user object.
2338 
-     * @param int $post_id The post ID.
2339 
-     */
2340 
-    function geodir_remove_from_favorite($post_id)
2341 
-    {
2342 
-        global $current_user;
2343 
-
2344 
-        /**
2345 
-         * Filter to modify "Add to Favorites" text
2346 
-         *
2347 
-         * You can use this filter to rename "Add to Favorites" text to something else.
2348 
-         *
2349 
-         * @since 1.0.0
2350 
-         * @package GeoDirectory
2351 
-         */
2352 
-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
2353 
-
2354 
-        /**
2355 
-         * Filter to modify "Favourite" text
2356 
-         *
2357 
-         * You can use this filter to rename "Favourite" text to something else.
2358 
-         *
2359 
-         * @since 1.0.0
2360 
-         * @package GeoDirectory
2361 
-         */
2362 
-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
2363 
-
2364 
-        /**
2365 
-         * Filter to modify "fa fa-heart" icon
2366 
-         *
2367 
-         * You can use this filter to change "fa fa-heart" icon to something else.
2368 
-         *
2369 
-         * @since 1.0.0
2370 
-         * @package GeoDirectory
2371 
-         */
2372 
-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
2373 
-
2374 
-        $user_meta_data = array();
2375 
-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2376 
-
2377 
-        if (!empty($user_meta_data)) {
2378 
-
2379 
-            if (($key = array_search($post_id, $user_meta_data)) !== false) {
2380 
-                unset($user_meta_data[$key]);
2381 
-            }
2332 
+	/**
2333 
+	 * This function would remove the favourited property earlier.
2334 
+	 *
2335 
+	 * @since 1.0.0
2336 
+	 * @package GeoDirectory
2337 
+	 * @global object $current_user Current user object.
2338 
+	 * @param int $post_id The post ID.
2339 
+	 */
2340 
+	function geodir_remove_from_favorite($post_id)
2341 
+	{
2342 
+		global $current_user;
2343 
+
2344 
+		/**
2345 
+		 * Filter to modify "Add to Favorites" text
2346 
+		 *
2347 
+		 * You can use this filter to rename "Add to Favorites" text to something else.
2348 
+		 *
2349 
+		 * @since 1.0.0
2350 
+		 * @package GeoDirectory
2351 
+		 */
2352 
+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
2353 
+
2354 
+		/**
2355 
+		 * Filter to modify "Favourite" text
2356 
+		 *
2357 
+		 * You can use this filter to rename "Favourite" text to something else.
2358 
+		 *
2359 
+		 * @since 1.0.0
2360 
+		 * @package GeoDirectory
2361 
+		 */
2362 
+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
2363 
+
2364 
+		/**
2365 
+		 * Filter to modify "fa fa-heart" icon
2366 
+		 *
2367 
+		 * You can use this filter to change "fa fa-heart" icon to something else.
2368 
+		 *
2369 
+		 * @since 1.0.0
2370 
+		 * @package GeoDirectory
2371 
+		 */
2372 
+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
2373 
+
2374 
+		$user_meta_data = array();
2375 
+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2376 
+
2377 
+		if (!empty($user_meta_data)) {
2378 
+
2379 
+			if (($key = array_search($post_id, $user_meta_data)) !== false) {
2380 
+				unset($user_meta_data[$key]);
2381 
+			}
2382 2382
2383 
-        }
2383 
+		}
2384 2384
2385 
-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);
2385 
+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);
2386 2386
2387 
-        /**
2388 
-         * Called before removing the post from favourites.
2389 
-         *
2390 
-         * @since 1.0.0
2391 
-         * @package GeoDirectory
2392 
-         * @param int $post_id The post ID.
2393 
-         */
2394 
-        do_action('geodir_before_remove_from_favorite', $post_id);
2387 
+		/**
2388 
+		 * Called before removing the post from favourites.
2389 
+		 *
2390 
+		 * @since 1.0.0
2391 
+		 * @package GeoDirectory
2392 
+		 * @param int $post_id The post ID.
2393 
+		 */
2394 
+		do_action('geodir_before_remove_from_favorite', $post_id);
2395 2395
2396 
-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';
2396 
+		echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';
2397 2397
2398 
-        /**
2399 
-         * Called after removing the post from favourites.
2400 
-         *
2401 
-         * @since 1.0.0
2402 
-         * @package GeoDirectory
2403 
-         * @param int $post_id The post ID.
2404 
-         */
2405 
-        do_action('geodir_after_remove_from_favorite', $post_id);
2398 
+		/**
2399 
+		 * Called after removing the post from favourites.
2400 
+		 *
2401 
+		 * @since 1.0.0
2402 
+		 * @package GeoDirectory
2403 
+		 * @param int $post_id The post ID.
2404 
+		 */
2405 
+		do_action('geodir_after_remove_from_favorite', $post_id);
2406 2406
2407 
-    }
2407 
+	}
2408 2408 
 }
2409 2409
2410 2410 
 if (!function_exists('geodir_favourite_html')) {
2411 
-    /**
2412 
-     * This function would display the html content for add to favorite or remove from favorite.
2413 
-     *
2414 
-     * @since 1.0.0
2415 
-     * @package GeoDirectory
2416 
-     * @global object $current_user Current user object.
2417 
-     * @global object $post The current post object.
2418 
-     * @param int $user_id The user ID.
2419 
-     * @param int $post_id The post ID.
2420 
-     */
2421 
-    function geodir_favourite_html($user_id, $post_id)
2422 
-    {
2423 
-
2424 
-        global $current_user, $post;
2425 
-
2426 
-        /**
2427 
-         * Filter to modify "Add to Favorites" text
2428 
-         *
2429 
-         * You can use this filter to rename "Add to Favorites" text to something else.
2430 
-         *
2431 
-         * @since 1.0.0
2432 
-         * @package GeoDirectory
2433 
-         */
2434 
-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
2435 
-
2436 
-        /**
2437 
-         * Filter to modify "Favourite" text
2438 
-         *
2439 
-         * You can use this filter to rename "Favourite" text to something else.
2440 
-         *
2441 
-         * @since 1.0.0
2442 
-         * @package GeoDirectory
2443 
-         */
2444 
-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
2445 
-
2446 
-        /**
2447 
-         * Filter to modify "Unfavorite" text
2448 
-         *
2449 
-         * You can use this filter to rename "Unfavorite" text to something else.
2450 
-         *
2451 
-         * @since 1.0.0
2452 
-         * @package GeoDirectory
2453 
-         */
2454 
-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
2455 
-
2456 
-        /**
2457 
-         * Filter to modify "Remove from Favorites" text
2458 
-         *
2459 
-         * You can use this filter to rename "Remove from Favorites" text to something else.
2460 
-         *
2461 
-         * @since 1.0.0
2462 
-         * @package GeoDirectory
2463 
-         */
2464 
-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
2465 
-
2466 
-        /**
2467 
-         * Filter to modify "fa fa-heart" icon
2468 
-         *
2469 
-         * You can use this filter to change "fa fa-heart" icon to something else.
2470 
-         *
2471 
-         * @since 1.0.0
2472 
-         * @package GeoDirectory
2473 
-         */
2474 
-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
2475 
-
2476 
-        /**
2477 
-         * Filter to modify "fa fa-heart" icon for "remove from favorites" link
2478 
-         *
2479 
-         * You can use this filter to change "fa fa-heart" icon to something else.
2480 
-         *
2481 
-         * @since 1.0.0
2482 
-         * @package GeoDirectory
2483 
-         */
2484 
-        $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
2485 
-
2486 
-        $user_meta_data = '';
2487 
-        if (isset($current_user->data->ID))
2488 
-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2489 
-
2490 
-        if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
2491 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
2411 
+	/**
2412 
+	 * This function would display the html content for add to favorite or remove from favorite.
2413 
+	 *
2414 
+	 * @since 1.0.0
2415 
+	 * @package GeoDirectory
2416 
+	 * @global object $current_user Current user object.
2417 
+	 * @global object $post The current post object.
2418 
+	 * @param int $user_id The user ID.
2419 
+	 * @param int $post_id The post ID.
2420 
+	 */
2421 
+	function geodir_favourite_html($user_id, $post_id)
2422 
+	{
2423 
+
2424 
+		global $current_user, $post;
2425 
+
2426 
+		/**
2427 
+		 * Filter to modify "Add to Favorites" text
2428 
+		 *
2429 
+		 * You can use this filter to rename "Add to Favorites" text to something else.
2430 
+		 *
2431 
+		 * @since 1.0.0
2432 
+		 * @package GeoDirectory
2433 
+		 */
2434 
+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
2435 
+
2436 
+		/**
2437 
+		 * Filter to modify "Favourite" text
2438 
+		 *
2439 
+		 * You can use this filter to rename "Favourite" text to something else.
2440 
+		 *
2441 
+		 * @since 1.0.0
2442 
+		 * @package GeoDirectory
2443 
+		 */
2444 
+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
2445 
+
2446 
+		/**
2447 
+		 * Filter to modify "Unfavorite" text
2448 
+		 *
2449 
+		 * You can use this filter to rename "Unfavorite" text to something else.
2450 
+		 *
2451 
+		 * @since 1.0.0
2452 
+		 * @package GeoDirectory
2453 
+		 */
2454 
+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
2455 
+
2456 
+		/**
2457 
+		 * Filter to modify "Remove from Favorites" text
2458 
+		 *
2459 
+		 * You can use this filter to rename "Remove from Favorites" text to something else.
2460 
+		 *
2461 
+		 * @since 1.0.0
2462 
+		 * @package GeoDirectory
2463 
+		 */
2464 
+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
2465 
+
2466 
+		/**
2467 
+		 * Filter to modify "fa fa-heart" icon
2468 
+		 *
2469 
+		 * You can use this filter to change "fa fa-heart" icon to something else.
2470 
+		 *
2471 
+		 * @since 1.0.0
2472 
+		 * @package GeoDirectory
2473 
+		 */
2474 
+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
2475 
+
2476 
+		/**
2477 
+		 * Filter to modify "fa fa-heart" icon for "remove from favorites" link
2478 
+		 *
2479 
+		 * You can use this filter to change "fa fa-heart" icon to something else.
2480 
+		 *
2481 
+		 * @since 1.0.0
2482 
+		 * @package GeoDirectory
2483 
+		 */
2484 
+		$unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
2485 
+
2486 
+		$user_meta_data = '';
2487 
+		if (isset($current_user->data->ID))
2488 
+			$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2489 
+
2490 
+		if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
2491 
+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
2492 2492 
                 class="geodir-removetofav-icon" href="javascript:void(0);"
2493 2493 
                 onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"
2494 2494 
                 title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>
2495 2495 
             </a>   </span><?php
2496 2496
2497 
-        } else {
2497 
+		} else {
2498 2498
2499 
-            if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
2500 
-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
2501 
-            } else
2502 
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2499 
+			if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
2500 
+				$script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
2501 
+			} else
2502 
+				$script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2503 2503
2504 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
2504 
+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
2505 2505 
                                                                                         href="javascript:void(0);"
2506 2506 
                                                                                         onclick="<?php echo $script_text;?>"
2507 2507 
                                                                                         title="<?php echo $add_favourite_text;?>"><i
2508 2508 
                     class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>
2509 2509 
         <?php }
2510 
-    }
2510 
+	}
2511 2511 
 }
2512 2512
2513 2513 
 

@@ -2524,54 +2524,54 @@  discard block
 
 block discarded – undo
2524 2524 
 function geodir_get_cat_postcount($term = array())
2525 2525 
 {
2526 2526
2527 
-    if (!empty($term)) {
2527 
+	if (!empty($term)) {
2528 2528
2529 
-        global $wpdb, $plugin_prefix;
2529 
+		global $wpdb, $plugin_prefix;
2530 2530
2531 
-        $where = '';
2532 
-        $join = '';
2533 
-        if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
2534 
-            $taxonomy_obj = get_taxonomy($term->taxonomy);
2531 
+		$where = '';
2532 
+		$join = '';
2533 
+		if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
2534 
+			$taxonomy_obj = get_taxonomy($term->taxonomy);
2535 2535
2536 
-            $post_type = $taxonomy_obj->object_type[0];
2536 
+			$post_type = $taxonomy_obj->object_type[0];
2537 2537
2538 
-            $table = $plugin_prefix . $post_type . '_detail';
2538 
+			$table = $plugin_prefix . $post_type . '_detail';
2539 2539
2540 
-            /**
2541 
-             * Filter to modify the 'join' query
2542 
-             *
2543 
-             * @since 1.0.0
2544 
-             * @package GeoDirectory
2545 
-             * @param object|array $term category / term object that need to be processed.
2546 
-             * @param string $join The join query.
2547 
-             */
2548 
-            $join = apply_filters('geodir_cat_post_count_join', $join, $term);
2540 
+			/**
2541 
+			 * Filter to modify the 'join' query
2542 
+			 *
2543 
+			 * @since 1.0.0
2544 
+			 * @package GeoDirectory
2545 
+			 * @param object|array $term category / term object that need to be processed.
2546 
+			 * @param string $join The join query.
2547 
+			 */
2548 
+			$join = apply_filters('geodir_cat_post_count_join', $join, $term);
2549 2549
2550 
-            /**
2551 
-             * Filter to modify the 'where' query
2552 
-             *
2553 
-             * @since 1.0.0
2554 
-             * @package GeoDirectory
2555 
-             * @param object|array $term category / term object that need to be processed.
2556 
-             * @param string $where The where query.
2557 
-             */
2558 
-            $where = apply_filters('geodir_cat_post_count_where', $where, $term);
2550 
+			/**
2551 
+			 * Filter to modify the 'where' query
2552 
+			 *
2553 
+			 * @since 1.0.0
2554 
+			 * @package GeoDirectory
2555 
+			 * @param object|array $term category / term object that need to be processed.
2556 
+			 * @param string $where The where query.
2557 
+			 */
2558 
+			$where = apply_filters('geodir_cat_post_count_where', $where, $term);
2559 2559
2560 
-            $count_query = "SELECT count(post_id) FROM
2560 
+			$count_query = "SELECT count(post_id) FROM
2561 2561 
 							" . $table . " as pd " . $join . "
2562 2562 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
2563 2563
2564 
-            $cat_post_count = $wpdb->get_var($count_query);
2565 
-            if (empty($cat_post_count) || is_wp_error($cat_post_count))
2566 
-                $cat_post_count = 0;
2564 
+			$cat_post_count = $wpdb->get_var($count_query);
2565 
+			if (empty($cat_post_count) || is_wp_error($cat_post_count))
2566 
+				$cat_post_count = 0;
2567 2567
2568 
-            return $cat_post_count;
2568 
+			return $cat_post_count;
2569 2569
2570 
-        } else
2570 
+		} else
2571 2571
2572 
-            return $term->count;
2573 
-    }
2574 
-    return false;
2572 
+			return $term->count;
2573 
+	}
2574 
+	return false;
2575 2575
2576 2576 
 }
2577 2577 
 

@@ -2584,17 +2584,17 @@  discard block
 
 block discarded – undo
2584 2584 
  */
2585 2585 
 function geodir_allow_post_type_frontend()
2586 2586 
 {
2587 
-    $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
2587 
+	$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
2588 2588
2589 
-    if (!is_admin() && isset($_REQUEST['listing_type'])
2590 
-        && !empty($geodir_allow_posttype_frontend)
2591 
-        && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)
2592 
-    ) {
2589 
+	if (!is_admin() && isset($_REQUEST['listing_type'])
2590 
+		&& !empty($geodir_allow_posttype_frontend)
2591 
+		&& !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)
2592 
+	) {
2593 2593
2594 
-        wp_redirect(home_url());
2595 
-        exit;
2594 
+		wp_redirect(home_url());
2595 
+		exit;
2596 2596
2597 
-    }
2597 
+	}
2598 2598
2599 2599 
 }
2600 2600 
 

@@ -2611,20 +2611,20 @@  discard block
 
 block discarded – undo
2611 2611 
  */
2612 2612 
 function geodir_excerpt_length($length)
2613 2613 
 {
2614 
-    global $wp_query, $geodir_is_widget_listing;
2614 
+	global $wp_query, $geodir_is_widget_listing;
2615 2615 
 	if ($geodir_is_widget_listing) {
2616 2616 
 		return $length;
2617 2617 
 	}
2618 2618
2619 
-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
2620 
-        $length = get_option('geodir_desc_word_limit');
2621 
-    elseif (get_query_var('excerpt_length'))
2622 
-        $length = get_query_var('excerpt_length');
2619 
+	if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
2620 
+		$length = get_option('geodir_desc_word_limit');
2621 
+	elseif (get_query_var('excerpt_length'))
2622 
+		$length = get_query_var('excerpt_length');
2623 2623
2624 
-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
2625 
-        $length = get_option('geodir_author_desc_word_limit');
2624 
+	if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
2625 
+		$length = get_option('geodir_author_desc_word_limit');
2626 2626
2627 
-    return $length;
2627 
+	return $length;
2628 2628 
 }
2629 2629
2630 2630 
 /**

@@ -2639,13 +2639,13 @@  discard block
 
 block discarded – undo
2639 2639 
  */
2640 2640 
 function geodir_excerpt_more($more)
2641 2641 
 {
2642 
-    global $post;
2643 
-    $all_postypes = geodir_get_posttypes();
2644 
-    if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
2645 
-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';
2646 
-    }
2642 
+	global $post;
2643 
+	$all_postypes = geodir_get_posttypes();
2644 
+	if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
2645 
+		return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';
2646 
+	}
2647 2647
2648 
-    return $more;
2648 
+	return $more;
2649 2649 
 }
2650 2650
2651 2651 
 

@@ -2662,63 +2662,63 @@  discard block
 
 block discarded – undo
2662 2662 
  */
2663 2663 
 function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy)
2664 2664 
 {
2665 
-    global $plugin_prefix, $wpdb;
2665 
+	global $plugin_prefix, $wpdb;
2666 2666
2667 
-    $gd_taxonomies = geodir_get_taxonomies();
2667 
+	$gd_taxonomies = geodir_get_taxonomies();
2668 2668
2669 
-    if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
2669 
+	if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
2670 2670
2671 
-        $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
2672 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
2671 
+		$geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
2672 
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
2673 2673
2674 
-        $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
2675 
-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
2674 
+		$path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
2675 
+		$term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
2676 2676
2677 
-        $posts = $wpdb->get_results(
2678 
-            $wpdb->prepare(
2679 
-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
2680 
-                array($term_id, $taxonomy)
2681 
-            )
2682 
-        );
2677 
+		$posts = $wpdb->get_results(
2678 
+			$wpdb->prepare(
2679 
+				"SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
2680 
+				array($term_id, $taxonomy)
2681 
+			)
2682 
+		);
2683 2683
2684 
-        if (!empty($posts)):
2685 
-            foreach ($posts as $post_obj) {
2684 
+		if (!empty($posts)):
2685 
+			foreach ($posts as $post_obj) {
2686 2686
2687 
-                $lat = $post_obj->post_latitude;
2688 
-                $lng = $post_obj->post_longitude;
2687 
+				$lat = $post_obj->post_latitude;
2688 
+				$lng = $post_obj->post_longitude;
2689 2689
2690 
-                $json = '{';
2691 
-                $json .= '"id":"' . $post_obj->post_id . '",';
2692 
-                $json .= '"lat_pos": "' . $lat . '",';
2693 
-                $json .= '"long_pos": "' . $lng . '",';
2694 
-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
2695 
-                $json .= '"icon":"' . $term_icon . '",';
2696 
-                $json .= '"group":"catgroup' . $term_id . '"';
2697 
-                $json .= '}';
2690 
+				$json = '{';
2691 
+				$json .= '"id":"' . $post_obj->post_id . '",';
2692 
+				$json .= '"lat_pos": "' . $lat . '",';
2693 
+				$json .= '"long_pos": "' . $lng . '",';
2694 
+				$json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
2695 
+				$json .= '"icon":"' . $term_icon . '",';
2696 
+				$json .= '"group":"catgroup' . $term_id . '"';
2697 
+				$json .= '}';
2698 2698
2699 
-                if ($post_obj->default_category == $term_id) {
2699 
+				if ($post_obj->default_category == $term_id) {
2700 2700
2701 
-                    $wpdb->query(
2702 
-                        $wpdb->prepare(
2703 
-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",
2704 
-                            array($json, $post_obj->post_id)
2705 
-                        )
2706 
-                    );
2707 
-                }
2701 
+					$wpdb->query(
2702 
+						$wpdb->prepare(
2703 
+							"UPDATE " . $table . " SET marker_json = %s where post_id = %d",
2704 
+							array($json, $post_obj->post_id)
2705 
+						)
2706 
+					);
2707 
+				}
2708 2708
2709 
-                $wpdb->query(
2710 
-                    $wpdb->prepare(
2711 
-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
2712 
-                        array($json, $post_obj->post_id, $term_id)
2713 
-                    )
2714 
-                );
2709 
+				$wpdb->query(
2710 
+					$wpdb->prepare(
2711 
+						"UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
2712 
+						array($json, $post_obj->post_id, $term_id)
2713 
+					)
2714 
+				);
2715 2715
2716 
-            }
2716 
+			}
2717 2717
2718 2718
2719 
-        endif;
2719 
+		endif;
2720 2720
2721 
-    }
2721 
+	}
2722 2722
2723 2723 
 }
2724 2724 
 

@@ -2732,14 +2732,14 @@  discard block
 
 block discarded – undo
2732 2732 
  */
2733 2733 
 function geodir_get_listing_author($listing_id = '')
2734 2734 
 {
2735 
-    if ($listing_id == '') {
2736 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
2737 
-            $listing_id = $_REQUEST['pid'];
2738 
-        }
2739 
-    }
2740 
-    $listing = get_post(strip_tags($listing_id));
2741 
-    $listing_author_id = $listing->post_author;
2742 
-    return $listing_author_id;
2735 
+	if ($listing_id == '') {
2736 
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
2737 
+			$listing_id = $_REQUEST['pid'];
2738 
+		}
2739 
+	}
2740 
+	$listing = get_post(strip_tags($listing_id));
2741 
+	$listing_author_id = $listing->post_author;
2742 
+	return $listing_author_id;
2743 2743 
 }
2744 2744
2745 2745 
 

@@ -2754,11 +2754,11 @@  discard block
 
 block discarded – undo
2754 2754 
  */
2755 2755 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)
2756 2756 
 {
2757 
-    $listing_author_id = geodir_get_listing_author($listing_id);
2758 
-    if ($listing_author_id == $user_id)
2759 
-        return true;
2760 
-    else
2761 
-        return false;
2757 
+	$listing_author_id = geodir_get_listing_author($listing_id);
2758 
+	if ($listing_author_id == $user_id)
2759 
+		return true;
2760 
+	else
2761 
+		return false;
2762 2762
2763 2763 
 }
2764 2764 
 

@@ -2774,17 +2774,17 @@  discard block
 
 block discarded – undo
2774 2774 
  */
2775 2775 
 function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true)
2776 2776 
 {
2777 
-    global $current_user;
2778 
-    if ($exclude_admin) {
2779 
-        foreach ($current_user->caps as $key => $caps) {
2780 
-            if (geodir_strtolower($key) == 'administrator') {
2781 
-                return true;
2782 
-                break;
2783 
-            }
2784 
-        }
2785 
-    }
2786 
-
2787 
-    return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);
2777 
+	global $current_user;
2778 
+	if ($exclude_admin) {
2779 
+		foreach ($current_user->caps as $key => $caps) {
2780 
+			if (geodir_strtolower($key) == 'administrator') {
2781 
+				return true;
2782 
+				break;
2783 
+			}
2784 
+		}
2785 
+	}
2786 
+
2787 
+	return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);
2788 2788 
 }
2789 2789
2790 2790 
 

@@ -2800,17 +2800,17 @@  discard block
 
 block discarded – undo
2800 2800 
 function geodir_only_supportable_attachments_remove($file)
2801 2801 
 {
2802 2802
2803 
-    global $wpdb;
2803 
+	global $wpdb;
2804 2804
2805 
-    $matches = array();
2805 
+	$matches = array();
2806 2806
2807 
-    $pattern = '/-\d+x\d+\./';
2808 
-    preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
2807 
+	$pattern = '/-\d+x\d+\./';
2808 
+	preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
2809 2809
2810 
-    if (empty($matches))
2811 
-        return '';
2812 
-    else
2813 
-        return $file;
2810 
+	if (empty($matches))
2811 
+		return '';
2812 
+	else
2813 
+		return $file;
2814 2814
2815 2815 
 }
2816 2816 
 

@@ -2827,78 +2827,78 @@  discard block
 
 block discarded – undo
2827 2827 
 function geodir_set_wp_featured_image($post_id)
2828 2828 
 {
2829 2829
2830 
-    global $wpdb, $plugin_prefix;
2831 
-    $uploads = wp_upload_dir();
2830 
+	global $wpdb, $plugin_prefix;
2831 
+	$uploads = wp_upload_dir();
2832 2832 
 //	print_r($uploads ) ;
2833 
-    $post_first_image = $wpdb->get_results(
2834 
-        $wpdb->prepare(
2835 
-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
2836 
-        )
2837 
-    );
2838 
-
2839 
-    $old_attachment_name = '';
2840 
-    $post_thumbnail_id = '';
2841 
-    if (has_post_thumbnail($post_id)) {
2833 
+	$post_first_image = $wpdb->get_results(
2834 
+		$wpdb->prepare(
2835 
+			"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
2836 
+		)
2837 
+	);
2842 2838
2843 
-        if (has_post_thumbnail($post_id)) {
2839 
+	$old_attachment_name = '';
2840 
+	$post_thumbnail_id = '';
2841 
+	if (has_post_thumbnail($post_id)) {
2844 2842
2845 
-            $post_thumbnail_id = get_post_thumbnail_id($post_id);
2843 
+		if (has_post_thumbnail($post_id)) {
2846 2844
2847 
-            $old_attachment_name = basename(get_attached_file($post_thumbnail_id));
2845 
+			$post_thumbnail_id = get_post_thumbnail_id($post_id);
2848 2846
2849 
-        }
2850 
-    }
2847 
+			$old_attachment_name = basename(get_attached_file($post_thumbnail_id));
2851 2848
2852 
-    if (!empty($post_first_image)) {
2849 
+		}
2850 
+	}
2853 2851
2854 
-        $post_type = get_post_type($post_id);
2852 
+	if (!empty($post_first_image)) {
2855 2853
2856 
-        $table_name = $plugin_prefix . $post_type . '_detail';
2854 
+		$post_type = get_post_type($post_id);
2857 2855
2858 
-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
2856 
+		$table_name = $plugin_prefix . $post_type . '_detail';
2859 2857
2860 
-        $new_attachment_name = basename($post_first_image[0]->file);
2858 
+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
2861 2859
2862 
-        if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
2860 
+		$new_attachment_name = basename($post_first_image[0]->file);
2863 2861
2864 
-            if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
2862 
+		if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
2865 2863
2866 
-                add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
2864 
+			if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
2867 2865
2868 
-                wp_delete_attachment($post_thumbnail_id);
2866 
+				add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
2869 2867
2870 
-            }
2871 
-            $filename = $uploads['basedir'] . $post_first_image[0]->file;
2868 
+				wp_delete_attachment($post_thumbnail_id);
2872 2869
2873 
-            $attachment = array(
2874 
-                'post_mime_type' => $post_first_image[0]->mime_type,
2875 
-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
2876 
-                'post_parent' => $post_id,
2877 
-                'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
2878 
-                'post_content' => ''
2879 
-            );
2870 
+			}
2871 
+			$filename = $uploads['basedir'] . $post_first_image[0]->file;
2872 
+
2873 
+			$attachment = array(
2874 
+				'post_mime_type' => $post_first_image[0]->mime_type,
2875 
+				'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
2876 
+				'post_parent' => $post_id,
2877 
+				'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
2878 
+				'post_content' => ''
2879 
+			);
2880 2880
2881 2881
2882 
-            $id = wp_insert_attachment($attachment, $filename, $post_id);
2882 
+			$id = wp_insert_attachment($attachment, $filename, $post_id);
2883 2883
2884 
-            if (!is_wp_error($id)) {
2884 
+			if (!is_wp_error($id)) {
2885 2885
2886 
-                set_post_thumbnail($post_id, $id);
2886 
+				set_post_thumbnail($post_id, $id);
2887 2887
2888 
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
2889 
-                wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
2888 
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
2889 
+				wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
2890 2890
2891 
-            }
2891 
+			}
2892 2892
2893 
-        }
2893 
+		}
2894 2894
2895 
-    } else {
2896 
-        //set_post_thumbnail($post_id,-1);
2895 
+	} else {
2896 
+		//set_post_thumbnail($post_id,-1);
2897 2897
2898 
-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
2899 
-            wp_delete_attachment($post_thumbnail_id);
2898 
+		if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
2899 
+			wp_delete_attachment($post_thumbnail_id);
2900 2900
2901 
-    }
2901 
+	}
2902 2902 
 }
2903 2903
2904 2904 
 

@@ -2913,53 +2913,53 @@  discard block
 
 block discarded – undo
2913 2913 
  */
2914 2914 
 function gd_copy_original_translation()
2915 2915 
 {
2916 
-    if (function_exists('icl_object_id')) {
2917 
-        global $wpdb, $table_prefix, $plugin_prefix;
2918 
-        $post_id = absint($_POST['post_id']);
2919 
-        $upload_dir = wp_upload_dir();
2920 
-        $post_type = get_post_type($_POST['post_id']);
2921 
-        $table = $plugin_prefix . $post_type . '_detail';
2922 
-
2923 
-        $post_arr = $wpdb->get_results($wpdb->prepare(
2924 
-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2925 
-            array($post_id)
2926 
-        )
2927 
-            , ARRAY_A);
2928 
-
2929 
-        $arrImages = $wpdb->get_results(
2930 
-            $wpdb->prepare(
2931 
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2932 
-                array('%image%', $post_id)
2933 
-            )
2934 
-        );
2935 
-        if ($arrImages) {
2936 
-            $image_arr = array();
2937 
-            foreach ($arrImages as $img) {
2938 
-                $image_arr[] = $upload_dir['baseurl'] . $img->file;
2939 
-            }
2940 
-            $comma_separated = implode(",", $image_arr);
2941 
-            $post_arr[0]['post_images'] = $comma_separated;
2942 
-        }
2943 
-
2944 
-
2945 
-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
2946 
-        $cat_arr = array_filter(explode(",", $cats));
2947 
-        $trans_cat = array();
2948 
-        foreach ($cat_arr as $cat) {
2949 
-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
2950 
-        }
2951 
-
2952 
-
2953 
-        $post_arr[0]['categories'] = array_filter($trans_cat);
2916 
+	if (function_exists('icl_object_id')) {
2917 
+		global $wpdb, $table_prefix, $plugin_prefix;
2918 
+		$post_id = absint($_POST['post_id']);
2919 
+		$upload_dir = wp_upload_dir();
2920 
+		$post_type = get_post_type($_POST['post_id']);
2921 
+		$table = $plugin_prefix . $post_type . '_detail';
2922 
+
2923 
+		$post_arr = $wpdb->get_results($wpdb->prepare(
2924 
+			"SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2925 
+			array($post_id)
2926 
+		)
2927 
+			, ARRAY_A);
2928 
+
2929 
+		$arrImages = $wpdb->get_results(
2930 
+			$wpdb->prepare(
2931 
+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2932 
+				array('%image%', $post_id)
2933 
+			)
2934 
+		);
2935 
+		if ($arrImages) {
2936 
+			$image_arr = array();
2937 
+			foreach ($arrImages as $img) {
2938 
+				$image_arr[] = $upload_dir['baseurl'] . $img->file;
2939 
+			}
2940 
+			$comma_separated = implode(",", $image_arr);
2941 
+			$post_arr[0]['post_images'] = $comma_separated;
2942 
+		}
2943 
+
2944 
+
2945 
+		$cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
2946 
+		$cat_arr = array_filter(explode(",", $cats));
2947 
+		$trans_cat = array();
2948 
+		foreach ($cat_arr as $cat) {
2949 
+			$trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
2950 
+		}
2951 
+
2952 
+
2953 
+		$post_arr[0]['categories'] = array_filter($trans_cat);
2954 2954 
 //print_r($image_arr);
2955 
-        //print_r($arrImages);
2956 
-        //echo $_REQUEST['lang'];
2955 
+		//print_r($arrImages);
2956 
+		//echo $_REQUEST['lang'];
2957 2957 
 //print_r($post_arr);
2958 2958 
 //print_r($trans_cat);
2959 
-        echo json_encode($post_arr[0]);
2959 
+		echo json_encode($post_arr[0]);
2960 2960
2961 
-    }
2962 
-    die();
2961 
+	}
2962 
+	die();
2963 2963 
 }
2964 2964
2965 2965 
 

@@ -2979,54 +2979,54 @@  discard block
 
 block discarded – undo
2979 2979 
 function geodir_get_custom_fields_type($listing_type = '')
2980 2980 
 {
2981 2981
2982 
-    global $wpdb;
2982 
+	global $wpdb;
2983 2983
2984 
-    if ($listing_type == '')
2985 
-        $listing_type = 'gd_place';
2984 
+	if ($listing_type == '')
2985 
+		$listing_type = 'gd_place';
2986 2986
2987 
-    $fields_info = array();
2987 
+	$fields_info = array();
2988 2988
2989 
-    $get_data = $wpdb->get_results(
2990 
-        $wpdb->prepare(
2991 
-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
2992 
-            array($listing_type)
2993 
-        )
2994 
-    );
2989 
+	$get_data = $wpdb->get_results(
2990 
+		$wpdb->prepare(
2991 
+			"SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
2992 
+			array($listing_type)
2993 
+		)
2994 
+	);
2995 2995
2996 
-    if (!empty($get_data)) {
2996 
+	if (!empty($get_data)) {
2997 2997
2998 
-        foreach ($get_data as $data) {
2998 
+		foreach ($get_data as $data) {
2999 2999
3000 
-            if ($data->field_type == 'address') {
3000 
+			if ($data->field_type == 'address') {
3001 3001
3002 
-                $extra_fields = unserialize($data->extra_fields);
3002 
+				$extra_fields = unserialize($data->extra_fields);
3003 3003
3004 
-                $prefix = $data->htmlvar_name . '_';
3004 
+				$prefix = $data->htmlvar_name . '_';
3005 3005
3006 
-                $fields_info[$prefix . 'address'] = $data->field_type;
3006 
+				$fields_info[$prefix . 'address'] = $data->field_type;
3007 3007
3008 
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3009 
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
3008 
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3009 
+					$fields_info[$prefix . 'zip'] = $data->field_type;
3010 3010
3011 
-            } else {
3011 
+			} else {
3012 3012
3013 
-                $fields_info[$data->htmlvar_name] = $data->field_type;
3013 
+				$fields_info[$data->htmlvar_name] = $data->field_type;
3014 3014
3015 
-            }
3015 
+			}
3016 3016
3017 
-        }
3017 
+		}
3018 3018
3019 
-    }
3019 
+	}
3020 3020
3021 
-    /**
3022 
-     * Filter to modify custom fields info using listing post type.
3023 
-     *
3024 
-     * @since 1.0.0
3025 
-     * @package GeoDirectory
3026 
-     * @return array $fields_info Custom fields info.
3027 
-     * @param string $listing_type The listing post type.
3028 
-     */
3029 
-    return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
3021 
+	/**
3022 
+	 * Filter to modify custom fields info using listing post type.
3023 
+	 *
3024 
+	 * @since 1.0.0
3025 
+	 * @package GeoDirectory
3026 
+	 * @return array $fields_info Custom fields info.
3027 
+	 * @param string $listing_type The listing post type.
3028 
+	 */
3029 
+	return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
3030 3030 
 }
3031 3031
3032 3032 
 

@@ -3041,58 +3041,58 @@  discard block
 
 block discarded – undo
3041 3041 
  */
3042 3042 
 function geodir_function_post_updated($post_ID, $post_after, $post_before)
3043 3043 
 {
3044 
-    $post_type = get_post_type($post_ID);
3044 
+	$post_type = get_post_type($post_ID);
3045 3045
3046 
-    if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
3047 
-        // send notification to client when post moves from draft to publish
3048 
-        if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {
3049 
-            $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;
3050 
-            $post_author_data = get_userdata($post_author_id);
3046 
+	if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
3047 
+		// send notification to client when post moves from draft to publish
3048 
+		if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {
3049 
+			$post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;
3050 
+			$post_author_data = get_userdata($post_author_id);
3051 3051
3052 
-            $to_name = geodir_get_client_name($post_author_id);
3052 
+			$to_name = geodir_get_client_name($post_author_id);
3053 3053
3054 
-            $from_email = geodir_get_site_email_id();
3055 
-            $from_name = get_site_emailName();
3056 
-            $to_email = $post_author_data->user_email;
3054 
+			$from_email = geodir_get_site_email_id();
3055 
+			$from_name = get_site_emailName();
3056 
+			$to_email = $post_author_data->user_email;
3057 3057
3058 
-            if (!is_email($to_email) && !empty($post_author_data->user_email)) {
3059 
-                $to_email = $post_author_data->user_email;
3060 
-            }
3058 
+			if (!is_email($to_email) && !empty($post_author_data->user_email)) {
3059 
+				$to_email = $post_author_data->user_email;
3060 
+			}
3061 3061
3062 
-            $message_type = 'listing_published';
3062 
+			$message_type = 'listing_published';
3063 3063
3064 
-            if (get_option('geodir_post_published_email_subject') == '') {
3065 
-                update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
3066 
-            }
3064 
+			if (get_option('geodir_post_published_email_subject') == '') {
3065 
+				update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
3066 
+			}
3067 3067
3068 
-            if (get_option('geodir_post_published_email_content') == '') {
3069 
-                update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));
3070 
-            }
3068 
+			if (get_option('geodir_post_published_email_content') == '') {
3069 
+				update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));
3070 
+			}
3071 3071
3072 
-            /**
3073 
-             * Called before sending the email when listing gets published.
3074 
-             *
3075 
-             * @since 1.0.0
3076 
-             * @package GeoDirectory
3077 
-             * @param object $post_after The post object after update.
3078 
-             * @param object $post_before The post object before update.
3079 
-             */
3080 
-            do_action('geodir_before_listing_published_email', $post_after, $post_before);
3081 
-            if (is_email($to_email)) {
3082 
-                geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);
3083 
-            }
3072 
+			/**
3073 
+			 * Called before sending the email when listing gets published.
3074 
+			 *
3075 
+			 * @since 1.0.0
3076 
+			 * @package GeoDirectory
3077 
+			 * @param object $post_after The post object after update.
3078 
+			 * @param object $post_before The post object before update.
3079 
+			 */
3080 
+			do_action('geodir_before_listing_published_email', $post_after, $post_before);
3081 
+			if (is_email($to_email)) {
3082 
+				geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);
3083 
+			}
3084 3084
3085 
-            /**
3086 
-             * Called after sending the email when listing gets published.
3087 
-             *
3088 
-             * @since 1.0.0
3089 
-             * @package GeoDirectory
3090 
-             * @param object $post_after The post object after update.
3091 
-             * @param object $post_before The post object before update.
3092 
-             */
3093 
-            do_action('geodir_after_listing_published_email', $post_after, $post_before);
3094 
-        }
3095 
-    }
3085 
+			/**
3086 
+			 * Called after sending the email when listing gets published.
3087 
+			 *
3088 
+			 * @since 1.0.0
3089 
+			 * @package GeoDirectory
3090 
+			 * @param object $post_after The post object after update.
3091 
+			 * @param object $post_before The post object before update.
3092 
+			 */
3093 
+			do_action('geodir_after_listing_published_email', $post_after, $post_before);
3094 
+		}
3095 
+	}
3096 3096 
 }
3097 3097
3098 3098 
 add_action('wp_head', 'geodir_fb_like_thumbnail');

@@ -3106,14 +3106,14 @@  discard block
 
 block discarded – undo
3106 3106 
  */
3107 3107 
 function geodir_fb_like_thumbnail(){
3108 3108
3109 
-    // return if not a single post
3110 
-    if(!is_single()){return;}
3109 
+	// return if not a single post
3110 
+	if(!is_single()){return;}
3111 3111
3112 
-    global $post;
3113 
-    if(isset($post->featured_image) && $post->featured_image){
3114 
-        $upload_dir = wp_upload_dir();
3115 
-        $thumb = $upload_dir['baseurl'].$post->featured_image;
3116 
-        echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
3112 
+	global $post;
3113 
+	if(isset($post->featured_image) && $post->featured_image){
3114 
+		$upload_dir = wp_upload_dir();
3115 
+		$thumb = $upload_dir['baseurl'].$post->featured_image;
3116 
+		echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
3117 3117
3118 
-    }
3118 
+	}
3119 3119 
 }
3120 3120 
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-admin/admin_db_install.php 3 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -23,8 +23,12 @@
 
 block discarded – undo
23 23
24 24 
         $collate = '';
25 25 
         if ($wpdb->has_cap('collation')) {
26 
-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
27 
-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
26 
+            if (!empty($wpdb->charset)) {
27 
+            	$collate = "DEFAULT CHARACTER SET $wpdb->charset";
28 
+            }
29 
+            if (!empty($wpdb->collate)) {
30 
+            	$collate .= " COLLATE $wpdb->collate";
31 
+            }
28 32 
         }
29 33
30 34 
 		/**
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch 
@@ -32,35 +32,35 @@  discard block
 
 block discarded – undo
32 32 
 		 *
33 33 
 		 * @since 1.0.0
34 34 
 		 */
35 
-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
35 
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
36 36
37 37
38 38 
 // rename tables if we need to
39 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
40 
-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
39 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_countries'") == 0) {
40 
+            $wpdb->query("RENAME TABLE geodir_countries TO ".$wpdb->prefix."geodir_countries");
41 41 
         }
42 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
43 
-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
42 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_fields'") == 0) {
43 
+            $wpdb->query("RENAME TABLE geodir_custom_fields TO ".$wpdb->prefix."geodir_custom_fields");
44 44 
         }
45 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
46 
-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
45 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_icon'") == 0) {
46 
+            $wpdb->query("RENAME TABLE geodir_post_icon TO ".$wpdb->prefix."geodir_post_icon");
47 47 
         }
48 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
49 
-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
48 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_attachments'") == 0) {
49 
+            $wpdb->query("RENAME TABLE geodir_attachments TO ".$wpdb->prefix."geodir_attachments");
50 50 
         }
51 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
52 
-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
51 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_review'") == 0) {
52 
+            $wpdb->query("RENAME TABLE geodir_post_review TO ".$wpdb->prefix."geodir_post_review");
53 53 
         }
54 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
55 
-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
54 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_sort_fields'") == 0) {
55 
+            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO ".$wpdb->prefix."geodir_custom_sort_fields");
56 56 
         }
57 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
58 
-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
57 
+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_gd_place_detail'") == 0) {
58 
+            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO ".$wpdb->prefix."geodir_gd_place_detail");
59 59 
         }
60 60
61 61
62 62 
         // Table for storing Countries
63 
-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (
63 
+        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE ".GEODIR_COUNTRIES_TABLE." (
64 64 
 						CountryId smallint AUTO_INCREMENT NOT NULL ,
65 65 
 						Country varchar (50) NOT NULL ,
66 66 
 						FIPS104 varchar (2) NOT NULL ,

@@ -89,11 +89,11 @@  discard block
 
 block discarded – undo
89 89 
         dbDelta($GEODIR_COUNTRIES_TABLE);
90 90
91 91
92 
-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
92 
+        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM ".GEODIR_COUNTRIES_TABLE."");
93 93
94 94 
         if ($country_table_empty == 0) {
95 95
96 
-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
96 
+            $countries_insert = "INSERT INTO ".GEODIR_COUNTRIES_TABLE." (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
97 97 
 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),
98 98 
 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),
99 99 
 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -382,7 +382,7 @@  discard block
 
 block discarded – undo
382 382
383 383 
         // Table for storing location attribute - these are user defined
384 384
385 
-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (
385 
+        $icon_table = "CREATE TABLE ".GEODIR_ICON_TABLE." (
386 386 
 						id int NOT NULL AUTO_INCREMENT,
387 387 
 						post_id int( 10 ) NOT NULL,
388 388 
 						post_title varchar(254) NOT NULL,

@@ -403,7 +403,7 @@  discard block
 
 block discarded – undo
403 403
404 404 
         // Table for storing post custom fields - these are user defined
405 405
406 
-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (
406 
+        $post_custom_fields = "CREATE TABLE ".GEODIR_CUSTOM_FIELDS_TABLE." (
407 407 
 							  id int(11) NOT NULL AUTO_INCREMENT,
408 408 
 							  post_type varchar(100) NULL,
409 409 
 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -448,7 +448,7 @@  discard block
 
 block discarded – undo
448 448 
         dbDelta($post_custom_fields);
449 449
450 450 
         // Table for storing place attribute - these are user defined
451 
-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (
451 
+        $post_detail = "CREATE TABLE ".$plugin_prefix."gd_place_detail (
452 452 
 						post_id int(11) NOT NULL,
453 453 
 						post_title text NULL DEFAULT NULL,
454 454 
 						post_status varchar(20) NULL DEFAULT NULL,

@@ -489,7 +489,7 @@  discard block
 
 block discarded – undo
489 489
490 490 
         // Table for storing place images - these are user defined
491 491
492 
-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (
492 
+        $attechment_table = "CREATE TABLE ".GEODIR_ATTACHMENT_TABLE." (
493 493 
 						ID int(11) NOT NULL AUTO_INCREMENT,
494 494 
 						post_id int(11) NOT NULL,
495 495 
 						user_id int(11) DEFAULT NULL,

@@ -516,7 +516,7 @@  discard block
 
 block discarded – undo
516 516 
         dbDelta($attechment_table);
517 517
518 518
519 
-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (
519 
+        $custom_sort_fields_table = "CREATE TABLE ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." (
520 520 
 			id int(11) NOT NULL AUTO_INCREMENT,
521 521 
 			post_type varchar(255) NOT NULL,
522 522 
 			data_type varchar(255) NOT NULL,

@@ -545,7 +545,7 @@  discard block
 
 block discarded – undo
545 545 
         dbDelta($custom_sort_fields_table);
546 546
547 547
548 
-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (
548 
+            $review_table = "CREATE TABLE ".GEODIR_REVIEW_TABLE." (
549 549 
 			id int(11) NOT NULL AUTO_INCREMENT,
550 550 
 			post_id int(11) DEFAULT NULL,
551 551 
 			post_title varchar( 255 ) NULL DEFAULT NULL,
Please login to merge, or discard this patch.
Indentation   +155 added lines, -155 removed lines patch added patch discarded remove patch 
@@ -6,26 +6,26 @@  discard block
 
 block discarded – undo
6 6 
  * @package GeoDirectory
7 7 
  */
8 8 
 if (!function_exists('geodir_create_tables')) {
9 
-    /**
10 
-     * Creates custom db tables for storing GeoDirectory plugin data.
11 
-     *
12 
-     * @since 1.0.0
13 
-     * @package GeoDirectory
14 
-     * @global object $wpdb WordPress Database object.
15 
-     * @global string $plugin_prefix GeoDirectory plugin table prefix.
16 
-     */
17 
-    function geodir_create_tables()
18 
-    {
19 
-
20 
-        global $wpdb, $plugin_prefix;
21 
-
22 
-        $wpdb->hide_errors();
23 
-
24 
-        $collate = '';
25 
-        if ($wpdb->has_cap('collation')) {
26 
-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
27 
-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
28 
-        }
9 
+	/**
10 
+	 * Creates custom db tables for storing GeoDirectory plugin data.
11 
+	 *
12 
+	 * @since 1.0.0
13 
+	 * @package GeoDirectory
14 
+	 * @global object $wpdb WordPress Database object.
15 
+	 * @global string $plugin_prefix GeoDirectory plugin table prefix.
16 
+	 */
17 
+	function geodir_create_tables()
18 
+	{
19 
+
20 
+		global $wpdb, $plugin_prefix;
21 
+
22 
+		$wpdb->hide_errors();
23 
+
24 
+		$collate = '';
25 
+		if ($wpdb->has_cap('collation')) {
26 
+			if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
27 
+			if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
28 
+		}
29 29
30 30 
 		/**
31 31 
 		 * Include any functions needed for upgrades.

@@ -36,31 +36,31 @@  discard block
 
 block discarded – undo
36 36
37 37
38 38 
 // rename tables if we need to
39 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
40 
-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
41 
-        }
42 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
43 
-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
44 
-        }
45 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
46 
-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
47 
-        }
48 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
49 
-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
50 
-        }
51 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
52 
-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
53 
-        }
54 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
55 
-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
56 
-        }
57 
-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
58 
-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
59 
-        }
60 
-
61 
-
62 
-        // Table for storing Countries
63 
-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (
39 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
40 
+			$wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
41 
+		}
42 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
43 
+			$wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
44 
+		}
45 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
46 
+			$wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
47 
+		}
48 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
49 
+			$wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
50 
+		}
51 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
52 
+			$wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
53 
+		}
54 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
55 
+			$wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
56 
+		}
57 
+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
58 
+			$wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
59 
+		}
60 
+
61 
+
62 
+		// Table for storing Countries
63 
+		$GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (
64 64 
 						CountryId smallint AUTO_INCREMENT NOT NULL ,
65 65 
 						Country varchar (50) NOT NULL ,
66 66 
 						FIPS104 varchar (2) NOT NULL ,

@@ -79,21 +79,21 @@  discard block
 
 block discarded – undo
79 79 
 						Comment varchar (255) NULL ,
80 80 
 						PRIMARY KEY  (CountryId)) $collate ";
81 81
82 
-        /**
83 
-         * Filter the SQL query that creates/updates the country DB table structure.
84 
-         *
85 
-         * @since 1.0.0
86 
-         * @param string $sql The SQL insert query string.
87 
-         */
88 
-        $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);
89 
-        dbDelta($GEODIR_COUNTRIES_TABLE);
82 
+		/**
83 
+		 * Filter the SQL query that creates/updates the country DB table structure.
84 
+		 *
85 
+		 * @since 1.0.0
86 
+		 * @param string $sql The SQL insert query string.
87 
+		 */
88 
+		$GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);
89 
+		dbDelta($GEODIR_COUNTRIES_TABLE);
90 90
91 91
92 
-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
92 
+		$country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
93 93
94 
-        if ($country_table_empty == 0) {
94 
+		if ($country_table_empty == 0) {
95 95
96 
-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
96 
+			$countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES
97 97 
 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),
98 98 
 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),
99 99 
 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -371,21 +371,21 @@  discard block
 
 block discarded – undo
371 371 
     (281, 'South Sudan', '--', 'SS', '-- ', '--', 'SS', '', '', '', '', 'South Sudanese pound', 'SSP', 12340000, 'South Sudan', ''),
372 372 
     (282, 'Isle of Man', '--', 'IM', '-- ', '--', 'IM', '', '', '', '', 'Manx pound', 'IMP', 84497, 'Isle of Man', '')";
373 373
374 
-            /**
375 
-             * Filter the SQL query that inserts the country DB table data.
376 
-             *
377 
-             * @since 1.0.0
378 
-             * @param string $sql The SQL insert query string.
379 
-             */
380 
-            $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);
381 
-            $wpdb->query($countries_insert);
374 
+			/**
375 
+			 * Filter the SQL query that inserts the country DB table data.
376 
+			 *
377 
+			 * @since 1.0.0
378 
+			 * @param string $sql The SQL insert query string.
379 
+			 */
380 
+			$countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);
381 
+			$wpdb->query($countries_insert);
382 382
383 
-        }
383 
+		}
384 384
385 385
386 
-        // Table for storing location attribute - these are user defined
386 
+		// Table for storing location attribute - these are user defined
387 387
388 
-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (
388 
+		$icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (
389 389 
 						id int NOT NULL AUTO_INCREMENT,
390 390 
 						post_id int( 10 ) NOT NULL,
391 391 
 						post_title varchar(254) NOT NULL,

@@ -394,19 +394,19 @@  discard block
 
 block discarded – undo
394 394 
 						PRIMARY KEY  (id)
395 395 
 						) $collate ";
396 396
397 
-        /**
398 
-         * Filter the SQL query that creates/updates the post_icon DB table structure.
399 
-         *
400 
-         * @since 1.0.0
401 
-         * @param string $sql The SQL insert query string.
402 
-         */
403 
-        $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);
397 
+		/**
398 
+		 * Filter the SQL query that creates/updates the post_icon DB table structure.
399 
+		 *
400 
+		 * @since 1.0.0
401 
+		 * @param string $sql The SQL insert query string.
402 
+		 */
403 
+		$icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);
404 404
405 
-        dbDelta($icon_table);
405 
+		dbDelta($icon_table);
406 406
407 
-        // Table for storing post custom fields - these are user defined
407 
+		// Table for storing post custom fields - these are user defined
408 408
409 
-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (
409 
+		$post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (
410 410 
 							  id int(11) NOT NULL AUTO_INCREMENT,
411 411 
 							  post_type varchar(100) NULL,
412 412 
 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -442,18 +442,18 @@  discard block
 
 block discarded – undo
442 442 
 							  PRIMARY KEY  (id)
443 443 
 							  ) $collate";
444 444
445 
-        /**
446 
-         * Filter the SQL query that creates/updates the custom_fields DB table structure.
447 
-         *
448 
-         * @since 1.0.0
449 
-         * @param string $sql The SQL insert query string.
450 
-         */
451 
-        $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);
445 
+		/**
446 
+		 * Filter the SQL query that creates/updates the custom_fields DB table structure.
447 
+		 *
448 
+		 * @since 1.0.0
449 
+		 * @param string $sql The SQL insert query string.
450 
+		 */
451 
+		$post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);
452 452
453 
-        dbDelta($post_custom_fields);
453 
+		dbDelta($post_custom_fields);
454 454
455 
-        // Table for storing place attribute - these are user defined
456 
-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (
455 
+		// Table for storing place attribute - these are user defined
456 
+		$post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (
457 457 
 						post_id int(11) NOT NULL,
458 458 
 						post_title text NULL DEFAULT NULL,
459 459 
 						post_status varchar(20) NULL DEFAULT NULL,

@@ -482,22 +482,22 @@  discard block
 
 block discarded – undo
482 482 
 						KEY is_featured (is_featured)
483 483 
 						) $collate ";
484 484
485 
-        /**
486 
-         * Filter the SQL query that creates/updates the post_detail DB table structure.
487 
-         *
488 
-         * @since 1.0.0
489 
-         * @param string $sql The SQL insert query string.
490 
-         */
491 
-        $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);
485 
+		/**
486 
+		 * Filter the SQL query that creates/updates the post_detail DB table structure.
487 
+		 *
488 
+		 * @since 1.0.0
489 
+		 * @param string $sql The SQL insert query string.
490 
+		 */
491 
+		$post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);
492 492
493 
-        dbDelta($post_detail);
493 
+		dbDelta($post_detail);
494 494
495 
-        // alter post_title
496 
-        //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");
495 
+		// alter post_title
496 
+		//$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");
497 497
498 
-        // Table for storing place images - these are user defined
498 
+		// Table for storing place images - these are user defined
499 499
500 
-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (
500 
+		$attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (
501 501 
 						ID int(11) NOT NULL AUTO_INCREMENT,
502 502 
 						post_id int(11) NOT NULL,
503 503 
 						user_id int(11) DEFAULT NULL,

@@ -513,18 +513,18 @@  discard block
 
 block discarded – undo
513 513 
 						PRIMARY KEY  (ID)
514 514 
 						) $collate ";
515 515
516 
-        /**
517 
-         * Filter the SQL query that creates/updates the attachments DB table structure.
518 
-         *
519 
-         * @since 1.0.0
520 
-         * @param string $sql The SQL insert query string.
521 
-         */
522 
-        $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);
516 
+		/**
517 
+		 * Filter the SQL query that creates/updates the attachments DB table structure.
518 
+		 *
519 
+		 * @since 1.0.0
520 
+		 * @param string $sql The SQL insert query string.
521 
+		 */
522 
+		$attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);
523 523
524 
-        dbDelta($attechment_table);
524 
+		dbDelta($attechment_table);
525 525
526 526
527 
-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (
527 
+		$custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (
528 528 
 			id int(11) NOT NULL AUTO_INCREMENT,
529 529 
 			post_type varchar(255) NOT NULL,
530 530 
 			data_type varchar(255) NOT NULL,

@@ -542,18 +542,18 @@  discard block
 
 block discarded – undo
542 542 
 			PRIMARY KEY  (id)
543 543 
 			) $collate ";
544 544
545 
-        /**
546 
-         * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.
547 
-         *
548 
-         * @since 1.0.0
549 
-         * @param string $sql The SQL insert query string.
550 
-         */
551 
-        $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);
545 
+		/**
546 
+		 * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.
547 
+		 *
548 
+		 * @since 1.0.0
549 
+		 * @param string $sql The SQL insert query string.
550 
+		 */
551 
+		$custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);
552 552
553 
-        dbDelta($custom_sort_fields_table);
553 
+		dbDelta($custom_sort_fields_table);
554 554
555 555
556 
-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (
556 
+			$review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (
557 557 
 			id int(11) NOT NULL AUTO_INCREMENT,
558 558 
 			post_id int(11) DEFAULT NULL,
559 559 
 			post_title varchar( 255 ) NULL DEFAULT NULL,

@@ -577,51 +577,51 @@  discard block
 
 block discarded – undo
577 577 
 			PRIMARY KEY  (id)
578 578 
 			) $collate  ";
579 579
580 
-            /**
581 
-             * Filter the SQL query that creates the review DB table structure.
582 
-             *
583 
-             * @since 1.0.0
584 
-             * @param string $sql The SQL insert query string.
585 
-             */
586 
-            $review_table = apply_filters('geodir_before_review_table_create', $review_table);
587 
-            dbDelta($review_table);
580 
+			/**
581 
+			 * Filter the SQL query that creates the review DB table structure.
582 
+			 *
583 
+			 * @since 1.0.0
584 
+			 * @param string $sql The SQL insert query string.
585 
+			 */
586 
+			$review_table = apply_filters('geodir_before_review_table_create', $review_table);
587 
+			dbDelta($review_table);
588 588
589 589
590 590
591 
-        // Alter terms table
592 
-        $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
593 
-        if (!$term_icon_column) {
594 
-            $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
595 
-        }
591 
+		// Alter terms table
592 
+		$term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
593 
+		if (!$term_icon_column) {
594 
+			$wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
595 
+		}
596 596
597 
-        //require_once(geodir_plugin_path() . '/upgrade.php');
597 
+		//require_once(geodir_plugin_path() . '/upgrade.php');
598 598
599 599
600 
-    }
600 
+	}
601 601 
 } // END MAIN FUNCTION geodir_tables_install
602 602
603 603 
 if (!function_exists('geodir_create_default_fields')) {
604 
-    /**
605 
-     * Inserts default custom fields table data into database.
606 
-     *
607 
-     * @since 1.0.0
608 
-     * @package GeoDirectory
609 
-     */
610 
-    function geodir_create_default_fields()
611 
-    {
612 
-
613 
-        $fields = geodir_default_custom_fields('gd_place');
614 
-
615 
-        /**
616 
-         * Filter the array of default custom fields DB table data.
617 
-         *
618 
-         * @since 1.0.0
619 
-         * @param string $fields The default custom fields as an array.
620 
-         */
621 
-        $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
622 
-        foreach ($fields as $field_index => $field) {
623 
-            geodir_custom_field_save($field);
624 
-
625 
-        }
626 
-    }
604 
+	/**
605 
+	 * Inserts default custom fields table data into database.
606 
+	 *
607 
+	 * @since 1.0.0
608 
+	 * @package GeoDirectory
609 
+	 */
610 
+	function geodir_create_default_fields()
611 
+	{
612 
+
613 
+		$fields = geodir_default_custom_fields('gd_place');
614 
+
615 
+		/**
616 
+		 * Filter the array of default custom fields DB table data.
617 
+		 *
618 
+		 * @since 1.0.0
619 
+		 * @param string $fields The default custom fields as an array.
620 
+		 */
621 
+		$fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
622 
+		foreach ($fields as $field_index => $field) {
623 
+			geodir_custom_field_save($field);
624 
+
625 
+		}
626 
+	}
627 627 
 }
628 628 
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-admin/option-pages/permalink_settings_array.php 1 patch
Indentation   +178 added lines, -178 removed lines patch added patch discarded remove patch 
@@ -16,184 +16,184 @@
 
 block discarded – undo
16 16 
  */
17 17 
 $geodir_settings['permalink_settings'] = apply_filters('geodir_permalink_settings', array(
18 18
19 
-    /* Listing Permalink Settings start */
20 
-    array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
21 
-
22 
-
23 
-    array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
24 
-        'type' => 'sectionstart',
25 
-        'desc' => '',
26 
-        'id' => 'geodir_permalink'),
27 
-
28 
-    array(
29 
-        'name' => __('Add location in urls', 'geodirectory'),
30 
-        'desc' => __('Add location slug in listing urls', 'geodirectory'),
31 
-        'id' => 'geodir_add_location_url',
32 
-        'type' => 'checkbox',
33 
-        'std' => '1',
34 
-        'checkboxgroup' => 'start'
35 
-    ),
36 
-
37 
-    array(
38 
-        'name' => __('Add full location in listing urls', 'geodirectory'),
39 
-        'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
40 
-        'id' => 'geodir_show_location_url',
41 
-        'type' => 'radio',
42 
-        'value' => 'all',
43 
-        'std' => 'all',
44 
-        'radiogroup' => ''
45 
-    ),
46 
-
47 
-	array(
48 
-        'name' => __('Add country and city slug in listing urls', 'geodirectory'),
49 
-        'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
50 
-        'id' => 'geodir_show_location_url',
51 
-        'type' => 'radio',
52 
-        'std' => 'all',
53 
-        'value' => 'country_city',
54 
-        'radiogroup' => ''
55 
-    ),
56 
-	array(
57 
-        'name' => __('Add region and city slug in listing urls', 'geodirectory'),
58 
-        'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
59 
-        'id' => 'geodir_show_location_url',
60 
-        'type' => 'radio',
61 
-        'std' => 'all',
62 
-        'value' => 'region_city',
63 
-        'radiogroup' => ''
64 
-    ),
65 
-    array(
66 
-        'name' => __('Add only city in listing urls', 'geodirectory'),
67 
-        'desc' => __('Add city slug in listing urls', 'geodirectory'),
68 
-        'id' => 'geodir_show_location_url',
69 
-        'type' => 'radio',
70 
-        'std' => 'all',
71 
-        'value' => 'city',
72 
-        'radiogroup' => 'end'
73 
-    ),
74 
-
75 
-
76 
-
77 
-    array(
78 
-        'name' => __('Add category in listing urls', 'geodirectory'),
79 
-        'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
80 
-        'id' => 'geodir_add_categories_url',
81 
-        'type' => 'checkbox',
82 
-        'std' => '1',
83 
-    ),
84 
-
85 
-    array(
86 
-        'name' => __('Listing url prefix', 'geodirectory'),
87 
-        'desc' => __('Listing prefix to show in url', 'geodirectory'),
88 
-        'id' => 'geodir_listing_prefix',
89 
-        'type' => 'text',
90 
-        'css' => 'min-width:300px;',
91 
-        'std' => 'places'
92 
-    ),
93 
-
94 
-    array(
95 
-        'name' => __('Location url prefix', 'geodirectory'),
96 
-        'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
97 
-        'id' => 'geodir_location_prefix',
98 
-        'type' => 'text',
99 
-        'css' => 'min-width:300px;',
100 
-        'std' => 'location' // Default value to show home top section
101 
-    ),
102 
-
103 
-    array(
104 
-        'name' => __('Location and category url separator', 'geodirectory'),
105 
-        'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
106 
-        'id' => 'geodir_listingurl_separator',
107 
-        'type' => 'text',
108 
-        'css' => 'min-width:300px;',
109 
-        'std' => 'C' // Default value to show home top section
110 
-    ),
111 
-
112 
-    array(
113 
-        'name' => __('Listing detail url separator', 'geodirectory'),
114 
-        'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
115 
-        'id' => 'geodir_detailurl_separator',
116 
-        'type' => 'text',
117 
-        'css' => 'min-width:300px;',
118 
-        'std' => 'info' // Default value to show home top section
119 
-    ),
120 
-
121 
-
122 
-    array('type' => 'sectionend', 'id' => 'geodir_permalink'),
123 
-
124 
-    array('name' => __('GeoDirectory Pages', 'geodirectory'),
125 
-        'type' => 'sectionstart',
126 
-        'desc' => '',
127 
-        'id' => 'geodir_pages'),
128 
-
129 
-    array(
130 
-        'name' => __('GD Home page', 'geodirectory'),
131 
-        'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
132 
-        'id' => 'geodir_home_page',
133 
-        'type' => 'single_select_page',
134 
-        'class' => 'chosen_select'
135 
-    ),
136 
-
137 
-    array(
138 
-        'name' => __('Add listing page', 'geodirectory'),
139 
-        'desc' => __('Select the page to use for adding listings', 'geodirectory'),
140 
-        'id' => 'geodir_add_listing_page',
141 
-        'type' => 'single_select_page',
142 
-        'class' => 'chosen_select'
143 
-    ),
144 
-
145 
-    array(
146 
-        'name' => __('Listing preview page', 'geodirectory'),
147 
-        'desc' => __('Select the page to use for listing preview', 'geodirectory'),
148 
-        'id' => 'geodir_preview_page',
149 
-        'type' => 'single_select_page',
150 
-        'class' => 'chosen_select'
151 
-    ),
152 
-
153 
-    array(
154 
-        'name' => __('Listing success page', 'geodirectory'),
155 
-        'desc' => __('Select the page to use for listing success', 'geodirectory'),
156 
-        'id' => 'geodir_success_page',
157 
-        'type' => 'single_select_page',
158 
-        'class' => 'chosen_select'
159 
-    ),
160 
-
161 
-    array(
162 
-        'name' => __('Location page', 'geodirectory'),
163 
-        'desc' => __('Select the page to use for locations', 'geodirectory'),
164 
-        'id' => 'geodir_location_page',
165 
-        'type' => 'single_select_page',
166 
-        'class' => 'chosen_select'
167 
-    ),
168 
-
169 
-    array(
170 
-        'name' => __('Terms and Conditions page', 'geodirectory'),
171 
-        'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
172 
-        'id' => 'geodir_term_condition_page',
173 
-        'type' => 'single_select_page',
174 
-        'class' => 'chosen_select'
175 
-    ),
176 
-
177 
-    array(
178 
-        'name' => __('Info page', 'geodirectory'),
179 
-        'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
180 
-        'id' => 'geodir_info_page',
181 
-        'type' => 'single_select_page',
182 
-        'class' => 'chosen_select'
183 
-    ),
184 
-
185 
-    array(
186 
-        'name' => __('Login page', 'geodirectory'),
187 
-        'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
188 
-        'id' => 'geodir_login_page',
189 
-        'type' => 'single_select_page',
190 
-        'class' => 'chosen_select'
191 
-    ),
192 
-
193 
-
194 
-    array('type' => 'sectionend', 'id' => 'geodir_pages'),
195 
-
196 
-    /* Listing Detail Permalink Settings End */
19 
+	/* Listing Permalink Settings start */
20 
+	array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
21 
+
22 
+
23 
+	array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
24 
+		'type' => 'sectionstart',
25 
+		'desc' => '',
26 
+		'id' => 'geodir_permalink'),
27 
+
28 
+	array(
29 
+		'name' => __('Add location in urls', 'geodirectory'),
30 
+		'desc' => __('Add location slug in listing urls', 'geodirectory'),
31 
+		'id' => 'geodir_add_location_url',
32 
+		'type' => 'checkbox',
33 
+		'std' => '1',
34 
+		'checkboxgroup' => 'start'
35 
+	),
36 
+
37 
+	array(
38 
+		'name' => __('Add full location in listing urls', 'geodirectory'),
39 
+		'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
40 
+		'id' => 'geodir_show_location_url',
41 
+		'type' => 'radio',
42 
+		'value' => 'all',
43 
+		'std' => 'all',
44 
+		'radiogroup' => ''
45 
+	),
46 
+
47 
+	array(
48 
+		'name' => __('Add country and city slug in listing urls', 'geodirectory'),
49 
+		'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
50 
+		'id' => 'geodir_show_location_url',
51 
+		'type' => 'radio',
52 
+		'std' => 'all',
53 
+		'value' => 'country_city',
54 
+		'radiogroup' => ''
55 
+	),
56 
+	array(
57 
+		'name' => __('Add region and city slug in listing urls', 'geodirectory'),
58 
+		'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
59 
+		'id' => 'geodir_show_location_url',
60 
+		'type' => 'radio',
61 
+		'std' => 'all',
62 
+		'value' => 'region_city',
63 
+		'radiogroup' => ''
64 
+	),
65 
+	array(
66 
+		'name' => __('Add only city in listing urls', 'geodirectory'),
67 
+		'desc' => __('Add city slug in listing urls', 'geodirectory'),
68 
+		'id' => 'geodir_show_location_url',
69 
+		'type' => 'radio',
70 
+		'std' => 'all',
71 
+		'value' => 'city',
72 
+		'radiogroup' => 'end'
73 
+	),
74 
+
75 
+
76 
+
77 
+	array(
78 
+		'name' => __('Add category in listing urls', 'geodirectory'),
79 
+		'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
80 
+		'id' => 'geodir_add_categories_url',
81 
+		'type' => 'checkbox',
82 
+		'std' => '1',
83 
+	),
84 
+
85 
+	array(
86 
+		'name' => __('Listing url prefix', 'geodirectory'),
87 
+		'desc' => __('Listing prefix to show in url', 'geodirectory'),
88 
+		'id' => 'geodir_listing_prefix',
89 
+		'type' => 'text',
90 
+		'css' => 'min-width:300px;',
91 
+		'std' => 'places'
92 
+	),
93 
+
94 
+	array(
95 
+		'name' => __('Location url prefix', 'geodirectory'),
96 
+		'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
97 
+		'id' => 'geodir_location_prefix',
98 
+		'type' => 'text',
99 
+		'css' => 'min-width:300px;',
100 
+		'std' => 'location' // Default value to show home top section
101 
+	),
102 
+
103 
+	array(
104 
+		'name' => __('Location and category url separator', 'geodirectory'),
105 
+		'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
106 
+		'id' => 'geodir_listingurl_separator',
107 
+		'type' => 'text',
108 
+		'css' => 'min-width:300px;',
109 
+		'std' => 'C' // Default value to show home top section
110 
+	),
111 
+
112 
+	array(
113 
+		'name' => __('Listing detail url separator', 'geodirectory'),
114 
+		'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
115 
+		'id' => 'geodir_detailurl_separator',
116 
+		'type' => 'text',
117 
+		'css' => 'min-width:300px;',
118 
+		'std' => 'info' // Default value to show home top section
119 
+	),
120 
+
121 
+
122 
+	array('type' => 'sectionend', 'id' => 'geodir_permalink'),
123 
+
124 
+	array('name' => __('GeoDirectory Pages', 'geodirectory'),
125 
+		'type' => 'sectionstart',
126 
+		'desc' => '',
127 
+		'id' => 'geodir_pages'),
128 
+
129 
+	array(
130 
+		'name' => __('GD Home page', 'geodirectory'),
131 
+		'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
132 
+		'id' => 'geodir_home_page',
133 
+		'type' => 'single_select_page',
134 
+		'class' => 'chosen_select'
135 
+	),
136 
+
137 
+	array(
138 
+		'name' => __('Add listing page', 'geodirectory'),
139 
+		'desc' => __('Select the page to use for adding listings', 'geodirectory'),
140 
+		'id' => 'geodir_add_listing_page',
141 
+		'type' => 'single_select_page',
142 
+		'class' => 'chosen_select'
143 
+	),
144 
+
145 
+	array(
146 
+		'name' => __('Listing preview page', 'geodirectory'),
147 
+		'desc' => __('Select the page to use for listing preview', 'geodirectory'),
148 
+		'id' => 'geodir_preview_page',
149 
+		'type' => 'single_select_page',
150 
+		'class' => 'chosen_select'
151 
+	),
152 
+
153 
+	array(
154 
+		'name' => __('Listing success page', 'geodirectory'),
155 
+		'desc' => __('Select the page to use for listing success', 'geodirectory'),
156 
+		'id' => 'geodir_success_page',
157 
+		'type' => 'single_select_page',
158 
+		'class' => 'chosen_select'
159 
+	),
160 
+
161 
+	array(
162 
+		'name' => __('Location page', 'geodirectory'),
163 
+		'desc' => __('Select the page to use for locations', 'geodirectory'),
164 
+		'id' => 'geodir_location_page',
165 
+		'type' => 'single_select_page',
166 
+		'class' => 'chosen_select'
167 
+	),
168 
+
169 
+	array(
170 
+		'name' => __('Terms and Conditions page', 'geodirectory'),
171 
+		'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
172 
+		'id' => 'geodir_term_condition_page',
173 
+		'type' => 'single_select_page',
174 
+		'class' => 'chosen_select'
175 
+	),
176 
+
177 
+	array(
178 
+		'name' => __('Info page', 'geodirectory'),
179 
+		'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
180 
+		'id' => 'geodir_info_page',
181 
+		'type' => 'single_select_page',
182 
+		'class' => 'chosen_select'
183 
+	),
184 
+
185 
+	array(
186 
+		'name' => __('Login page', 'geodirectory'),
187 
+		'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
188 
+		'id' => 'geodir_login_page',
189 
+		'type' => 'single_select_page',
190 
+		'class' => 'chosen_select'
191 
+	),
192 
+
193 
+
194 
+	array('type' => 'sectionend', 'id' => 'geodir_pages'),
195 
+
196 
+	/* Listing Detail Permalink Settings End */
197 197
198 198
199 199 
 )); // End Design settings
Please login to merge, or discard this patch.