View GitHub Repository geodirectory

Schedule Inspection
Subscribe
Test Failed
Pull Request — master (#429)
by Kiran
15:51
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,198 +37,198 @@  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 233 
 	array(
234 234 
 		'name' => __('Listing image size', 'geodirectory'),

@@ -241,343 +241,343 @@  discard block
 
 block discarded – undo
241 241 
 		'options' => geodir_listing_image_size_arr()
242 242 
 	),
243 243
244 
-    array(
245 
-        'name' => __('Description word limit', 'geodirectory'),
246 
-        'desc' => '',
247 
-        'id' => 'geodir_desc_word_limit',
248 
-        'type' => 'text',
249 
-        'css' => 'min-width:300px;',
250 
-        'std' => '50' // Default value to show home top section
251 
-    ),
244 
+	array(
245 
+		'name' => __('Description word limit', 'geodirectory'),
246 
+		'desc' => '',
247 
+		'id' => 'geodir_desc_word_limit',
248 
+		'type' => 'text',
249 
+		'css' => 'min-width:300px;',
250 
+		'std' => '50' // Default value to show home top section
251 
+	),
252 252
253 
-    array(
254 
-        'name' => __('Hover listing map animation', 'geodirectory'),
255 
-        'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),
256 
-        'id' => 'geodir_listing_hover_bounce_map_pin',
257 
-        'type' => 'checkbox',
258 
-        'std' => '1' // Default value to show home top section
259 
-    ),
253 
+	array(
254 
+		'name' => __('Hover listing map animation', 'geodirectory'),
255 
+		'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),
256 
+		'id' => 'geodir_listing_hover_bounce_map_pin',
257 
+		'type' => 'checkbox',
258 
+		'std' => '1' // Default value to show home top section
259 
+	),
260 260
261 
-    array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),
261 
+	array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),
262 262
263 263
264 
-    array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),
264 
+	array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),
265 265
266 
-    array(
267 
-        'name' => __('New listing default status', 'geodirectory'),
268 
-        'desc' => __('Select new listing default status.', 'geodirectory'),
269 
-        'tip' => '',
270 
-        'id' => 'geodir_new_post_default_status',
271 
-        'css' => 'min-width:300px;',
272 
-        'std' => 'publish',
273 
-        'type' => 'select',
274 
-        'class' => 'chosen_select',
275 
-        'options' => array_unique(array(
276 
-            'publish' => __('publish', 'geodirectory'),
277 
-            'draft' => __('draft', 'geodirectory'),
278 
-        ))
279 
-    ),
266 
+	array(
267 
+		'name' => __('New listing default status', 'geodirectory'),
268 
+		'desc' => __('Select new listing default status.', 'geodirectory'),
269 
+		'tip' => '',
270 
+		'id' => 'geodir_new_post_default_status',
271 
+		'css' => 'min-width:300px;',
272 
+		'std' => 'publish',
273 
+		'type' => 'select',
274 
+		'class' => 'chosen_select',
275 
+		'options' => array_unique(array(
276 
+			'publish' => __('publish', 'geodirectory'),
277 
+			'draft' => __('draft', 'geodirectory'),
278 
+		))
279 
+	),
280 280
281 
-    array(
282 
-        'name' => __('New listings settings', 'geodirectory'),
283 
-        'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),
284 
-        'id' => 'geodir_listing_new_days',
285 
-        'type' => 'text',
286 
-        'css' => 'min-width:300px;',
287 
-        'std' => '30' // Default value for the page title - changed in settings
288 
-    ),
281 
+	array(
282 
+		'name' => __('New listings settings', 'geodirectory'),
283 
+		'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),
284 
+		'id' => 'geodir_listing_new_days',
285 
+		'type' => 'text',
286 
+		'css' => 'min-width:300px;',
287 
+		'std' => '30' // Default value for the page title - changed in settings
288 
+	),
289 289
290 
-    array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),
290 
+	array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),
291 291
292 292
293 
-    array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),
293 
+	array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),
294 294
295 
-    array(
296 
-        'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),
297 
-        'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),
298 
-        'id' => 'geodir_accept_term_condition',
299 
-        'type' => 'checkbox',
300 
-        'std' => '1' // Default value to show home top section
301 
-    ),
295 
+	array(
296 
+		'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),
297 
+		'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),
298 
+		'id' => 'geodir_accept_term_condition',
299 
+		'type' => 'checkbox',
300 
+		'std' => '1' // Default value to show home top section
301 
+	),
302 302
303 303
304 
-    array(
305 
-        'name' => __('Show description field as editor', 'geodirectory'),
306 
-        'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),
307 
-        'tip' => '',
308 
-        'id' => 'geodir_tiny_editor_on_add_listing',
309 
-        'css' => 'min-width:300px;',
310 
-        'std' => array(),
311 
-        'type' => 'multiselect',
312 
-        'placeholder_text' => __('Select post types', 'geodirectory'),
313 
-        'class' => 'chosen_select',
314 
-        'options' => array_unique(geodir_post_type_setting_fun())
315 
-    ),
304 
+	array(
305 
+		'name' => __('Show description field as editor', 'geodirectory'),
306 
+		'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),
307 
+		'tip' => '',
308 
+		'id' => 'geodir_tiny_editor_on_add_listing',
309 
+		'css' => 'min-width:300px;',
310 
+		'std' => array(),
311 
+		'type' => 'multiselect',
312 
+		'placeholder_text' => __('Select post types', 'geodirectory'),
313 
+		'class' => 'chosen_select',
314 
+		'options' => array_unique(geodir_post_type_setting_fun())
315 
+	),
316 316
317 
-    array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),
318 
-    /* Listing Layout Settings end */
317 
+	array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),
318 
+	/* Listing Layout Settings end */
319 319
320 320
321 
-    /* Search Layout Settings end */
321 
+	/* Search Layout Settings end */
322 322
323 
-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),
323 
+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),
324 324
325 325
326 
-    array('name' => __('Search Page Layout Settings', 'geodirectory'),
327 
-        'type' => 'sectionstart',
328 
-        'desc' => '',
329 
-        'id' => 'geodir_search_layout'),
326 
+	array('name' => __('Search Page Layout Settings', 'geodirectory'),
327 
+		'type' => 'sectionstart',
328 
+		'desc' => '',
329 
+		'id' => 'geodir_search_layout'),
330 330
331 
-    array(
332 
-        'name' => __('Search top section', 'geodirectory'),
333 
-        'desc' => __('Show the top section of search page', 'geodirectory'),
334 
-        'id' => 'geodir_show_search_top_section',
335 
-        'type' => 'checkbox',
336 
-        'std' => '1' // Default value to show home top section
337 
-    ),
331 
+	array(
332 
+		'name' => __('Search top section', 'geodirectory'),
333 
+		'desc' => __('Show the top section of search page', 'geodirectory'),
334 
+		'id' => 'geodir_show_search_top_section',
335 
+		'type' => 'checkbox',
336 
+		'std' => '1' // Default value to show home top section
337 
+	),
338 338
339 
-    array(
340 
-        'name' => __('Search right section', 'geodirectory'),
341 
-        'desc' => __('Show the right section of search page', 'geodirectory'),
342 
-        'id' => 'geodir_show_search_right_section',
343 
-        'type' => 'checkbox',
344 
-        'std' => '1' // Default value to show home top section
345 
-    ),
339 
+	array(
340 
+		'name' => __('Search right section', 'geodirectory'),
341 
+		'desc' => __('Show the right section of search page', 'geodirectory'),
342 
+		'id' => 'geodir_show_search_right_section',
343 
+		'type' => 'checkbox',
344 
+		'std' => '1' // Default value to show home top section
345 
+	),
346 346
347 
-    array(
348 
-        'name' => __('Width of search right section', 'geodirectory'),
349 
-        'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),
350 
-        'id' => 'geodir_width_search_right_section',
351 
-        'type' => 'text',
352 
-        'css' => 'min-width:300px;',
353 
-        'std' => '30' // Default value to show home top section
354 
-    ),
347 
+	array(
348 
+		'name' => __('Width of search right section', 'geodirectory'),
349 
+		'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),
350 
+		'id' => 'geodir_width_search_right_section',
351 
+		'type' => 'text',
352 
+		'css' => 'min-width:300px;',
353 
+		'std' => '30' // Default value to show home top section
354 
+	),
355 355
356 356
357 
-    array(
358 
-        'name' => __('Search content section view', 'geodirectory'),
359 
-        'desc' => __('Set the listing view of search page', 'geodirectory'),
360 
-        'id' => 'geodir_search_view',
361 
-        'css' => 'min-width:300px;',
362 
-        'std' => 'gridview_onehalf',
363 
-        'type' => 'select',
364 
-        'class' => 'chosen_select',
365 
-        'options' => array_unique(array(
366 
-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
367 
-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
368 
-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
369 
-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
370 
-            'listview' => __('List view', 'geodirectory'),
371 
-        ))
372 
-    ),
357 
+	array(
358 
+		'name' => __('Search content section view', 'geodirectory'),
359 
+		'desc' => __('Set the listing view of search page', 'geodirectory'),
360 
+		'id' => 'geodir_search_view',
361 
+		'css' => 'min-width:300px;',
362 
+		'std' => 'gridview_onehalf',
363 
+		'type' => 'select',
364 
+		'class' => 'chosen_select',
365 
+		'options' => array_unique(array(
366 
+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),
367 
+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),
368 
+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),
369 
+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),
370 
+			'listview' => __('List view', 'geodirectory'),
371 
+		))
372 
+	),
373 373
374 
-    array(
375 
-        'name' => __('Width of search content section', 'geodirectory'),
376 
-        'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),
377 
-        'id' => 'geodir_width_search_contant_section',
378 
-        'type' => 'text',
379 
-        'css' => 'min-width:300px;',
380 
-        'std' => '63' // Default value to show home top section
381 
-    ),
374 
+	array(
375 
+		'name' => __('Width of search content section', 'geodirectory'),
376 
+		'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),
377 
+		'id' => 'geodir_width_search_contant_section',
378 
+		'type' => 'text',
379 
+		'css' => 'min-width:300px;',
380 
+		'std' => '63' // Default value to show home top section
381 
+	),
382 382
383 
-    array(
384 
-        'name' => __('Search left section', 'geodirectory'),
385 
-        'desc' => __('Show the left section of search page', 'geodirectory'),
386 
-        'id' => 'geodir_show_search_left_section',
387 
-        'type' => 'checkbox',
388 
-        'std' => '0' // Default value to show home top section
389 
-    ),
383 
+	array(
384 
+		'name' => __('Search left section', 'geodirectory'),
385 
+		'desc' => __('Show the left section of search page', 'geodirectory'),
386 
+		'id' => 'geodir_show_search_left_section',
387 
+		'type' => 'checkbox',
388 
+		'std' => '0' // Default value to show home top section
389 
+	),
390 390
391 
-    array(
392 
-        'name' => __('Width of search left section', 'geodirectory'),
393 
-        'desc' => __('Enter the width of left section of search in %', 'geodirectory'),
394 
-        'id' => 'geodir_width_search_left_section',
395 
-        'type' => 'text',
396 
-        'css' => 'min-width:300px;',
397 
-        'std' => '30' // Default value to show home top section
398 
-    ),
391 
+	array(
392 
+		'name' => __('Width of search left section', 'geodirectory'),
393 
+		'desc' => __('Enter the width of left section of search in %', 'geodirectory'),
394 
+		'id' => 'geodir_width_search_left_section',
395 
+		'type' => 'text',
396 
+		'css' => 'min-width:300px;',
397 
+		'std' => '30' // Default value to show home top section
398 
+	),
399 399
400 
-    array(
401 
-        'name' => __('Search bottom section', 'geodirectory'),
402 
-        'desc' => __('Show the bottom section of search page', 'geodirectory'),
403 
-        'id' => 'geodir_show_search_bottom_section',
404 
-        'type' => 'checkbox',
405 
-        'std' => '0' // Default value to show home top section
406 
-    ),
400 
+	array(
401 
+		'name' => __('Search bottom section', 'geodirectory'),
402 
+		'desc' => __('Show the bottom section of search page', 'geodirectory'),
403 
+		'id' => 'geodir_show_search_bottom_section',
404 
+		'type' => 'checkbox',
405 
+		'std' => '0' // Default value to show home top section
406 
+	),
407 407
408 408 
 	array(
409 
-        'name' => __('Show advanced pagination details', 'geodirectory'),
410 
-        'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),
411 
-        'id' => 'geodir_pagination_advance_info',
412 
-        'css' => 'min-width:300px;',
413 
-        'std' => '',
414 
-        'type' => 'select',
415 
-        'class' => 'chosen_select',
416 
-        'options' => array(
409 
+		'name' => __('Show advanced pagination details', 'geodirectory'),
410 
+		'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),
411 
+		'id' => 'geodir_pagination_advance_info',
412 
+		'css' => 'min-width:300px;',
413 
+		'std' => '',
414 
+		'type' => 'select',
415 
+		'class' => 'chosen_select',
416 
+		'options' => array(
417 417 
 						'' => __('Never Display', 'geodirectory'),
418 418 
 						'after' => __('After Pagination', 'geodirectory'),
419 419 
 						'before' => __('Before Pagination', 'geodirectory')
420 420 
 					)
421 
-    ),
421 
+	),
422 422
423 
-    array('type' => 'sectionend', 'id' => 'geodir_search_layout'),
423 
+	array('type' => 'sectionend', 'id' => 'geodir_search_layout'),
424 424
425 425
426 
-    array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),
426 
+	array('name' => __('Search form settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),
427 427
428 
-    array(
429 
-        'name' => __('Use old non-styled form', 'geodirectory'),
430 
-        'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'),
431 
-        'id' => 'geodir_show_search_old_search_from',
432 
-        'type' => 'checkbox',
433 
-        'std' => '0' // Default value to show
434 
-    ),
428 
+	array(
429 
+		'name' => __('Use old non-styled form', 'geodirectory'),
430 
+		'desc' => __('Will show the old type form (not recommended unless you had added your own styles)', 'geodirectory'),
431 
+		'id' => 'geodir_show_search_old_search_from',
432 
+		'type' => 'checkbox',
433 
+		'std' => '0' // Default value to show
434 
+	),
435 435
436 
-    array(
437 
-        'name' => __('Search field default value', 'geodirectory'),
438 
-        'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),
439 
-        'id' => 'geodir_search_field_default_text',
440 
-        'type' => 'text',
441 
-        'css' => 'min-width:300px;',
442 
-        'std' => 'Search for' // show on the listing page.
443 
-    ),
436 
+	array(
437 
+		'name' => __('Search field default value', 'geodirectory'),
438 
+		'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),
439 
+		'id' => 'geodir_search_field_default_text',
440 
+		'type' => 'text',
441 
+		'css' => 'min-width:300px;',
442 
+		'std' => 'Search for' // show on the listing page.
443 
+	),
444 444
445 
-    array(
446 
-        'name' => __('Near field default value', 'geodirectory'),
447 
-        'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),
448 
-        'id' => 'geodir_near_field_default_text',
449 
-        'type' => 'text',
450 
-        'css' => 'min-width:300px;',
451 
-        'std' => 'Near' // show on the listing page.
452 
-    ),
445 
+	array(
446 
+		'name' => __('Near field default value', 'geodirectory'),
447 
+		'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),
448 
+		'id' => 'geodir_near_field_default_text',
449 
+		'type' => 'text',
450 
+		'css' => 'min-width:300px;',
451 
+		'std' => 'Near' // show on the listing page.
452 
+	),
453 453
454 
-    array(
455 
-        'name' => __('Search button label', 'geodirectory'),
456 
-        'desc' => __('Show the search button label on search form.', 'geodirectory'),
457 
-        'id' => 'geodir_search_button_label',
458 
-        'type' => 'text',
459 
-        'css' => 'min-width:300px;',
460 
-        'std' => 'Search' // show on the listing page.
461 
-    ),
454 
+	array(
455 
+		'name' => __('Search button label', 'geodirectory'),
456 
+		'desc' => __('Show the search button label on search form.', 'geodirectory'),
457 
+		'id' => 'geodir_search_button_label',
458 
+		'type' => 'text',
459 
+		'css' => 'min-width:300px;',
460 
+		'std' => 'Search' // show on the listing page.
461 
+	),
462 462
463 
-    array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),
463 
+	array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),
464 464
465 
-    /* Listing Layout Settings end */
465 
+	/* Listing Layout Settings end */
466 466
467 467
468 
-    /* Detail Layout Settings end */
468 
+	/* Detail Layout Settings end */
469 469
470 
-    array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),
470 
+	array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),
471 471
472 
-    array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),
472 
+	array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),
473 473
474 
-    array(
475 
-        'name' => __('Detail top section', 'geodirectory'),
476 
-        'desc' => __('Show the top section of listing page', 'geodirectory'),
477 
-        'id' => 'geodir_show_detail_top_section',
478 
-        'type' => 'checkbox',
479 
-        'std' => '1' // Default value to show home top section
480 
-    ),
474 
+	array(
475 
+		'name' => __('Detail top section', 'geodirectory'),
476 
+		'desc' => __('Show the top section of listing page', 'geodirectory'),
477 
+		'id' => 'geodir_show_detail_top_section',
478 
+		'type' => 'checkbox',
479 
+		'std' => '1' // Default value to show home top section
480 
+	),
481 481
482 
-    array(
483 
-        'name' => __('Detail bottom section', 'geodirectory'),
484 
-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),
485 
-        'id' => 'geodir_show_detail_bottom_section',
486 
-        'type' => 'checkbox',
487 
-        'std' => '1' // Default value to show home top section
488 
-    ),
489 
-    array(
490 
-        'name' => __('Detail sidebar section on left side', 'geodirectory'),
491 
-        'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),
492 
-        'id' => 'geodir_detail_sidebar_left_section',
493 
-        'type' => 'checkbox',
494 
-        'std' => '0'
495 
-    ),
496 
-    array(
497 
-        'name' => __('Disable GD modal', 'geodirectory'),
498 
-        'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),
499 
-        'id' => 'geodir_disable_gb_modal',
500 
-        'type' => 'checkbox',
501 
-        'std' => '0'
502 
-    ),
503 
-    array(
504 
-        'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),
505 
-        'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),
506 
-        'id' => 'geodir_disable_tfg_buttons_section',
507 
-        'type' => 'checkbox',
508 
-        'std' => '0'
509 
-    ),
510 
-    array(
511 
-        'name' => __('Disable Google Analytics section', 'geodirectory'),
512 
-        'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),
513 
-        'id' => 'geodir_disable_google_analytics_section',
514 
-        'type' => 'checkbox',
515 
-        'std' => '0'
516 
-    ),
517 
-    array(
518 
-        'name' => __('Disable User Links section', 'geodirectory'),
519 
-        'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),
520 
-        'id' => 'geodir_disable_user_links_section',
521 
-        'type' => 'checkbox',
522 
-        'std' => '0'
523 
-    ),
524 
-    array(
525 
-        'name' => __('Disable Rating Info section', 'geodirectory'),
526 
-        'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),
527 
-        'id' => 'geodir_disable_rating_info_section',
528 
-        'type' => 'checkbox',
529 
-        'std' => '0'
530 
-    ),
531 
-    array(
532 
-        'name' => __('Disable Listing Info section', 'geodirectory'),
533 
-        'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),
534 
-        'id' => 'geodir_disable_listing_info_section',
535 
-        'type' => 'checkbox',
536 
-        'std' => '0'
537 
-    ),
482 
+	array(
483 
+		'name' => __('Detail bottom section', 'geodirectory'),
484 
+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),
485 
+		'id' => 'geodir_show_detail_bottom_section',
486 
+		'type' => 'checkbox',
487 
+		'std' => '1' // Default value to show home top section
488 
+	),
489 
+	array(
490 
+		'name' => __('Detail sidebar section on left side', 'geodirectory'),
491 
+		'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),
492 
+		'id' => 'geodir_detail_sidebar_left_section',
493 
+		'type' => 'checkbox',
494 
+		'std' => '0'
495 
+	),
496 
+	array(
497 
+		'name' => __('Disable GD modal', 'geodirectory'),
498 
+		'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),
499 
+		'id' => 'geodir_disable_gb_modal',
500 
+		'type' => 'checkbox',
501 
+		'std' => '0'
502 
+	),
503 
+	array(
504 
+		'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),
505 
+		'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),
506 
+		'id' => 'geodir_disable_tfg_buttons_section',
507 
+		'type' => 'checkbox',
508 
+		'std' => '0'
509 
+	),
510 
+	array(
511 
+		'name' => __('Disable Google Analytics section', 'geodirectory'),
512 
+		'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),
513 
+		'id' => 'geodir_disable_google_analytics_section',
514 
+		'type' => 'checkbox',
515 
+		'std' => '0'
516 
+	),
517 
+	array(
518 
+		'name' => __('Disable User Links section', 'geodirectory'),
519 
+		'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),
520 
+		'id' => 'geodir_disable_user_links_section',
521 
+		'type' => 'checkbox',
522 
+		'std' => '0'
523 
+	),
524 
+	array(
525 
+		'name' => __('Disable Rating Info section', 'geodirectory'),
526 
+		'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),
527 
+		'id' => 'geodir_disable_rating_info_section',
528 
+		'type' => 'checkbox',
529 
+		'std' => '0'
530 
+	),
531 
+	array(
532 
+		'name' => __('Disable Listing Info section', 'geodirectory'),
533 
+		'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),
534 
+		'id' => 'geodir_disable_listing_info_section',
535 
+		'type' => 'checkbox',
536 
+		'std' => '0'
537 
+	),
538 538
539 
-    array('type' => 'sectionend', 'id' => 'detail_page_settings'),
539 
+	array('type' => 'sectionend', 'id' => 'detail_page_settings'),
540 540
541 541
542 
-    /* ---------- DETAIL PAGE TAB SETTING START*/
542 
+	/* ---------- DETAIL PAGE TAB SETTING START*/
543 543
544 
-    array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),
544 
+	array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),
545 545
546 
-    array(
547 
-        'name' => __('Exclude selected tabs from detail page', 'geodirectory'),
548 
-        'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),
549 
-        'tip' => '',
550 
-        'id' => 'geodir_detail_page_tabs_excluded',
551 
-        'css' => 'min-width:300px;',
552 
-        'std' => geodir_get_posttypes(),
553 
-        'type' => 'multiselect',
554 
-        'placeholder_text' => __('Select tabs', 'geodirectory'),
555 
-        'class' => 'chosen_select',
556 
-        'options' => array_unique(geodir_detail_page_tabs_key_value_array())
557 
-    ),
546 
+	array(
547 
+		'name' => __('Exclude selected tabs from detail page', 'geodirectory'),
548 
+		'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),
549 
+		'tip' => '',
550 
+		'id' => 'geodir_detail_page_tabs_excluded',
551 
+		'css' => 'min-width:300px;',
552 
+		'std' => geodir_get_posttypes(),
553 
+		'type' => 'multiselect',
554 
+		'placeholder_text' => __('Select tabs', 'geodirectory'),
555 
+		'class' => 'chosen_select',
556 
+		'options' => array_unique(geodir_detail_page_tabs_key_value_array())
557 
+	),
558 558
559 
-    array(
560 
-        'name' => __('Show as list', 'geodirectory'),
561 
-        'desc' => __('Show as list instead of tabs', 'geodirectory'),
562 
-        'id' => 'geodir_disable_tabs',
563 
-        'type' => 'checkbox',
564 
-        'std' => '0'
565 
-    ),
559 
+	array(
560 
+		'name' => __('Show as list', 'geodirectory'),
561 
+		'desc' => __('Show as list instead of tabs', 'geodirectory'),
562 
+		'id' => 'geodir_disable_tabs',
563 
+		'type' => 'checkbox',
564 
+		'std' => '0'
565 
+	),
566 566
567 
-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
568 
-    /* ---------- DETAIL PAGE TAB SETTING END*/
567 
+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),
568 
+	/* ---------- DETAIL PAGE TAB SETTING END*/
569 569
570 
-    /* START DEFAULT STAR IMAGE*/
571 
-    array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),
570 
+	/* START DEFAULT STAR IMAGE*/
571 
+	array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),
572 572
573 
-    array(
574 
-        'name' => __('Upload default rating star icon', 'geodirectory'),
575 
-        'desc' => '',
576 
-        'id' => 'geodir_default_rating_star_icon',
577 
-        'type' => 'file',
578 
-        'std' => '0',
579 
-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
580 
-    ),
573 
+	array(
574 
+		'name' => __('Upload default rating star icon', 'geodirectory'),
575 
+		'desc' => '',
576 
+		'id' => 'geodir_default_rating_star_icon',
577 
+		'type' => 'file',
578 
+		'std' => '0',
579 
+		'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section
580 
+	),
581 581 
 	array(
582 582 
 		'name' => __('Enable Font Awesome', 'geodirectory'),
583 583 
 		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

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

@@ -981,190 +981,190 @@  discard block
 
 block discarded – undo
981 981
982 982 
     */
983 983
984 
-    array('name' => __('GD Lazy Load Images', 'geodirectory'),
985 
-        'type' => 'sectionstart',
986 
-        'desc' => '',
987 
-        'id' => 'geodir_gdll_settings'),
984 
+	array('name' => __('GD Lazy Load Images', 'geodirectory'),
985 
+		'type' => 'sectionstart',
986 
+		'desc' => '',
987 
+		'id' => 'geodir_gdll_settings'),
988 988
989 
-    array(
990 
-        'name' => __('Enable lazy load images?', 'geodirectory'),
991 
-        'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),
992 
-        'id' => 'geodir_lazy_load',
993 
-        'type' => 'checkbox',
994 
-        'std' => '1' // Default value to show home top section
995 
-    ),
996 
-    array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),
989 
+	array(
990 
+		'name' => __('Enable lazy load images?', 'geodirectory'),
991 
+		'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),
992 
+		'id' => 'geodir_lazy_load',
993 
+		'type' => 'checkbox',
994 
+		'std' => '1' // Default value to show home top section
995 
+	),
996 
+	array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),
997 997
998 998
999 
-    array('name' => __('Script Settings', 'geodirectory'),
1000 
-        'type' => 'sectionstart',
1001 
-        'desc' => '',
1002 
-        'id' => 'geodir_script_settings'),
999 
+	array('name' => __('Script Settings', 'geodirectory'),
1000 
+		'type' => 'sectionstart',
1001 
+		'desc' => '',
1002 
+		'id' => 'geodir_script_settings'),
1003 1003
1004 
-    array(
1005 
-        'name' => __('Custom style css code', 'geodirectory'),
1006 
-        'desc' => '',
1007 
-        'id' => 'geodir_coustem_css',
1008 
-        'type' => 'textarea',
1009 
-        'css' => 'min-width:300px;',
1010 
-        'std' => '' // Default value for the page title - changed in settings
1011 
-    ),
1004 
+	array(
1005 
+		'name' => __('Custom style css code', 'geodirectory'),
1006 
+		'desc' => '',
1007 
+		'id' => 'geodir_coustem_css',
1008 
+		'type' => 'textarea',
1009 
+		'css' => 'min-width:300px;',
1010 
+		'std' => '' // Default value for the page title - changed in settings
1011 
+	),
1012 1012
1013 
-    array(
1014 
-        'name' => __('Header script code', 'geodirectory'),
1015 
-        'desc' => '',
1016 
-        'id' => 'geodir_header_scripts',
1017 
-        'type' => 'textarea',
1018 
-        'css' => 'min-width:300px;',
1019 
-        'std' => '' // Default value for the page title - changed in settings
1020 
-    ),
1013 
+	array(
1014 
+		'name' => __('Header script code', 'geodirectory'),
1015 
+		'desc' => '',
1016 
+		'id' => 'geodir_header_scripts',
1017 
+		'type' => 'textarea',
1018 
+		'css' => 'min-width:300px;',
1019 
+		'std' => '' // Default value for the page title - changed in settings
1020 
+	),
1021 1021
1022 
-    array(
1023 
-        'name' => __('Footer script code', 'geodirectory'),
1024 
-        'desc' => '',
1025 
-        'id' => 'geodir_footer_scripts',
1026 
-        'type' => 'textarea',
1027 
-        'css' => 'min-width:300px;',
1028 
-        'std' => '' // Default value for the page title - changed in settings
1029 
-    ),
1022 
+	array(
1023 
+		'name' => __('Footer script code', 'geodirectory'),
1024 
+		'desc' => '',
1025 
+		'id' => 'geodir_footer_scripts',
1026 
+		'type' => 'textarea',
1027 
+		'css' => 'min-width:300px;',
1028 
+		'std' => '' // Default value for the page title - changed in settings
1029 
+	),
1030 1030
1031 
-    array('type' => 'sectionend', 'id' => 'geodir_script_settings'),
1032 
-    /* Script Settings End */
1031 
+	array('type' => 'sectionend', 'id' => 'geodir_script_settings'),
1032 
+	/* Script Settings End */
1033 1033
1034 
-    /* Map Settings Start */
1035 
-    array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),
1034 
+	/* Map Settings Start */
1035 
+	array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),
1036 1036
1037 1037
1038 
-    // Google API key
1039 
-    array(
1040 
-        'name' => __('Google Maps API KEY', 'geodirectory'),
1041 
-        'type' => 'sectionstart',
1042 
-        'desc' => '',
1043 
-        'id' => 'geodir_google_api_key'
1044 
-    ),
1045 
-    array(
1046 
-        'name' => __('Google Maps API KEY', 'geodirectory'),
1047 
-        'desc' => sprintf(
1048 
-            __('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'),
1049 
-            '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/' ),
1050 
-        'tip' => '',
1051 
-        'id' => 'geodir_google_api_key',
1052 
-        'css' => 'min-width:300px;',
1053 
-        'std' => '',
1054 
-        'type' => 'map-key',
1055 
-    ),
1056 
-    array(
1057 
-        'type' => 'sectionend',
1058 
-        'id' => 'geodir_google_api_key'
1059 
-    ),
1038 
+	// Google API key
1039 
+	array(
1040 
+		'name' => __('Google Maps API KEY', 'geodirectory'),
1041 
+		'type' => 'sectionstart',
1042 
+		'desc' => '',
1043 
+		'id' => 'geodir_google_api_key'
1044 
+	),
1045 
+	array(
1046 
+		'name' => __('Google Maps API KEY', 'geodirectory'),
1047 
+		'desc' => sprintf(
1048 
+			__('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'),
1049 
+			'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/' ),
1050 
+		'tip' => '',
1051 
+		'id' => 'geodir_google_api_key',
1052 
+		'css' => 'min-width:300px;',
1053 
+		'std' => '',
1054 
+		'type' => 'map-key',
1055 
+	),
1056 
+	array(
1057 
+		'type' => 'sectionend',
1058 
+		'id' => 'geodir_google_api_key'
1059 
+	),
1060 1060
1061 
-    /* Untick the category by default on home map */
1062 
-    array(
1063 
-        'name' => __('Home Map Settings', 'geodirectory'),
1064 
-        'type' => 'sectionstart',
1065 
-        'desc' => '',
1066 
-        'id' => 'geodir_home_map_section'
1067 
-    ),
1068 
-    array(
1069 
-        'name' => __('Select category to untick by default on map', 'geodirectory'),
1070 
-        'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),
1071 
-        'tip' => '',
1072 
-        'id' => 'geodir_home_map_untick',
1073 
-        'css' => 'min-width:300px;',
1074 
-        'std' => '',
1075 
-        'type' => 'multiselect',
1076 
-        'placeholder_text' => __('Select category', 'geodirectory'),
1077 
-        'class' => 'chosen_select',
1078 
-        'options' => geodir_home_map_cats_key_value_array()
1079 
-    ),
1080 
-    array(
1081 
-        'type' => 'sectionend',
1082 
-        'id' => 'geodir_home_map_section'
1083 
-    ),
1061 
+	/* Untick the category by default on home map */
1062 
+	array(
1063 
+		'name' => __('Home Map Settings', 'geodirectory'),
1064 
+		'type' => 'sectionstart',
1065 
+		'desc' => '',
1066 
+		'id' => 'geodir_home_map_section'
1067 
+	),
1068 
+	array(
1069 
+		'name' => __('Select category to untick by default on map', 'geodirectory'),
1070 
+		'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),
1071 
+		'tip' => '',
1072 
+		'id' => 'geodir_home_map_untick',
1073 
+		'css' => 'min-width:300px;',
1074 
+		'std' => '',
1075 
+		'type' => 'multiselect',
1076 
+		'placeholder_text' => __('Select category', 'geodirectory'),
1077 
+		'class' => 'chosen_select',
1078 
+		'options' => geodir_home_map_cats_key_value_array()
1079 
+	),
1080 
+	array(
1081 
+		'type' => 'sectionend',
1082 
+		'id' => 'geodir_home_map_section'
1083 
+	),
1084 1084
1085 
-    array(
1086 
-        'name' => __('Add Listing Map Settings', 'geodirectory'),
1087 
-        'type' => 'sectionstart',
1088 
-        'desc' => '',
1089 
-        'id' => 'geodir_add_listing_map_section'
1090 
-    ),
1091 
-    array(
1092 
-        'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'),
1093 
-        'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'),
1094 
-        'id' => 'geodir_add_listing_mouse_scroll',
1095 
-        'type' => 'checkbox',
1096 
-        'std' => '0' // Default value to show home top section
1097 
-    ),
1098 
-    array(
1099 
-        'type' => 'sectionend',
1100 
-        'id' => 'geodir_add_listing_map_section'
1101 
-    ),
1085 
+	array(
1086 
+		'name' => __('Add Listing Map Settings', 'geodirectory'),
1087 
+		'type' => 'sectionstart',
1088 
+		'desc' => '',
1089 
+		'id' => 'geodir_add_listing_map_section'
1090 
+	),
1091 
+	array(
1092 
+		'name' => __('Disable mouse scroll on details page map tab', 'geodirectory'),
1093 
+		'desc' => __('Stops the mouse scroll zooming the map (home and listings settings set from widget)', 'geodirectory'),
1094 
+		'id' => 'geodir_add_listing_mouse_scroll',
1095 
+		'type' => 'checkbox',
1096 
+		'std' => '0' // Default value to show home top section
1097 
+	),
1098 
+	array(
1099 
+		'type' => 'sectionend',
1100 
+		'id' => 'geodir_add_listing_map_section'
1101 
+	),
1102 1102
1103 1103
1104 
-    array('name' => __('Default map settings', 'geodirectory'),
1105 
-        'type' => 'sectionstart',
1106 
-        'desc' => '',
1107 
-        'id' => 'geodir_map_default_settings'),
1104 
+	array('name' => __('Default map settings', 'geodirectory'),
1105 
+		'type' => 'sectionstart',
1106 
+		'desc' => '',
1107 
+		'id' => 'geodir_map_default_settings'),
1108 1108
1109 
-    array(
1110 
-        'name' => '',
1111 
-        'desc' => '',
1112 
-        'id' => 'map_default_settings',
1113 
-        'type' => 'map_default_settings',
1114 
-        'css' => 'min-width:300px;',
1115 
-        'std' => '' // Default value for the page title - changed in settings
1116 
-    ),
1109 
+	array(
1110 
+		'name' => '',
1111 
+		'desc' => '',
1112 
+		'id' => 'map_default_settings',
1113 
+		'type' => 'map_default_settings',
1114 
+		'css' => 'min-width:300px;',
1115 
+		'std' => '' // Default value for the page title - changed in settings
1116 
+	),
1117 1117
1118 
-    array(
1119 
-        'name' => __('Upload map default marker icon', 'geodirectory'),
1120 
-        'desc' => '',
1121 
-        'id' => 'geodir_default_marker_icon',
1122 
-        'type' => 'file',
1123 
-        'std' => '0',
1124 
-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1125 
-    ),
1126 
-    // add option that allows enable/disable map dragging to phone devices
1127 
-    array(
1128 
-        'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),
1129 
-        'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),
1130 
-        'id' => 'geodir_map_onoff_dragging',
1131 
-        'type' => 'checkbox',
1132 
-        'std' => '0' // Default value to show home top section
1133 
-    ),
1134 
-    array(
1135 
-        'name' => __('Select Maps API', 'geodirectory'),
1136 
-        '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'),
1137 
-        'tip' => '',
1138 
-        'id' => 'geodir_load_map',
1139 
-        'css' => 'min-width:300px;',
1140 
-        'std' => 'auto',
1141 
-        'type' => 'select',
1142 
-        'placeholder_text' => __('Select Map', 'geodirectory'),
1143 
-        'options' => array(
1144 
-                        'auto' => __('Load Automatic', 'geodirectory'),
1145 
-                        'google' => __('Load Google Maps API', 'geodirectory'),
1146 
-                        'osm' => __('Load OpenStreetMap API', 'geodirectory'),
1147 
-                        'none' => __('Disable Maps', 'geodirectory')
1148 
-                    )
1149 
-    ),
1150 
-
1151 
-    array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),
1152 
-
1153 
-    array('name' => __('Show / hide post type and category on map', 'geodirectory'),
1154 
-        'type' => 'sectionstart',
1155 
-        'desc' => '',
1156 
-        'id' => 'geodir_map_settings'),
1118 
+	array(
1119 
+		'name' => __('Upload map default marker icon', 'geodirectory'),
1120 
+		'desc' => '',
1121 
+		'id' => 'geodir_default_marker_icon',
1122 
+		'type' => 'file',
1123 
+		'std' => '0',
1124 
+		'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section
1125 
+	),
1126 
+	// add option that allows enable/disable map dragging to phone devices
1127 
+	array(
1128 
+		'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),
1129 
+		'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),
1130 
+		'id' => 'geodir_map_onoff_dragging',
1131 
+		'type' => 'checkbox',
1132 
+		'std' => '0' // Default value to show home top section
1133 
+	),
1134 
+	array(
1135 
+		'name' => __('Select Maps API', 'geodirectory'),
1136 
+		'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'),
1137 
+		'tip' => '',
1138 
+		'id' => 'geodir_load_map',
1139 
+		'css' => 'min-width:300px;',
1140 
+		'std' => 'auto',
1141 
+		'type' => 'select',
1142 
+		'placeholder_text' => __('Select Map', 'geodirectory'),
1143 
+		'options' => array(
1144 
+						'auto' => __('Load Automatic', 'geodirectory'),
1145 
+						'google' => __('Load Google Maps API', 'geodirectory'),
1146 
+						'osm' => __('Load OpenStreetMap API', 'geodirectory'),
1147 
+						'none' => __('Disable Maps', 'geodirectory')
1148 
+					)
1149 
+	),
1157 1150
1158 
-    array(
1159 
-        'name' => __('Select Map Category', 'geodirectory'),
1160 
-        'desc' => '',
1161 
-        'id' => 'geodir_map_settings',
1162 
-        'type' => 'map',
1163 
-        'css' => 'min-width:300px;',
1164 
-        'std' => '' // Default value for the page title - changed in settings
1165 
-    ),
1166 
-
1167 
-    array('type' => 'sectionend', 'id' => 'geodir_map_settings'),
1168 
-    /* Map Settings End */
1151 
+	array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),
1152 
+
1153 
+	array('name' => __('Show / hide post type and category on map', 'geodirectory'),
1154 
+		'type' => 'sectionstart',
1155 
+		'desc' => '',
1156 
+		'id' => 'geodir_map_settings'),
1157 
+
1158 
+	array(
1159 
+		'name' => __('Select Map Category', 'geodirectory'),
1160 
+		'desc' => '',
1161 
+		'id' => 'geodir_map_settings',
1162 
+		'type' => 'map',
1163 
+		'css' => 'min-width:300px;',
1164 
+		'std' => '' // Default value for the page title - changed in settings
1165 
+	),
1166 
+
1167 
+	array('type' => 'sectionend', 'id' => 'geodir_map_settings'),
1168 
+	/* Map Settings End */
1169 1169
1170 1170 
 )); // 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   +49 added lines, -49 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 
     }
 
@@ -322,7 +322,7 @@  discard block
 
 block discarded – undo
322 322
323 323 
     $gd_use_query_vars = geodir_is_page('detail') ? true : false;
324 324
325 
-    $args = wp_parse_args((array)$params,
325 
+    $args = wp_parse_args((array) $params,
326 326 
         array(
327 327 
             'title' => '',
328 328 
             'post_type' => array(), // NULL for all
 
@@ -359,7 +359,7 @@  discard block
 
 block discarded – undo
359 359 
         if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
360 360 
             if ($is_detail_page) {
361 361 
                 $is_detail = true;
362 
-                $post_ID = is_object($post) && !empty($post->ID) ? (int)$post->ID : 0;
362 
+                $post_ID = is_object($post) && !empty($post->ID) ? (int) $post->ID : 0;
363 363 
             } else {
364 364 
                 $is_listing = true;
365 365 
                 if (is_tax()) { // category page
 
@@ -367,7 +367,7 @@  discard block
 
 block discarded – undo
367 367 
                     $current_taxonomy = get_query_var('taxonomy');
368 368 
                     $current_posttype = geodir_get_current_posttype();
369 369
370 
-                    if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
370 
+                    if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype.'category') {
371 371 
                         $is_category = true;
372 372 
                     }
373 373 
                 }
 
@@ -400,15 +400,15 @@  discard block
 
 block discarded – undo
400 400 
     $hide_empty = !empty($args['hide_empty']) ? true : false;
401 401 
     $max_count = strip_tags($args['max_count']);
402 402 
     $all_childs = $max_count == 'all' ? true : false;
403 
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
403 
+    $max_count = $max_count > 0 ? (int) $max_count : 0;
404 404 
     $max_level = strip_tags($args['max_level']);
405 405 
     $show_count = !empty($args['show_count']) ? true : false;
406 406 
     $hide_icon = !empty($args['hide_icon']) ? true : false;
407 407 
     $cpt_left = !empty($args['cpt_left']) ? true : false;
408 408
409 
-    if(!$cpt_left){
409 
+    if (!$cpt_left) {
410 410 
         $cpt_left = "gd-cpt-flat";
411 
-    }else{
411 
+    } else {
412 412 
         $cpt_left = '';
413 413 
     }
414 414 
 
@@ -423,7 +423,7 @@  discard block
 
 block discarded – undo
423 423 
     if (!empty($post_types)) {
424 424 
         foreach ($post_types as $cpt => $cpt_info) {
425 425 
             $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
426 
-            $cat_taxonomy = $cpt . 'category';
426 
+            $cat_taxonomy = $cpt.'category';
427 427 
             $skip_childs = false;
428 428 
             if ($cat_filter && $cpt == $current_posttype && $is_detail && $post_ID) {
429 429 
                 $skip_childs = true;
 
@@ -446,32 +446,32 @@  discard block
 
 block discarded – undo
446 446 
                 if ($is_listing) {
447 447 
                     $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
448 448 
                 }
449 
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
449 
+                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-'.$cpt.$row_class.' '.$cpt_left.'">';
450 450
451 451 
                 if ($is_category && $cat_filter && $cpt == $current_posttype) {
452 452 
                     $term_info = get_term($current_term_id, $cat_taxonomy);
453 453
454 454 
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
455 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
455 
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($term_info->name).' icon" src="'.$term_icon_url.'" /> ' : '';
456 456
457 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
458 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
457 
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$term_info->count.')</span>' : '';
458 
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.$term_icon_url.$term_info->name.$count.'</h2>';
459 459 
                 } else {
460 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
460 
+                    $cpt_row .= '<h2 class="gd-cptcat-title">'.__($cpt_info['labels']['name'], 'geodirectory').'</h2>';
461 461 
                 }
462 462 
                 foreach ($categories as $category) {
463 463 
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
464 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
464 
+                    $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
465 465
466 
-                    $term_link = get_term_link( $category, $category->taxonomy );
466 
+                    $term_link = get_term_link($category, $category->taxonomy);
467 467 
                     /** Filter documented in geodirectory-functions/general_functions.php **/
468 
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
468 
+                    $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
469 469
470 470 
                     $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
471 471 
                     $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
472 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
473 
-                    $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>';
474 
-                    if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
472 
+                    $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
473 
+                    $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>';
474 
+                    if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int) $max_level > 0)) {
475 475 
                         $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
476 476 
                     }
477 477 
                     $cpt_row .= '</li>';
 
@@ -506,7 +506,7 @@  discard block
 
 block discarded – undo
506 506 
  * @return string Html content.
507 507 
  */
508 508 
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
509 
-    $cat_taxonomy = $cpt . 'category';
509 
+    $cat_taxonomy = $cpt.'category';
510 510
511 511 
     $orderby = 'count';
512 512 
     $order = 'DESC';
 
@@ -515,7 +515,7 @@  discard block
 
 block discarded – undo
515 515 
         $order = 'ASC';
516 516 
     }
517 517
518 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
518 
+    if ($max_level != 'all' && $depth > (int) $max_level) {
519 519 
         return '';
520 520 
     }
521 521 
 
@@ -532,18 +532,18 @@  discard block
 
 block discarded – undo
532 532 
         $child_cats = geodir_sort_terms($child_cats, 'count');
533 533 
     }
534 534
535 
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
535 
+    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-'.$depth.'">';
536 536 
     $depth++;
537 537 
     foreach ($child_cats as $category) {
538 538 
         $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
539 
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
540 
-        $term_link = get_term_link( $category, $category->taxonomy );
539 
+        $term_icon_url = $term_icon_url != '' ? '<img alt="'.esc_attr($category->name).' icon" src="'.$term_icon_url.'" /> ' : '';
540 
+        $term_link = get_term_link($category, $category->taxonomy);
541 541 
         /** Filter documented in geodirectory-functions/general_functions.php **/
542 
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
543 
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
542 
+        $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
543 
+        $count = $show_count ? ' <span class="gd-cptcat-count">('.$category->count.')</span>' : '';
544 544
545 545 
         $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
546 
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
546 
+        $content .= '<a href="'.esc_url($term_link).'" title="'.esc_attr($category->name).'">'.$term_icon_url.$category->name.$count.'</a></li>';
547 547 
         $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
548 548 
     }
549 549 
     $content .= '</li></ul>';
Please login to merge, or discard this patch.
Indentation   +444 added lines, -444 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');
 
@@ -316,179 +316,179 @@  discard block
 
 block discarded – undo
316 316 
  * @return string CPT categories content.
317 317 
  */
318 318 
 function geodir_cpt_categories_output($params) {
319 
-    global $post, $gd_use_query_vars;
319 
+	global $post, $gd_use_query_vars;
320 320
321 
-    $old_gd_use_query_vars = $gd_use_query_vars;
321 
+	$old_gd_use_query_vars = $gd_use_query_vars;
322 322
323 
-    $gd_use_query_vars = geodir_is_page('detail') ? true : false;
323 
+	$gd_use_query_vars = geodir_is_page('detail') ? true : false;
324 324
325 
-    $args = wp_parse_args((array)$params,
326 
-        array(
327 
-            'title' => '',
328 
-            'post_type' => array(), // NULL for all
329 
-            'hide_empty' => '',
330 
-            'show_count' => '',
331 
-            'hide_icon' => '',
332 
-            'cpt_left' => '',
333 
-            'sort_by' => 'count',
334 
-            'max_count' => 'all',
335 
-            'max_level' => '1',
336 
-            'no_cpt_filter' => '',
337 
-            'no_cat_filter' => '',
338 
-        )
339 
-    );
340 
-
341 
-    $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
342 
-    $cpt_filter = empty($args['no_cpt_filter']) ? true : false;
343 
-    $cat_filter = empty($args['no_cat_filter']) ? true : false;
344 
-
345 
-    $gd_post_types = geodir_get_posttypes('array');
346 
-
347 
-    $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
348 
-    $current_posttype = geodir_get_current_posttype();
349 
-
350 
-    $is_listing = false;
351 
-    $is_detail = false;
352 
-    $is_category = false;
353 
-    $post_ID = 0;
354 
-    $is_listing_page = geodir_is_page('listing');
355 
-    $is_detail_page = geodir_is_page('detail');
356 
-    if ($is_listing_page || $is_detail_page) {
357 
-        $current_posttype = geodir_get_current_posttype();
358 
-
359 
-        if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
360 
-            if ($is_detail_page) {
361 
-                $is_detail = true;
362 
-                $post_ID = is_object($post) && !empty($post->ID) ? (int)$post->ID : 0;
363 
-            } else {
364 
-                $is_listing = true;
365 
-                if (is_tax()) { // category page
366 
-                    $current_term_id = get_queried_object_id();
367 
-                    $current_taxonomy = get_query_var('taxonomy');
368 
-                    $current_posttype = geodir_get_current_posttype();
369 
-
370 
-                    if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
371 
-                        $is_category = true;
372 
-                    }
373 
-                }
374 
-            }
375 
-        }
376 
-    }
377 
-
378 
-    $parent_category = 0;
379 
-    if (($is_listing || $is_detail) && $cpt_filter) {
380 
-        $post_type_arr = array($current_posttype);
381 
-    }
382 
-
383 
-    $post_types = array();
384 
-    if (!empty($post_type_arr)) {
385 
-        if (in_array('0', $post_type_arr)) {
386 
-            $post_types = $gd_post_types;
387 
-        } else {
388 
-            foreach ($post_type_arr as $cpt) {
389 
-                if (isset($gd_post_types[$cpt])) {
390 
-                    $post_types[$cpt] = $gd_post_types[$cpt];
391 
-                }
392 
-            }
393 
-        }
394 
-    }
395 
-
396 
-    if (empty($post_type_arr)) {
397 
-        $post_types = $gd_post_types;
398 
-    }
399 
-
400 
-    $hide_empty = !empty($args['hide_empty']) ? true : false;
401 
-    $max_count = strip_tags($args['max_count']);
402 
-    $all_childs = $max_count == 'all' ? true : false;
403 
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
404 
-    $max_level = strip_tags($args['max_level']);
405 
-    $show_count = !empty($args['show_count']) ? true : false;
406 
-    $hide_icon = !empty($args['hide_icon']) ? true : false;
407 
-    $cpt_left = !empty($args['cpt_left']) ? true : false;
408 
-
409 
-    if(!$cpt_left){
410 
-        $cpt_left = "gd-cpt-flat";
411 
-    }else{
412 
-        $cpt_left = '';
413 
-    }
414 
-
415 
-    $orderby = 'count';
416 
-    $order = 'DESC';
417 
-    if ($sort_by == 'az') {
418 
-        $orderby = 'name';
419 
-        $order = 'ASC';
420 
-    }
421 
-
422 
-    $output = '';
423 
-    if (!empty($post_types)) {
424 
-        foreach ($post_types as $cpt => $cpt_info) {
425 
-            $parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
426 
-            $cat_taxonomy = $cpt . 'category';
427 
-            $skip_childs = false;
428 
-            if ($cat_filter && $cpt == $current_posttype && $is_detail && $post_ID) {
429 
-                $skip_childs = true;
430 
-                $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'object_ids' => $post_ID));
431 
-            } else {
432 
-                $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
433 
-            }
434 
-
435 
-            if ($hide_empty) {
436 
-                $categories = geodir_filter_empty_terms($categories);
437 
-            }
438 
-            if ($sort_by == 'count') {
439 
-                $categories = geodir_sort_terms($categories, 'count');
440 
-            }
325 
+	$args = wp_parse_args((array)$params,
326 
+		array(
327 
+			'title' => '',
328 
+			'post_type' => array(), // NULL for all
329 
+			'hide_empty' => '',
330 
+			'show_count' => '',
331 
+			'hide_icon' => '',
332 
+			'cpt_left' => '',
333 
+			'sort_by' => 'count',
334 
+			'max_count' => 'all',
335 
+			'max_level' => '1',
336 
+			'no_cpt_filter' => '',
337 
+			'no_cat_filter' => '',
338 
+		)
339 
+	);
340 
+
341 
+	$sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
342 
+	$cpt_filter = empty($args['no_cpt_filter']) ? true : false;
343 
+	$cat_filter = empty($args['no_cat_filter']) ? true : false;
344 
+
345 
+	$gd_post_types = geodir_get_posttypes('array');
346 
+
347 
+	$post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
348 
+	$current_posttype = geodir_get_current_posttype();
349 
+
350 
+	$is_listing = false;
351 
+	$is_detail = false;
352 
+	$is_category = false;
353 
+	$post_ID = 0;
354 
+	$is_listing_page = geodir_is_page('listing');
355 
+	$is_detail_page = geodir_is_page('detail');
356 
+	if ($is_listing_page || $is_detail_page) {
357 
+		$current_posttype = geodir_get_current_posttype();
358 
+
359 
+		if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
360 
+			if ($is_detail_page) {
361 
+				$is_detail = true;
362 
+				$post_ID = is_object($post) && !empty($post->ID) ? (int)$post->ID : 0;
363 
+			} else {
364 
+				$is_listing = true;
365 
+				if (is_tax()) { // category page
366 
+					$current_term_id = get_queried_object_id();
367 
+					$current_taxonomy = get_query_var('taxonomy');
368 
+					$current_posttype = geodir_get_current_posttype();
369 
+
370 
+					if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
371 
+						$is_category = true;
372 
+					}
373 
+				}
374 
+			}
375 
+		}
376 
+	}
377 
+
378 
+	$parent_category = 0;
379 
+	if (($is_listing || $is_detail) && $cpt_filter) {
380 
+		$post_type_arr = array($current_posttype);
381 
+	}
382 
+
383 
+	$post_types = array();
384 
+	if (!empty($post_type_arr)) {
385 
+		if (in_array('0', $post_type_arr)) {
386 
+			$post_types = $gd_post_types;
387 
+		} else {
388 
+			foreach ($post_type_arr as $cpt) {
389 
+				if (isset($gd_post_types[$cpt])) {
390 
+					$post_types[$cpt] = $gd_post_types[$cpt];
391 
+				}
392 
+			}
393 
+		}
394 
+	}
395 
+
396 
+	if (empty($post_type_arr)) {
397 
+		$post_types = $gd_post_types;
398 
+	}
399 
+
400 
+	$hide_empty = !empty($args['hide_empty']) ? true : false;
401 
+	$max_count = strip_tags($args['max_count']);
402 
+	$all_childs = $max_count == 'all' ? true : false;
403 
+	$max_count = $max_count > 0 ? (int)$max_count : 0;
404 
+	$max_level = strip_tags($args['max_level']);
405 
+	$show_count = !empty($args['show_count']) ? true : false;
406 
+	$hide_icon = !empty($args['hide_icon']) ? true : false;
407 
+	$cpt_left = !empty($args['cpt_left']) ? true : false;
408 
+
409 
+	if(!$cpt_left){
410 
+		$cpt_left = "gd-cpt-flat";
411 
+	}else{
412 
+		$cpt_left = '';
413 
+	}
414 
+
415 
+	$orderby = 'count';
416 
+	$order = 'DESC';
417 
+	if ($sort_by == 'az') {
418 
+		$orderby = 'name';
419 
+		$order = 'ASC';
420 
+	}
421 
+
422 
+	$output = '';
423 
+	if (!empty($post_types)) {
424 
+		foreach ($post_types as $cpt => $cpt_info) {
425 
+			$parent_category = ($is_category && $cat_filter && $cpt == $current_posttype) ? $current_term_id : 0;
426 
+			$cat_taxonomy = $cpt . 'category';
427 
+			$skip_childs = false;
428 
+			if ($cat_filter && $cpt == $current_posttype && $is_detail && $post_ID) {
429 
+				$skip_childs = true;
430 
+				$categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'object_ids' => $post_ID));
431 
+			} else {
432 
+				$categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
433 
+			}
434 
+
435 
+			if ($hide_empty) {
436 
+				$categories = geodir_filter_empty_terms($categories);
437 
+			}
438 
+			if ($sort_by == 'count') {
439 
+				$categories = geodir_sort_terms($categories, 'count');
440 
+			}
441 441
442 
-            $categories = apply_filters('geodir_custom_sort_cpt_terms', $categories);
443 
-
444 
-            if (!empty($categories)) {
445 
-                $term_icons = !$hide_icon ? geodir_get_term_icon() : array();
446 
-                $row_class = '';
447 
-
448 
-                if ($is_listing) {
449 
-                    $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
450 
-                }
451 
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
452 
-
453 
-                if ($is_category && $cat_filter && $cpt == $current_posttype) {
454 
-                    $term_info = get_term($current_term_id, $cat_taxonomy);
455 
-
456 
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
457 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
458 
-
459 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
460 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
461 
-                } else {
462 
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
463 
-                }
464 
-                foreach ($categories as $category) {
465 
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
466 
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
467 
-
468 
-                    $term_link = get_term_link( $category, $category->taxonomy );
469 
-                    /** Filter documented in geodirectory-functions/general_functions.php **/
470 
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
471 
-
472 
-                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
473 
-                    $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
474 
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
475 
-                    $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>';
476 
-                    if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
477 
-                        $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
478 
-                    }
479 
-                    $cpt_row .= '</li>';
480 
-                    $cpt_row .= '</ul>';
481 
-                }
482 
-                $cpt_row .= '</div>';
483 
-
484 
-                $output .= $cpt_row;
485 
-            }
486 
-        }
487 
-    }
442 
+			$categories = apply_filters('geodir_custom_sort_cpt_terms', $categories);
443 
+
444 
+			if (!empty($categories)) {
445 
+				$term_icons = !$hide_icon ? geodir_get_term_icon() : array();
446 
+				$row_class = '';
447 
+
448 
+				if ($is_listing) {
449 
+					$row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
450 
+				}
451 
+				$cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
452 
+
453 
+				if ($is_category && $cat_filter && $cpt == $current_posttype) {
454 
+					$term_info = get_term($current_term_id, $cat_taxonomy);
455 
+
456 
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
457 
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
458 
+
459 
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
460 
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
461 
+				} else {
462 
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
463 
+				}
464 
+				foreach ($categories as $category) {
465 
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
466 
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
467 
+
468 
+					$term_link = get_term_link( $category, $category->taxonomy );
469 
+					/** Filter documented in geodirectory-functions/general_functions.php **/
470 
+					$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
471 
+
472 
+					$cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
473 
+					$cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
474 
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
475 
+					$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>';
476 
+					if (!$skip_childs && ($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
477 
+						$cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
478 
+					}
479 
+					$cpt_row .= '</li>';
480 
+					$cpt_row .= '</ul>';
481 
+				}
482 
+				$cpt_row .= '</div>';
483 
+
484 
+				$output .= $cpt_row;
485 
+			}
486 
+		}
487 
+	}
488 488
489 
-    $gd_use_query_vars = $old_gd_use_query_vars;
489 
+	$gd_use_query_vars = $old_gd_use_query_vars;
490 490
491 
-    return $output;
491 
+	return $output;
492 492 
 }
493 493
494 494 
 /**
 
@@ -508,48 +508,48 @@  discard block
 
 block discarded – undo
508 508 
  * @return string Html content.
509 509 
  */
510 510 
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
511 
-    $cat_taxonomy = $cpt . 'category';
512 
-
513 
-    $orderby = 'count';
514 
-    $order = 'DESC';
515 
-    if ($sort_by == 'az') {
516 
-        $orderby = 'name';
517 
-        $order = 'ASC';
518 
-    }
519 
-
520 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
521 
-        return '';
522 
-    }
523 
-
524 
-    $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
525 
-    if ($hide_empty) {
526 
-        $child_cats = geodir_filter_empty_terms($child_cats);
527 
-    }
528 
-
529 
-    if (empty($child_cats)) {
530 
-        return '';
531 
-    }
532 
-
533 
-    if ($sort_by == 'count') {
534 
-        $child_cats = geodir_sort_terms($child_cats, 'count');
535 
-    }
536 
-
537 
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
538 
-    $depth++;
539 
-    foreach ($child_cats as $category) {
540 
-        $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
541 
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
542 
-        $term_link = get_term_link( $category, $category->taxonomy );
543 
-        /** Filter documented in geodirectory-functions/general_functions.php **/
544 
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
545 
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
546 
-
547 
-        $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
548 
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
549 
-        $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
550 
-    }
551 
-    $content .= '</li></ul>';
552 
-
553 
-    return $content;
511 
+	$cat_taxonomy = $cpt . 'category';
512 
+
513 
+	$orderby = 'count';
514 
+	$order = 'DESC';
515 
+	if ($sort_by == 'az') {
516 
+		$orderby = 'name';
517 
+		$order = 'ASC';
518 
+	}
519 
+
520 
+	if ($max_level != 'all' && $depth > (int)$max_level ) {
521 
+		return '';
522 
+	}
523 
+
524 
+	$child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
525 
+	if ($hide_empty) {
526 
+		$child_cats = geodir_filter_empty_terms($child_cats);
527 
+	}
528 
+
529 
+	if (empty($child_cats)) {
530 
+		return '';
531 
+	}
532 
+
533 
+	if ($sort_by == 'count') {
534 
+		$child_cats = geodir_sort_terms($child_cats, 'count');
535 
+	}
536 
+
537 
+	$content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
538 
+	$depth++;
539 
+	foreach ($child_cats as $category) {
540 
+		$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
541 
+		$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
542 
+		$term_link = get_term_link( $category, $category->taxonomy );
543 
+		/** Filter documented in geodirectory-functions/general_functions.php **/
544 
+		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
545 
+		$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
546 
+
547 
+		$content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
548 
+		$content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
549 
+		$content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
550 
+	}
551 
+	$content .= '</li></ul>';
552 
+
553 
+	return $content;
554 554 
 }
555 555 
 ?>
556 556 
\ 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.
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.
Indentation   +105 added lines, -105 removed lines patch added patch discarded remove patch 
@@ -16,127 +16,127 @@  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['fullscreenControl'] = false;
68 
-        $map_args['zoom'] = $zoom;
69 
-        $map_args['autozoom'] = $autozoom;
70 
-        $map_args['child_collapse'] = $child_collapse;
71 
-        $map_args['enable_cat_filters'] = true;
72 
-        $map_args['enable_text_search'] = true;
73 
-        $map_args['enable_post_type_filters'] = true;
74 
-        /** This action is documented in geodirectory_shortcodes.php */
75 
-        $map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);
76 
-        $map_args['enable_jason_on_load'] = false;
77 
-        $map_args['enable_marker_cluster'] = false;
78 
-        $map_args['enable_map_resize_button'] = true;
79 
-        $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['fullscreenControl'] = false;
68 
+		$map_args['zoom'] = $zoom;
69 
+		$map_args['autozoom'] = $autozoom;
70 
+		$map_args['child_collapse'] = $child_collapse;
71 
+		$map_args['enable_cat_filters'] = true;
72 
+		$map_args['enable_text_search'] = true;
73 
+		$map_args['enable_post_type_filters'] = true;
74 
+		/** This action is documented in geodirectory_shortcodes.php */
75 
+		$map_args['enable_location_filters'] = apply_filters('geodir_home_map_enable_location_filters', false);
76 
+		$map_args['enable_jason_on_load'] = false;
77 
+		$map_args['enable_marker_cluster'] = false;
78 
+		$map_args['enable_map_resize_button'] = true;
79 
+		$map_args['map_class_name'] = 'geodir-map-home-page';
80 80
81 
-        $is_geodir_home_map_widget = true;
82 
-        $map_args['is_geodir_home_map_widget'] = $is_geodir_home_map_widget;
81 
+		$is_geodir_home_map_widget = true;
82 
+		$map_args['is_geodir_home_map_widget'] = $is_geodir_home_map_widget;
83 83
84 
-        geodir_draw_map($map_args);
84 
+		geodir_draw_map($map_args);
85 85
86 
-        /* home map post type slider */
87 
-        if ($is_geodir_home_map_widget) {
88 
-            add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);
89 
-        }
86 
+		/* home map post type slider */
87 
+		if ($is_geodir_home_map_widget) {
88 
+			add_action('wp_footer', array($this, 'geodir_home_map_add_script'), 100);
89 
+		}
90 90
91 
-    }
91 
+	}
92 92
93 93 
 	/**
94 94 
 	 * Sanitize home page map widget form values as they are saved.
95 95 
 	 *
96 96 
 	 * @since 1.0.0
97 
-     * @since 1.5.1 Declare function public.
97 
+	 * @since 1.5.1 Declare function public.
98 98 
 	 *
99 99 
 	 * @param array $new_instance Values just sent to be saved.
100 100 
 	 * @param array $old_instance Previously saved values from database.
101 101 
 	 *
102 102 
 	 * @return array Updated safe values to be saved.
103 103 
 	 */
104 
-    public function update($new_instance, $old_instance)
105 
-    {
106 
-        //save the widget
107 
-        $instance = $old_instance;
108 
-        $instance['width'] = strip_tags($new_instance['width']);
109 
-        $instance['heigh'] = ($new_instance['heigh']);
110 
-        $instance['maptype'] = ($new_instance['maptype']);
111 
-        $instance['zoom'] = ($new_instance['zoom']);
112 
-        $instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';
113 
-        $instance['child_collapse'] = isset($new_instance['child_collapse']) ? ($new_instance['child_collapse']) : '';
114 
-        $instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';
104 
+	public function update($new_instance, $old_instance)
105 
+	{
106 
+		//save the widget
107 
+		$instance = $old_instance;
108 
+		$instance['width'] = strip_tags($new_instance['width']);
109 
+		$instance['heigh'] = ($new_instance['heigh']);
110 
+		$instance['maptype'] = ($new_instance['maptype']);
111 
+		$instance['zoom'] = ($new_instance['zoom']);
112 
+		$instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';
113 
+		$instance['child_collapse'] = isset($new_instance['child_collapse']) ? ($new_instance['child_collapse']) : '';
114 
+		$instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';
115 115
116 
-        return $instance;
117 
-    }
116 
+		return $instance;
117 
+	}
118 118
119 119 
 	/**
120 120 
 	 * Back-end home page map widget settings form.
121 121 
 	 *
122 122 
 	 * @since 1.0.0
123 
-     * @since 1.5.1 Declare function public.
123 
+	 * @since 1.5.1 Declare function public.
124 124 
 	 *
125 125 
 	 * @param array $instance Previously saved values from database.
126 126 
 	 */
127 
-    public function form($instance)
128 
-    {
129 
-        //widgetform in backend
127 
+	public function form($instance)
128 
+	{
129 
+		//widgetform in backend
130 130
131 
-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
132 
-        $width = strip_tags($instance['width']);
133 
-        $heigh = strip_tags($instance['heigh']);
134 
-        $maptype = strip_tags($instance['maptype']);
135 
-        $zoom = strip_tags($instance['zoom']);
136 
-        $autozoom = strip_tags($instance['autozoom']);
137 
-        $child_collapse = strip_tags($instance['child_collapse']);
138 
-        $scrollwheel = strip_tags($instance['scrollwheel']);
139 
-        ?>
131 
+		$instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));
132 
+		$width = strip_tags($instance['width']);
133 
+		$heigh = strip_tags($instance['heigh']);
134 
+		$maptype = strip_tags($instance['maptype']);
135 
+		$zoom = strip_tags($instance['zoom']);
136 
+		$autozoom = strip_tags($instance['autozoom']);
137 
+		$child_collapse = strip_tags($instance['child_collapse']);
138 
+		$scrollwheel = strip_tags($instance['scrollwheel']);
139 
+		?>
140 140
141 141 
         <p>
142 142 
             <label

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

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

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

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

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

@@ -318,7 +318,7 @@  discard block
 
 block discarded – undo
318 318 
             }
319 319 
         </script>
320 320 
     <?php
321 
-    }
321 
+	}
322 322 
 } // class geodir_homepage_map
323 323
324 324 
 register_widget('geodir_homepage_map');
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.
Indentation   +2308 added lines, -2308 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 
+						}
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.
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 
-                            $date_format = str_replace($search, $replace, $date_format);
411 
+							$date_format = str_replace($search, $replace, $date_format);
412 412
413 
-                            $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
413 
+							$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
414 414
415 
-                        }else{
416 
-                            $post_htmlvar_value = $request_info[$name];
417 
-                        }
415 
+						}else{
416 
+							$post_htmlvar_value = $request_info[$name];
417 
+						}
418 418
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 
-                    }
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 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 
-            }
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,611 +567,611 @@  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 
-     * @since 1.6.20 Hook added to filter value.
874 
-     * @package GeoDirectory
875 
-     * @global object $wpdb WordPress Database object.
876 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
877 
-     * @param int $post_id The post ID.
878 
-     * @param string $meta_key The meta key to retrieve.
879 
-     * @param bool $single Optional. Whether to return a single value. Default false.
880 
-     * @todo single variable not yet implemented.
881 
-     * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.
882 
-     */
883 
-    function geodir_get_post_meta($post_id, $meta_key, $single = false) {
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)));
869 
+	/**
870 
+	 * Get post custom meta.
871 
+	 *
872 
+	 * @since 1.0.0
873 
+	 * @since 1.6.20 Hook added to filter value.
874 
+	 * @package GeoDirectory
875 
+	 * @global object $wpdb WordPress Database object.
876 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
877 
+	 * @param int $post_id The post ID.
878 
+	 * @param string $meta_key The meta key to retrieve.
879 
+	 * @param bool $single Optional. Whether to return a single value. Default false.
880 
+	 * @todo single variable not yet implemented.
881 
+	 * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.
882 
+	 */
883 
+	function geodir_get_post_meta($post_id, $meta_key, $single = false) {
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 900
901 
-            if ($meta_value && $meta_value !== '') {
902 
-                $meta_value = maybe_serialize($meta_value);
903 
-            }
904 
-        } else {
905 
-            $meta_value = false;
906 
-        }
901 
+			if ($meta_value && $meta_value !== '') {
902 
+				$meta_value = maybe_serialize($meta_value);
903 
+			}
904 
+		} else {
905 
+			$meta_value = false;
906 
+		}
907 907
908 
-        /**
909 
-         * Filter the listing custom meta.
910 
-         *
911 
-         * @since 1.6.20
912 
-         *
913 
-         * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true.
914 
-         * @param int $post_id The post ID.
915 
-         * @param string $meta_key The meta key to retrieve.
916 
-         * @param bool $single Optional. Whether to return a single value. Default false.
917 
-         */
918 
-        return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single );
919 
-    }
908 
+		/**
909 
+		 * Filter the listing custom meta.
910 
+		 *
911 
+		 * @since 1.6.20
912 
+		 *
913 
+		 * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true.
914 
+		 * @param int $post_id The post ID.
915 
+		 * @param string $meta_key The meta key to retrieve.
916 
+		 * @param bool $single Optional. Whether to return a single value. Default false.
917 
+		 */
918 
+		return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single );
919 
+	}
920 920 
 }
921 921
922 922
923 923 
 if (!function_exists('geodir_save_post_images')) {
924 
-    /**
925 
-     * Save post attachments.
926 
-     *
927 
-     * @since 1.0.0
928 
-     * @package GeoDirectory
929 
-     * @global object $wpdb WordPress Database object.
930 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
931 
-     * @global object $current_user Current user object.
932 
-     * @param int $post_id The post ID.
933 
-     * @param array $post_image Post image urls as an array.
934 
-     * @param bool $dummy Optional. Is this a dummy listing? Default false.
935 
-     */
936 
-    function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)
937 
-    {
938 
-
924 
+	/**
925 
+	 * Save post attachments.
926 
+	 *
927 
+	 * @since 1.0.0
928 
+	 * @package GeoDirectory
929 
+	 * @global object $wpdb WordPress Database object.
930 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
931 
+	 * @global object $current_user Current user object.
932 
+	 * @param int $post_id The post ID.
933 
+	 * @param array $post_image Post image urls as an array.
934 
+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.
935 
+	 */
936 
+	function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)
937 
+	{
939 938
940 
-        global $wpdb, $plugin_prefix, $current_user;
941 939
942 
-        $post_type = get_post_type($post_id);
940 
+		global $wpdb, $plugin_prefix, $current_user;
943 941
944 
-        $table = $plugin_prefix . $post_type . '_detail';
942 
+		$post_type = get_post_type($post_id);
945 943
946 
-        $post_images = geodir_get_images($post_id);
944 
+		$table = $plugin_prefix . $post_type . '_detail';
947 945
948 
-        $wpdb->query(
949 
-            $wpdb->prepare(
950 
-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",
951 
-                array($post_id)
952 
-            )
953 
-        );
946 
+		$post_images = geodir_get_images($post_id);
954 947
955 
-        $invalid_files = $post_images;
956 
-        $valid_file_ids = array();
957 
-        $valid_files_condition = '';
958 
-        $geodir_uploaddir = '';
948 
+		$wpdb->query(
949 
+			$wpdb->prepare(
950 
+				"UPDATE " . $table . " SET featured_image = '' where post_id =%d",
951 
+				array($post_id)
952 
+			)
953 
+		);
959 954
960 
-        $remove_files = array();
955 
+		$invalid_files = $post_images;
956 
+		$valid_file_ids = array();
957 
+		$valid_files_condition = '';
958 
+		$geodir_uploaddir = '';
961 959
962 
-        if (!empty($post_image)) {
960 
+		$remove_files = array();
963 961
964 
-            $uploads = wp_upload_dir();
965 
-            $uploads_dir = $uploads['path'];
962 
+		if (!empty($post_image)) {
966 963
967 
-            $geodir_uploadpath = $uploads['path'];
968 
-            $geodir_uploadurl = $uploads['url'];
969 
-            $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';
964 
+			$uploads = wp_upload_dir();
965 
+			$uploads_dir = $uploads['path'];
970 966
971 
-            $invalid_files = array();
972 
-            $postcurr_images = array();
967 
+			$geodir_uploadpath = $uploads['path'];
968 
+			$geodir_uploadurl = $uploads['url'];
969 
+			$sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';
973 970
974 
-            for ($m = 0; $m < count($post_image); $m++) {
975 
-                $menu_order = $m + 1;
971 
+			$invalid_files = array();
972 
+			$postcurr_images = array();
976 973
977 
-                $file_path = '';
978 
-                /* --------- start ------- */
974 
+			for ($m = 0; $m < count($post_image); $m++) {
975 
+				$menu_order = $m + 1;
979 976
980 
-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
977 
+				$file_path = '';
978 
+				/* --------- start ------- */
981 979
982 
-                $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
980 
+				$split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
983 981
982 
+				$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
984 983
985 
-                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)))) {
986 984
987 
-                    /* --------- end ------- */
988 
-                    $curr_img_url = $post_image[$m];
985 
+				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)))) {
989 986
990 
-                    $image_name_arr = explode('/', $curr_img_url);
987 
+					/* --------- end ------- */
988 
+					$curr_img_url = $post_image[$m];
991 989
992 
-                    $count_image_name_arr = count($image_name_arr) - 2;
990 
+					$image_name_arr = explode('/', $curr_img_url);
993 991
994 
-                    $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;
992 
+					$count_image_name_arr = count($image_name_arr) - 2;
995 993
996 
-                    $curr_img_dir = $image_name_arr[$count_image_name_arr];
994 
+					$count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;
997 995
998 
-                    $filename = end($image_name_arr);
999 
-                    if (strpos($filename, '?') !== false) {
1000 
-                        list($filename) = explode('?', $filename);
1001 
-                    }
996 
+					$curr_img_dir = $image_name_arr[$count_image_name_arr];
1002 997
1003 
-                    $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);
1004 
-                    $curr_img_dir = str_replace($filename, "", $curr_img_dir);
998 
+					$filename = end($image_name_arr);
999 
+					if (strpos($filename, '?') !== false) {
1000 
+						list($filename) = explode('?', $filename);
1001 
+					}
1005 1002
1006 
-                    $img_name_arr = explode('.', $filename);
1003 
+					$curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);
1004 
+					$curr_img_dir = str_replace($filename, "", $curr_img_dir);
1007 1005
1008 
-                    $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;
1009 
-                    if (!empty($img_name_arr) && count($img_name_arr) > 2) {
1010 
-                        $new_img_name_arr = $img_name_arr;
1011 
-                        if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
1012 
-                            unset($new_img_name_arr[count($img_name_arr) - 1]);
1013 
-                            $file_title = implode('.', $new_img_name_arr);
1014 
-                        }
1015 
-                    }
1016 
-                    $file_title = sanitize_file_name($file_title);
1017 
-                    $file_name = sanitize_file_name($filename);
1006 
+					$img_name_arr = explode('.', $filename);
1018 1007
1019 
-                    $arr_file_type = wp_check_filetype($filename);
1008 
+					$file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;
1009 
+					if (!empty($img_name_arr) && count($img_name_arr) > 2) {
1010 
+						$new_img_name_arr = $img_name_arr;
1011 
+						if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
1012 
+							unset($new_img_name_arr[count($img_name_arr) - 1]);
1013 
+							$file_title = implode('.', $new_img_name_arr);
1014 
+						}
1015 
+					}
1016 
+					$file_title = sanitize_file_name($file_title);
1017 
+					$file_name = sanitize_file_name($filename);
1020 1018
1021 
-                    $uploaded_file_type = $arr_file_type['type'];
1019 
+					$arr_file_type = wp_check_filetype($filename);
1022 1020
1023 
-                    // Set an array containing a list of acceptable formats
1024 
-                    $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
1021 
+					$uploaded_file_type = $arr_file_type['type'];
1025 1022
1026 
-                    // If the uploaded file is the right format
1027 
-                    if (in_array($uploaded_file_type, $allowed_file_types)) {
1028 
-                        if (!function_exists('wp_handle_upload')) {
1029 
-                            require_once(ABSPATH . 'wp-admin/includes/file.php');
1030 
-                        }
1023 
+					// Set an array containing a list of acceptable formats
1024 
+					$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
1031 1025
1032 
-                        if (!is_dir($geodir_uploadpath)) {
1033 
-                            mkdir($geodir_uploadpath);
1034 
-                        }
1026 
+					// If the uploaded file is the right format
1027 
+					if (in_array($uploaded_file_type, $allowed_file_types)) {
1028 
+						if (!function_exists('wp_handle_upload')) {
1029 
+							require_once(ABSPATH . 'wp-admin/includes/file.php');
1030 
+						}
1035 1031
1036 
-                        $external_img = false;
1037 
-                        if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
1038 
-                        } else {
1039 
-                            $external_img = true;
1040 
-                        }
1032 
+						if (!is_dir($geodir_uploadpath)) {
1033 
+							mkdir($geodir_uploadpath);
1034 
+						}
1041 1035
1042 
-                        if ($dummy || $external_img) {
1043 
-                            $uploaded_file = array();
1044 
-                            $uploaded = (array)fetch_remote_file($curr_img_url);
1036 
+						$external_img = false;
1037 
+						if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
1038 
+						} else {
1039 
+							$external_img = true;
1040 
+						}
1045 1041
1046 
-                            if (isset($uploaded['error']) && empty($uploaded['error'])) {
1047 
-                                $new_name = basename($uploaded['file']);
1048 
-                                $uploaded_file = $uploaded;
1049 
-                            }else{
1050 
-                                print_r($uploaded);exit;
1051 
-                            }
1052 
-                            $external_img = false;
1053 
-                        } else {
1054 
-                            $new_name = $post_id . '_' . $file_name;
1042 
+						if ($dummy || $external_img) {
1043 
+							$uploaded_file = array();
1044 
+							$uploaded = (array)fetch_remote_file($curr_img_url);
1055 1045
1056 
-                            if ($curr_img_dir == $sub_dir) {
1057 
-                                $img_path = $geodir_uploadpath . '/' . $filename;
1058 
-                                $img_url = $geodir_uploadurl . '/' . $filename;
1059 
-                            } else {
1060 
-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1061 
-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1062 
-                            }
1046 
+							if (isset($uploaded['error']) && empty($uploaded['error'])) {
1047 
+								$new_name = basename($uploaded['file']);
1048 
+								$uploaded_file = $uploaded;
1049 
+							}else{
1050 
+								print_r($uploaded);exit;
1051 
+							}
1052 
+							$external_img = false;
1053 
+						} else {
1054 
+							$new_name = $post_id . '_' . $file_name;
1063 1055
1064 
-                            $uploaded_file = '';
1056 
+							if ($curr_img_dir == $sub_dir) {
1057 
+								$img_path = $geodir_uploadpath . '/' . $filename;
1058 
+								$img_url = $geodir_uploadurl . '/' . $filename;
1059 
+							} else {
1060 
+								$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1061 
+								$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1062 
+							}
1065 1063
1066 
-                            if (file_exists($img_path)) {
1067 
-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1068 
-                                $file_path = '';
1069 
-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
1070 
-                                $uploaded_file = true;
1071 
-                                $file_path = $curr_img_dir . '/' . $filename;
1072 
-                            }
1064 
+							$uploaded_file = '';
1073 1065
1074 
-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
1075 
-                                unlink($img_path);
1076 
-                        }
1066 
+							if (file_exists($img_path)) {
1067 
+								$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1068 
+								$file_path = '';
1069 
+							} else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
1070 
+								$uploaded_file = true;
1071 
+								$file_path = $curr_img_dir . '/' . $filename;
1072 
+							}
1077 1073
1078 
-                        if (!empty($uploaded_file)) {
1079 
-                            if (!isset($file_path) || !$file_path) {
1080 
-                                $file_path = $sub_dir . '/' . $new_name;
1081 
-                            }
1074 
+							if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
1075 
+								unlink($img_path);
1076 
+						}
1082 1077
1083 
-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
1078 
+						if (!empty($uploaded_file)) {
1079 
+							if (!isset($file_path) || !$file_path) {
1080 
+								$file_path = $sub_dir . '/' . $new_name;
1081 
+							}
1084 1082
1085 
-                            if ($menu_order == 1) {
1083 
+							$postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
1086 1084
1087 
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1085 
+							if ($menu_order == 1) {
1088 1086
1089 
-                            }
1087 
+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1090 1088
1091 
-                            // Set up options array to add this file as an attachment
1092 
-                            $attachment = array();
1093 
-                            $attachment['post_id'] = $post_id;
1094 
-                            $attachment['title'] = $file_title;
1095 
-                            $attachment['content'] = '';
1096 
-                            $attachment['file'] = $file_path;
1097 
-                            $attachment['mime_type'] = $uploaded_file_type;
1098 
-                            $attachment['menu_order'] = $menu_order;
1099 
-                            $attachment['is_featured'] = 0;
1089 
+							}
1100 1090
1101 
-                            $attachment_set = '';
1091 
+							// Set up options array to add this file as an attachment
1092 
+							$attachment = array();
1093 
+							$attachment['post_id'] = $post_id;
1094 
+							$attachment['title'] = $file_title;
1095 
+							$attachment['content'] = '';
1096 
+							$attachment['file'] = $file_path;
1097 
+							$attachment['mime_type'] = $uploaded_file_type;
1098 
+							$attachment['menu_order'] = $menu_order;
1099 
+							$attachment['is_featured'] = 0;
1102 1100
1103 
-                            foreach ($attachment as $key => $val) {
1104 
-                                if ($val != '')
1105 
-                                    $attachment_set .= $key . " = '" . $val . "', ";
1106 
-                            }
1101 
+							$attachment_set = '';
1107 1102
1108 
-                            $attachment_set = trim($attachment_set, ", ");
1103 
+							foreach ($attachment as $key => $val) {
1104 
+								if ($val != '')
1105 
+									$attachment_set .= $key . " = '" . $val . "', ";
1106 
+							}
1109 1107
1110 
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
1108 
+							$attachment_set = trim($attachment_set, ", ");
1109 
+
1110 
+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
1111 1111
1112 
-                            $valid_file_ids[] = $wpdb->insert_id;
1113 
-                        }
1112 
+							$valid_file_ids[] = $wpdb->insert_id;
1113 
+						}
1114 1114
1115 
-                    }
1115 
+					}
1116 1116
1117 1117
1118 
-                } else {
1119 
-                    $valid_file_ids[] = $find_image;
1118 
+				} else {
1119 
+					$valid_file_ids[] = $find_image;
1120 1120
1121 
-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
1121 
+					$postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
1122 1122
1123 
-                    $wpdb->query(
1124 
-                        $wpdb->prepare(
1125 
-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
1126 
-                            array($menu_order, $split_img_path[1], $post_id)
1127 
-                        )
1128 
-                    );
1123 
+					$wpdb->query(
1124 
+						$wpdb->prepare(
1125 
+							"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
1126 
+							array($menu_order, $split_img_path[1], $post_id)
1127 
+						)
1128 
+					);
1129 1129
1130 
-                    if ($menu_order == 1)
1131 
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1130 
+					if ($menu_order == 1)
1131 
+						$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1132 1132
1133 
-                }
1133 
+				}
1134 1134
1135 1135
1136 
-            }
1136 
+			}
1137 1137
1138 
-            if (!empty($valid_file_ids)) {
1138 
+			if (!empty($valid_file_ids)) {
1139 1139
1140 
-                $remove_files = $valid_file_ids;
1140 
+				$remove_files = $valid_file_ids;
1141 1141
1142 
-                $remove_files_length = count($remove_files);
1143 
-                $remove_files_format = array_fill(0, $remove_files_length, '%d');
1144 
-                $format = implode(',', $remove_files_format);
1145 
-                $valid_files_condition = " ID NOT IN ($format) AND ";
1142 
+				$remove_files_length = count($remove_files);
1143 
+				$remove_files_format = array_fill(0, $remove_files_length, '%d');
1144 
+				$format = implode(',', $remove_files_format);
1145 
+				$valid_files_condition = " ID NOT IN ($format) AND ";
1146 1146
1147 
-            }
1147 
+			}
1148 1148
1149 
-            //Get and remove all old images of post from database to set by new order
1149 
+			//Get and remove all old images of post from database to set by new order
1150 1150
1151 
-            if (!empty($post_images)) {
1151 
+			if (!empty($post_images)) {
1152 1152
1153 
-                foreach ($post_images as $img) {
1153 
+				foreach ($post_images as $img) {
1154 1154
1155 
-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
1155 
+					if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
1156 1156
1157 
-                        $invalid_files[] = (object)array('src' => $img->src);
1157 
+						$invalid_files[] = (object)array('src' => $img->src);
1158 1158
1159 
-                    }
1159 
+					}
1160 1160
1161 
-                }
1161 
+				}
1162 1162
1163 
-            }
1163 
+			}
1164 1164
1165 
-            $invalid_files = (object)$invalid_files;
1166 
-        }
1165 
+			$invalid_files = (object)$invalid_files;
1166 
+		}
1167 1167
1168 
-        $remove_files[] = $post_id;
1168 
+		$remove_files[] = $post_id;
1169 1169
1170 
-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1170 
+		$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1171 1171
1172 
-        if (!empty($invalid_files))
1173 
-            geodir_remove_attachments($invalid_files);
1174 
-    }
1172 
+		if (!empty($invalid_files))
1173 
+			geodir_remove_attachments($invalid_files);
1174 
+	}
1175 1175
1176 1176 
 }
1177 1177 
 

@@ -1185,12 +1185,12 @@  discard block
 
 block discarded – undo
1185 1185 
 function geodir_remove_temp_images()
1186 1186 
 {
1187 1187
1188 
-    global $current_user;
1188 
+	global $current_user;
1189 1189
1190 
-    $uploads = wp_upload_dir();
1191 
-    $uploads_dir = $uploads['path'];
1190 
+	$uploads = wp_upload_dir();
1191 
+	$uploads_dir = $uploads['path'];
1192 1192
1193 
-    /*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
1193 
+	/*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
1194 1194
1195 1195 
 			$dirPath = $uploads_dir.'/temp_'.$current_user->data->ID;
1196 1196 
 			if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {

@@ -1207,8 +1207,8 @@  discard block
 
 block discarded – undo
1207 1207 
 			rmdir($dirPath);
1208 1208 
 	}	*/
1209 1209
1210 
-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;
1211 
-    geodir_delete_directory($dirname);
1210 
+	$dirname = $uploads_dir . '/temp_' . $current_user->ID;
1211 
+	geodir_delete_directory($dirname);
1212 1212 
 }
1213 1213
1214 1214 
 

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

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

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

@@ -2054,69 +2054,69 @@  discard block
 
 block discarded – undo
2054 2054 
                 </div>
2055 2055 
             </div>
2056 2056 
             <?php
2057 
-            $html = ob_get_clean();
2058 
-            /**
2059 
-             * Filter to change infowindow html
2060 
-             *
2061 
-             * You can use this filter to change infowindow html.
2062 
-             *
2063 
-             * @since 1.0.0
2064 
-             * @package GeoDirectory
2065 
-             * @param string $html Infowindow html.
2066 
-             * @param object $postinfo_obj The Post object.
2067 
-             * @param bool|string $post_preview Is this a post preview?
2068 
-             */
2069 
-            $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
2070 
-            return $html;
2071 
-        }
2072 
-    }
2057 
+			$html = ob_get_clean();
2058 
+			/**
2059 
+			 * Filter to change infowindow html
2060 
+			 *
2061 
+			 * You can use this filter to change infowindow html.
2062 
+			 *
2063 
+			 * @since 1.0.0
2064 
+			 * @package GeoDirectory
2065 
+			 * @param string $html Infowindow html.
2066 
+			 * @param object $postinfo_obj The Post object.
2067 
+			 * @param bool|string $post_preview Is this a post preview?
2068 
+			 */
2069 
+			$html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
2070 
+			return $html;
2071 
+		}
2072 
+	}
2073 2073 
 }
2074 2074
2075 2075
2076 2076 
 if (!function_exists('geodir_new_post_default_status')) {
2077 
-    /**
2078 
-     * Default post status for new posts.
2079 
-     *
2080 
-     * @since 1.0.0
2081 
-     * @package GeoDirectory
2082 
-     * @return string Returns the default post status for new posts. Ex: draft, publish etc.
2083 
-     */
2084 
-    function geodir_new_post_default_status()
2085 
-    {
2086 
-        if (get_option('geodir_new_post_default_status'))
2087 
-            return get_option('geodir_new_post_default_status');
2088 
-        else
2089 
-            return 'publish';
2090 
-
2091 
-    }
2077 
+	/**
2078 
+	 * Default post status for new posts.
2079 
+	 *
2080 
+	 * @since 1.0.0
2081 
+	 * @package GeoDirectory
2082 
+	 * @return string Returns the default post status for new posts. Ex: draft, publish etc.
2083 
+	 */
2084 
+	function geodir_new_post_default_status()
2085 
+	{
2086 
+		if (get_option('geodir_new_post_default_status'))
2087 
+			return get_option('geodir_new_post_default_status');
2088 
+		else
2089 
+			return 'publish';
2090 
+
2091 
+	}
2092 2092 
 }
2093 2093
2094 2094 
 if (!function_exists('geodir_change_post_status')) {
2095 
-    /**
2096 
-     * Change post status of a post.
2097 
-     *
2098 
-     * @global object $wpdb WordPress Database object.
2099 
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2100 
-     * @param int|string $post_id The post ID.
2101 
-     * @param string $status New post status. Ex: draft, publish etc.
2102 
-     */
2103 
-    function geodir_change_post_status($post_id = '', $status = '')
2104 
-    {
2105 
-        global $wpdb, $plugin_prefix;
2106 
-
2107 
-        $post_type = get_post_type($post_id);
2108 
-
2109 
-        $table = $plugin_prefix . $post_type . '_detail';
2110 
-
2111 
-        $wpdb->query(
2112 
-            $wpdb->prepare(
2113 
-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
2114 
-                array($status, $post_id)
2115 
-            )
2116 
-        );
2117 
-
2118 
-
2119 
-    }
2095 
+	/**
2096 
+	 * Change post status of a post.
2097 
+	 *
2098 
+	 * @global object $wpdb WordPress Database object.
2099 
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2100 
+	 * @param int|string $post_id The post ID.
2101 
+	 * @param string $status New post status. Ex: draft, publish etc.
2102 
+	 */
2103 
+	function geodir_change_post_status($post_id = '', $status = '')
2104 
+	{
2105 
+		global $wpdb, $plugin_prefix;
2106 
+
2107 
+		$post_type = get_post_type($post_id);
2108 
+
2109 
+		$table = $plugin_prefix . $post_type . '_detail';
2110 
+
2111 
+		$wpdb->query(
2112 
+			$wpdb->prepare(
2113 
+				"UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
2114 
+				array($status, $post_id)
2115 
+			)
2116 
+		);
2117 
+
2118 
+
2119 
+	}
2120 2120 
 }
2121 2121
2122 2122 
 /**

@@ -2130,13 +2130,13 @@  discard block
 
 block discarded – undo
2130 2130 
  */
2131 2131 
 function geodir_set_post_status($pid, $status)
2132 2132 
 {
2133 
-    if ($pid) {
2134 
-        global $wpdb;
2135 
-        $my_post = array();
2136 
-        $my_post['post_status'] = $status;
2137 
-        $my_post['ID'] = $pid;
2138 
-        $last_postid = wp_update_post($my_post);
2139 
-    }
2133 
+	if ($pid) {
2134 
+		global $wpdb;
2135 
+		$my_post = array();
2136 
+		$my_post['post_status'] = $status;
2137 
+		$my_post['ID'] = $pid;
2138 
+		$last_postid = wp_update_post($my_post);
2139 
+	}
2140 2140 
 }
2141 2141
2142 2142 
 

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

@@ -2546,54 +2546,54 @@  discard block
 
 block discarded – undo
2546 2546 
 function geodir_get_cat_postcount($term = array())
2547 2547 
 {
2548 2548
2549 
-    if (!empty($term)) {
2549 
+	if (!empty($term)) {
2550 2550
2551 
-        global $wpdb, $plugin_prefix;
2551 
+		global $wpdb, $plugin_prefix;
2552 2552
2553 
-        $where = '';
2554 
-        $join = '';
2555 
-        if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
2556 
-            $taxonomy_obj = get_taxonomy($term->taxonomy);
2553 
+		$where = '';
2554 
+		$join = '';
2555 
+		if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
2556 
+			$taxonomy_obj = get_taxonomy($term->taxonomy);
2557 2557
2558 
-            $post_type = $taxonomy_obj->object_type[0];
2558 
+			$post_type = $taxonomy_obj->object_type[0];
2559 2559
2560 
-            $table = $plugin_prefix . $post_type . '_detail';
2560 
+			$table = $plugin_prefix . $post_type . '_detail';
2561 2561
2562 
-            /**
2563 
-             * Filter to modify the 'join' query
2564 
-             *
2565 
-             * @since 1.0.0
2566 
-             * @package GeoDirectory
2567 
-             * @param object|array $term category / term object that need to be processed.
2568 
-             * @param string $join The join query.
2569 
-             */
2570 
-            $join = apply_filters('geodir_cat_post_count_join', $join, $term);
2562 
+			/**
2563 
+			 * Filter to modify the 'join' query
2564 
+			 *
2565 
+			 * @since 1.0.0
2566 
+			 * @package GeoDirectory
2567 
+			 * @param object|array $term category / term object that need to be processed.
2568 
+			 * @param string $join The join query.
2569 
+			 */
2570 
+			$join = apply_filters('geodir_cat_post_count_join', $join, $term);
2571 2571
2572 
-            /**
2573 
-             * Filter to modify the 'where' query
2574 
-             *
2575 
-             * @since 1.0.0
2576 
-             * @package GeoDirectory
2577 
-             * @param object|array $term category / term object that need to be processed.
2578 
-             * @param string $where The where query.
2579 
-             */
2580 
-            $where = apply_filters('geodir_cat_post_count_where', $where, $term);
2572 
+			/**
2573 
+			 * Filter to modify the 'where' query
2574 
+			 *
2575 
+			 * @since 1.0.0
2576 
+			 * @package GeoDirectory
2577 
+			 * @param object|array $term category / term object that need to be processed.
2578 
+			 * @param string $where The where query.
2579 
+			 */
2580 
+			$where = apply_filters('geodir_cat_post_count_where', $where, $term);
2581 2581
2582 
-            $count_query = "SELECT count(post_id) FROM
2582 
+			$count_query = "SELECT count(post_id) FROM
2583 2583 
 							" . $table . " as pd " . $join . "
2584 2584 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
2585 2585
2586 
-            $cat_post_count = $wpdb->get_var($count_query);
2587 
-            if (empty($cat_post_count) || is_wp_error($cat_post_count))
2588 
-                $cat_post_count = 0;
2586 
+			$cat_post_count = $wpdb->get_var($count_query);
2587 
+			if (empty($cat_post_count) || is_wp_error($cat_post_count))
2588 
+				$cat_post_count = 0;
2589 2589
2590 
-            return $cat_post_count;
2590 
+			return $cat_post_count;
2591 2591
2592 
-        } else
2592 
+		} else
2593 2593
2594 
-            return $term->count;
2595 
-    }
2596 
-    return false;
2594 
+			return $term->count;
2595 
+	}
2596 
+	return false;
2597 2597
2598 2598 
 }
2599 2599 
 

@@ -2606,17 +2606,17 @@  discard block
 
 block discarded – undo
2606 2606 
  */
2607 2607 
 function geodir_allow_post_type_frontend()
2608 2608 
 {
2609 
-    $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
2609 
+	$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
2610 2610
2611 
-    if (!is_admin() && isset($_REQUEST['listing_type'])
2612 
-        && !empty($geodir_allow_posttype_frontend)
2613 
-        && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)
2614 
-    ) {
2611 
+	if (!is_admin() && isset($_REQUEST['listing_type'])
2612 
+		&& !empty($geodir_allow_posttype_frontend)
2613 
+		&& !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)
2614 
+	) {
2615 2615
2616 
-        wp_redirect(home_url());
2617 
-        exit;
2616 
+		wp_redirect(home_url());
2617 
+		exit;
2618 2618
2619 
-    }
2619 
+	}
2620 2620
2621 2621 
 }
2622 2622 
 

@@ -2633,20 +2633,20 @@  discard block
 
 block discarded – undo
2633 2633 
  */
2634 2634 
 function geodir_excerpt_length($length)
2635 2635 
 {
2636 
-    global $wp_query, $geodir_is_widget_listing;
2636 
+	global $wp_query, $geodir_is_widget_listing;
2637 2637 
 	if ($geodir_is_widget_listing) {
2638 2638 
 		return $length;
2639 2639 
 	}
2640 2640
2641 
-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
2642 
-        $length = get_option('geodir_desc_word_limit');
2643 
-    elseif (get_query_var('excerpt_length'))
2644 
-        $length = get_query_var('excerpt_length');
2641 
+	if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
2642 
+		$length = get_option('geodir_desc_word_limit');
2643 
+	elseif (get_query_var('excerpt_length'))
2644 
+		$length = get_query_var('excerpt_length');
2645 2645
2646 
-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
2647 
-        $length = get_option('geodir_author_desc_word_limit');
2646 
+	if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
2647 
+		$length = get_option('geodir_author_desc_word_limit');
2648 2648
2649 
-    return $length;
2649 
+	return $length;
2650 2650 
 }
2651 2651
2652 2652 
 /**

@@ -2661,13 +2661,13 @@  discard block
 
 block discarded – undo
2661 2661 
  */
2662 2662 
 function geodir_excerpt_more($more)
2663 2663 
 {
2664 
-    global $post;
2665 
-    $all_postypes = geodir_get_posttypes();
2666 
-    if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
2667 
-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';
2668 
-    }
2664 
+	global $post;
2665 
+	$all_postypes = geodir_get_posttypes();
2666 
+	if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
2667 
+		return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';
2668 
+	}
2669 2669
2670 
-    return $more;
2670 
+	return $more;
2671 2671 
 }
2672 2672
2673 2673 
 

@@ -2684,63 +2684,63 @@  discard block
 
 block discarded – undo
2684 2684 
  */
2685 2685 
 function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy)
2686 2686 
 {
2687 
-    global $plugin_prefix, $wpdb;
2687 
+	global $plugin_prefix, $wpdb;
2688 2688
2689 
-    $gd_taxonomies = geodir_get_taxonomies();
2689 
+	$gd_taxonomies = geodir_get_taxonomies();
2690 2690
2691 
-    if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
2691 
+	if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
2692 2692
2693 
-        $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
2694 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
2693 
+		$geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
2694 
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
2695 2695
2696 
-        $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
2697 
-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
2696 
+		$path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
2697 
+		$term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
2698 2698
2699 
-        $posts = $wpdb->get_results(
2700 
-            $wpdb->prepare(
2701 
-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
2702 
-                array($term_id, $taxonomy)
2703 
-            )
2704 
-        );
2699 
+		$posts = $wpdb->get_results(
2700 
+			$wpdb->prepare(
2701 
+				"SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
2702 
+				array($term_id, $taxonomy)
2703 
+			)
2704 
+		);
2705 2705
2706 
-        if (!empty($posts)):
2707 
-            foreach ($posts as $post_obj) {
2706 
+		if (!empty($posts)):
2707 
+			foreach ($posts as $post_obj) {
2708 2708
2709 
-                $lat = $post_obj->post_latitude;
2710 
-                $lng = $post_obj->post_longitude;
2709 
+				$lat = $post_obj->post_latitude;
2710 
+				$lng = $post_obj->post_longitude;
2711 2711
2712 
-                $json = '{';
2713 
-                $json .= '"id":"' . $post_obj->post_id . '",';
2714 
-                $json .= '"lat_pos": "' . $lat . '",';
2715 
-                $json .= '"long_pos": "' . $lng . '",';
2716 
-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
2717 
-                $json .= '"icon":"' . $term_icon . '",';
2718 
-                $json .= '"group":"catgroup' . $term_id . '"';
2719 
-                $json .= '}';
2712 
+				$json = '{';
2713 
+				$json .= '"id":"' . $post_obj->post_id . '",';
2714 
+				$json .= '"lat_pos": "' . $lat . '",';
2715 
+				$json .= '"long_pos": "' . $lng . '",';
2716 
+				$json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
2717 
+				$json .= '"icon":"' . $term_icon . '",';
2718 
+				$json .= '"group":"catgroup' . $term_id . '"';
2719 
+				$json .= '}';
2720 2720
2721 
-                if ($post_obj->default_category == $term_id) {
2721 
+				if ($post_obj->default_category == $term_id) {
2722 2722
2723 
-                    $wpdb->query(
2724 
-                        $wpdb->prepare(
2725 
-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",
2726 
-                            array($json, $post_obj->post_id)
2727 
-                        )
2728 
-                    );
2729 
-                }
2723 
+					$wpdb->query(
2724 
+						$wpdb->prepare(
2725 
+							"UPDATE " . $table . " SET marker_json = %s where post_id = %d",
2726 
+							array($json, $post_obj->post_id)
2727 
+						)
2728 
+					);
2729 
+				}
2730 2730
2731 
-                $wpdb->query(
2732 
-                    $wpdb->prepare(
2733 
-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
2734 
-                        array($json, $post_obj->post_id, $term_id)
2735 
-                    )
2736 
-                );
2731 
+				$wpdb->query(
2732 
+					$wpdb->prepare(
2733 
+						"UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
2734 
+						array($json, $post_obj->post_id, $term_id)
2735 
+					)
2736 
+				);
2737 2737
2738 
-            }
2738 
+			}
2739 2739
2740 2740
2741 
-        endif;
2741 
+		endif;
2742 2742
2743 
-    }
2743 
+	}
2744 2744
2745 2745 
 }
2746 2746 
 

@@ -2754,14 +2754,14 @@  discard block
 
 block discarded – undo
2754 2754 
  */
2755 2755 
 function geodir_get_listing_author($listing_id = '')
2756 2756 
 {
2757 
-    if ($listing_id == '') {
2758 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
2759 
-            $listing_id = $_REQUEST['pid'];
2760 
-        }
2761 
-    }
2762 
-    $listing = get_post(strip_tags($listing_id));
2763 
-    $listing_author_id = $listing->post_author;
2764 
-    return $listing_author_id;
2757 
+	if ($listing_id == '') {
2758 
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
2759 
+			$listing_id = $_REQUEST['pid'];
2760 
+		}
2761 
+	}
2762 
+	$listing = get_post(strip_tags($listing_id));
2763 
+	$listing_author_id = $listing->post_author;
2764 
+	return $listing_author_id;
2765 2765 
 }
2766 2766
2767 2767 
 

@@ -2776,11 +2776,11 @@  discard block
 
 block discarded – undo
2776 2776 
  */
2777 2777 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)
2778 2778 
 {
2779 
-    $listing_author_id = geodir_get_listing_author($listing_id);
2780 
-    if ($listing_author_id == $user_id)
2781 
-        return true;
2782 
-    else
2783 
-        return false;
2779 
+	$listing_author_id = geodir_get_listing_author($listing_id);
2780 
+	if ($listing_author_id == $user_id)
2781 
+		return true;
2782 
+	else
2783 
+		return false;
2784 2784
2785 2785 
 }
2786 2786 
 

@@ -2796,17 +2796,17 @@  discard block
 
 block discarded – undo
2796 2796 
  */
2797 2797 
 function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true)
2798 2798 
 {
2799 
-    global $current_user;
2800 
-    if ($exclude_admin) {
2801 
-        foreach ($current_user->caps as $key => $caps) {
2802 
-            if (geodir_strtolower($key) == 'administrator') {
2803 
-                return true;
2804 
-                break;
2805 
-            }
2806 
-        }
2807 
-    }
2808 
-
2809 
-    return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);
2799 
+	global $current_user;
2800 
+	if ($exclude_admin) {
2801 
+		foreach ($current_user->caps as $key => $caps) {
2802 
+			if (geodir_strtolower($key) == 'administrator') {
2803 
+				return true;
2804 
+				break;
2805 
+			}
2806 
+		}
2807 
+	}
2808 
+
2809 
+	return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);
2810 2810 
 }
2811 2811
2812 2812 
 

@@ -2822,17 +2822,17 @@  discard block
 
 block discarded – undo
2822 2822 
 function geodir_only_supportable_attachments_remove($file)
2823 2823 
 {
2824 2824
2825 
-    global $wpdb;
2825 
+	global $wpdb;
2826 2826
2827 
-    $matches = array();
2827 
+	$matches = array();
2828 2828
2829 
-    $pattern = '/-\d+x\d+\./';
2830 
-    preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
2829 
+	$pattern = '/-\d+x\d+\./';
2830 
+	preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
2831 2831
2832 
-    if (empty($matches))
2833 
-        return '';
2834 
-    else
2835 
-        return $file;
2832 
+	if (empty($matches))
2833 
+		return '';
2834 
+	else
2835 
+		return $file;
2836 2836
2837 2837 
 }
2838 2838 
 

@@ -2849,78 +2849,78 @@  discard block
 
 block discarded – undo
2849 2849 
 function geodir_set_wp_featured_image($post_id)
2850 2850 
 {
2851 2851
2852 
-    global $wpdb, $plugin_prefix;
2853 
-    $uploads = wp_upload_dir();
2852 
+	global $wpdb, $plugin_prefix;
2853 
+	$uploads = wp_upload_dir();
2854 2854 
 //	print_r($uploads ) ;
2855 
-    $post_first_image = $wpdb->get_results(
2856 
-        $wpdb->prepare(
2857 
-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
2858 
-        )
2859 
-    );
2860 
-
2861 
-    $old_attachment_name = '';
2862 
-    $post_thumbnail_id = '';
2863 
-    if (has_post_thumbnail($post_id)) {
2855 
+	$post_first_image = $wpdb->get_results(
2856 
+		$wpdb->prepare(
2857 
+			"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
2858 
+		)
2859 
+	);
2864 2860
2865 
-        if (has_post_thumbnail($post_id)) {
2861 
+	$old_attachment_name = '';
2862 
+	$post_thumbnail_id = '';
2863 
+	if (has_post_thumbnail($post_id)) {
2866 2864
2867 
-            $post_thumbnail_id = get_post_thumbnail_id($post_id);
2865 
+		if (has_post_thumbnail($post_id)) {
2868 2866
2869 
-            $old_attachment_name = basename(get_attached_file($post_thumbnail_id));
2867 
+			$post_thumbnail_id = get_post_thumbnail_id($post_id);
2870 2868
2871 
-        }
2872 
-    }
2869 
+			$old_attachment_name = basename(get_attached_file($post_thumbnail_id));
2873 2870
2874 
-    if (!empty($post_first_image)) {
2871 
+		}
2872 
+	}
2875 2873
2876 
-        $post_type = get_post_type($post_id);
2874 
+	if (!empty($post_first_image)) {
2877 2875
2878 
-        $table_name = $plugin_prefix . $post_type . '_detail';
2876 
+		$post_type = get_post_type($post_id);
2879 2877
2880 
-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
2878 
+		$table_name = $plugin_prefix . $post_type . '_detail';
2881 2879
2882 
-        $new_attachment_name = basename($post_first_image[0]->file);
2880 
+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
2883 2881
2884 
-        if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
2882 
+		$new_attachment_name = basename($post_first_image[0]->file);
2885 2883
2886 
-            if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
2884 
+		if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
2887 2885
2888 
-                add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
2886 
+			if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
2889 2887
2890 
-                wp_delete_attachment($post_thumbnail_id);
2888 
+				add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
2891 2889
2892 
-            }
2893 
-            $filename = $uploads['basedir'] . $post_first_image[0]->file;
2890 
+				wp_delete_attachment($post_thumbnail_id);
2894 2891
2895 
-            $attachment = array(
2896 
-                'post_mime_type' => $post_first_image[0]->mime_type,
2897 
-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
2898 
-                'post_parent' => $post_id,
2899 
-                'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
2900 
-                'post_content' => ''
2901 
-            );
2892 
+			}
2893 
+			$filename = $uploads['basedir'] . $post_first_image[0]->file;
2894 
+
2895 
+			$attachment = array(
2896 
+				'post_mime_type' => $post_first_image[0]->mime_type,
2897 
+				'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
2898 
+				'post_parent' => $post_id,
2899 
+				'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
2900 
+				'post_content' => ''
2901 
+			);
2902 2902
2903 2903
2904 
-            $id = wp_insert_attachment($attachment, $filename, $post_id);
2904 
+			$id = wp_insert_attachment($attachment, $filename, $post_id);
2905 2905
2906 
-            if (!is_wp_error($id)) {
2906 
+			if (!is_wp_error($id)) {
2907 2907
2908 
-                set_post_thumbnail($post_id, $id);
2908 
+				set_post_thumbnail($post_id, $id);
2909 2909
2910 
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
2911 
-                wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
2910 
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
2911 
+				wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
2912 2912
2913 
-            }
2913 
+			}
2914 2914
2915 
-        }
2915 
+		}
2916 2916
2917 
-    } else {
2918 
-        //set_post_thumbnail($post_id,-1);
2917 
+	} else {
2918 
+		//set_post_thumbnail($post_id,-1);
2919 2919
2920 
-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
2921 
-            wp_delete_attachment($post_thumbnail_id);
2920 
+		if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
2921 
+			wp_delete_attachment($post_thumbnail_id);
2922 2922
2923 
-    }
2923 
+	}
2924 2924 
 }
2925 2925
2926 2926 
 

@@ -2935,53 +2935,53 @@  discard block
 
 block discarded – undo
2935 2935 
  */
2936 2936 
 function gd_copy_original_translation()
2937 2937 
 {
2938 
-    if (geodir_is_wpml()) {
2939 
-        global $wpdb, $table_prefix, $plugin_prefix;
2940 
-        $post_id = absint($_POST['post_id']);
2941 
-        $upload_dir = wp_upload_dir();
2942 
-        $post_type = get_post_type($_POST['post_id']);
2943 
-        $table = $plugin_prefix . $post_type . '_detail';
2944 
-
2945 
-        $post_arr = $wpdb->get_results($wpdb->prepare(
2946 
-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2947 
-            array($post_id)
2948 
-        )
2949 
-            , ARRAY_A);
2950 
-
2951 
-        $arrImages = $wpdb->get_results(
2952 
-            $wpdb->prepare(
2953 
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2954 
-                array('%image%', $post_id)
2955 
-            )
2956 
-        );
2957 
-        if ($arrImages) {
2958 
-            $image_arr = array();
2959 
-            foreach ($arrImages as $img) {
2960 
-                $image_arr[] = $upload_dir['baseurl'] . $img->file;
2961 
-            }
2962 
-            $comma_separated = implode(",", $image_arr);
2963 
-            $post_arr[0]['post_images'] = $comma_separated;
2964 
-        }
2965 
-
2966 
-
2967 
-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
2968 
-        $cat_arr = array_filter(explode(",", $cats));
2969 
-        $trans_cat = array();
2970 
-        foreach ($cat_arr as $cat) {
2971 
-            $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
2972 
-        }
2973 
-
2974 
-
2975 
-        $post_arr[0]['categories'] = array_filter($trans_cat);
2938 
+	if (geodir_is_wpml()) {
2939 
+		global $wpdb, $table_prefix, $plugin_prefix;
2940 
+		$post_id = absint($_POST['post_id']);
2941 
+		$upload_dir = wp_upload_dir();
2942 
+		$post_type = get_post_type($_POST['post_id']);
2943 
+		$table = $plugin_prefix . $post_type . '_detail';
2944 
+
2945 
+		$post_arr = $wpdb->get_results($wpdb->prepare(
2946 
+			"SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2947 
+			array($post_id)
2948 
+		)
2949 
+			, ARRAY_A);
2950 
+
2951 
+		$arrImages = $wpdb->get_results(
2952 
+			$wpdb->prepare(
2953 
+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2954 
+				array('%image%', $post_id)
2955 
+			)
2956 
+		);
2957 
+		if ($arrImages) {
2958 
+			$image_arr = array();
2959 
+			foreach ($arrImages as $img) {
2960 
+				$image_arr[] = $upload_dir['baseurl'] . $img->file;
2961 
+			}
2962 
+			$comma_separated = implode(",", $image_arr);
2963 
+			$post_arr[0]['post_images'] = $comma_separated;
2964 
+		}
2965 
+
2966 
+
2967 
+		$cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
2968 
+		$cat_arr = array_filter(explode(",", $cats));
2969 
+		$trans_cat = array();
2970 
+		foreach ($cat_arr as $cat) {
2971 
+			$trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
2972 
+		}
2973 
+
2974 
+
2975 
+		$post_arr[0]['categories'] = array_filter($trans_cat);
2976 2976 
 //print_r($image_arr);
2977 
-        //print_r($arrImages);
2978 
-        //echo $_REQUEST['lang'];
2977 
+		//print_r($arrImages);
2978 
+		//echo $_REQUEST['lang'];
2979 2979 
 //print_r($post_arr);
2980 2980 
 //print_r($trans_cat);
2981 
-        echo json_encode($post_arr[0]);
2981 
+		echo json_encode($post_arr[0]);
2982 2982
2983 
-    }
2984 
-    die();
2983 
+	}
2984 
+	die();
2985 2985 
 }
2986 2986
2987 2987 
 

@@ -3001,54 +3001,54 @@  discard block
 
 block discarded – undo
3001 3001 
 function geodir_get_custom_fields_type($listing_type = '')
3002 3002 
 {
3003 3003
3004 
-    global $wpdb;
3004 
+	global $wpdb;
3005 3005
3006 
-    if ($listing_type == '')
3007 
-        $listing_type = 'gd_place';
3006 
+	if ($listing_type == '')
3007 
+		$listing_type = 'gd_place';
3008 3008
3009 
-    $fields_info = array();
3009 
+	$fields_info = array();
3010 3010
3011 
-    $get_data = $wpdb->get_results(
3012 
-        $wpdb->prepare(
3013 
-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
3014 
-            array($listing_type)
3015 
-        )
3016 
-    );
3011 
+	$get_data = $wpdb->get_results(
3012 
+		$wpdb->prepare(
3013 
+			"SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
3014 
+			array($listing_type)
3015 
+		)
3016 
+	);
3017 3017
3018 
-    if (!empty($get_data)) {
3018 
+	if (!empty($get_data)) {
3019 3019
3020 
-        foreach ($get_data as $data) {
3020 
+		foreach ($get_data as $data) {
3021 3021
3022 
-            if ($data->field_type == 'address') {
3022 
+			if ($data->field_type == 'address') {
3023 3023
3024 
-                $extra_fields = unserialize($data->extra_fields);
3024 
+				$extra_fields = unserialize($data->extra_fields);
3025 3025
3026 
-                $prefix = $data->htmlvar_name . '_';
3026 
+				$prefix = $data->htmlvar_name . '_';
3027 3027
3028 
-                $fields_info[$prefix . 'address'] = $data->field_type;
3028 
+				$fields_info[$prefix . 'address'] = $data->field_type;
3029 3029
3030 
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3031 
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
3030 
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3031 
+					$fields_info[$prefix . 'zip'] = $data->field_type;
3032 3032
3033 
-            } else {
3033 
+			} else {
3034 3034
3035 
-                $fields_info[$data->htmlvar_name] = $data->field_type;
3035 
+				$fields_info[$data->htmlvar_name] = $data->field_type;
3036 3036
3037 
-            }
3037 
+			}
3038 3038
3039 
-        }
3039 
+		}
3040 3040
3041 
-    }
3041 
+	}
3042 3042
3043 
-    /**
3044 
-     * Filter to modify custom fields info using listing post type.
3045 
-     *
3046 
-     * @since 1.0.0
3047 
-     * @package GeoDirectory
3048 
-     * @return array $fields_info Custom fields info.
3049 
-     * @param string $listing_type The listing post type.
3050 
-     */
3051 
-    return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
3043 
+	/**
3044 
+	 * Filter to modify custom fields info using listing post type.
3045 
+	 *
3046 
+	 * @since 1.0.0
3047 
+	 * @package GeoDirectory
3048 
+	 * @return array $fields_info Custom fields info.
3049 
+	 * @param string $listing_type The listing post type.
3050 
+	 */
3051 
+	return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
3052 3052 
 }
3053 3053
3054 3054 
 

@@ -3063,58 +3063,58 @@  discard block
 
 block discarded – undo
3063 3063 
  */
3064 3064 
 function geodir_function_post_updated($post_ID, $post_after, $post_before)
3065 3065 
 {
3066 
-    $post_type = get_post_type($post_ID);
3066 
+	$post_type = get_post_type($post_ID);
3067 3067
3068 
-    if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
3069 
-        // send notification to client when post moves from draft to publish
3070 
-        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')) {
3071 
-            $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;
3072 
-            $post_author_data = get_userdata($post_author_id);
3068 
+	if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
3069 
+		// send notification to client when post moves from draft to publish
3070 
+		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')) {
3071 
+			$post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;
3072 
+			$post_author_data = get_userdata($post_author_id);
3073 3073
3074 
-            $to_name = geodir_get_client_name($post_author_id);
3074 
+			$to_name = geodir_get_client_name($post_author_id);
3075 3075
3076 
-            $from_email = geodir_get_site_email_id();
3077 
-            $from_name = get_site_emailName();
3078 
-            $to_email = $post_author_data->user_email;
3076 
+			$from_email = geodir_get_site_email_id();
3077 
+			$from_name = get_site_emailName();
3078 
+			$to_email = $post_author_data->user_email;
3079 3079
3080 
-            if (!is_email($to_email) && !empty($post_author_data->user_email)) {
3081 
-                $to_email = $post_author_data->user_email;
3082 
-            }
3080 
+			if (!is_email($to_email) && !empty($post_author_data->user_email)) {
3081 
+				$to_email = $post_author_data->user_email;
3082 
+			}
3083 3083
3084 
-            $message_type = 'listing_published';
3084 
+			$message_type = 'listing_published';
3085 3085
3086 
-            if (get_option('geodir_post_published_email_subject') == '') {
3087 
-                update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
3088 
-            }
3086 
+			if (get_option('geodir_post_published_email_subject') == '') {
3087 
+				update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
3088 
+			}
3089 3089
3090 
-            if (get_option('geodir_post_published_email_content') == '') {
3091 
-                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'));
3092 
-            }
3090 
+			if (get_option('geodir_post_published_email_content') == '') {
3091 
+				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'));
3092 
+			}
3093 3093
3094 
-            /**
3095 
-             * Called before sending the email when listing gets published.
3096 
-             *
3097 
-             * @since 1.0.0
3098 
-             * @package GeoDirectory
3099 
-             * @param object $post_after The post object after update.
3100 
-             * @param object $post_before The post object before update.
3101 
-             */
3102 
-            do_action('geodir_before_listing_published_email', $post_after, $post_before);
3103 
-            if (is_email($to_email)) {
3104 
-                geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);
3105 
-            }
3094 
+			/**
3095 
+			 * Called before sending the email when listing gets published.
3096 
+			 *
3097 
+			 * @since 1.0.0
3098 
+			 * @package GeoDirectory
3099 
+			 * @param object $post_after The post object after update.
3100 
+			 * @param object $post_before The post object before update.
3101 
+			 */
3102 
+			do_action('geodir_before_listing_published_email', $post_after, $post_before);
3103 
+			if (is_email($to_email)) {
3104 
+				geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);
3105 
+			}
3106 3106
3107 
-            /**
3108 
-             * Called after sending the email when listing gets published.
3109 
-             *
3110 
-             * @since 1.0.0
3111 
-             * @package GeoDirectory
3112 
-             * @param object $post_after The post object after update.
3113 
-             * @param object $post_before The post object before update.
3114 
-             */
3115 
-            do_action('geodir_after_listing_published_email', $post_after, $post_before);
3116 
-        }
3117 
-    }
3107 
+			/**
3108 
+			 * Called after sending the email when listing gets published.
3109 
+			 *
3110 
+			 * @since 1.0.0
3111 
+			 * @package GeoDirectory
3112 
+			 * @param object $post_after The post object after update.
3113 
+			 * @param object $post_before The post object before update.
3114 
+			 */
3115 
+			do_action('geodir_after_listing_published_email', $post_after, $post_before);
3116 
+		}
3117 
+	}
3118 3118 
 }
3119 3119
3120 3120 
 add_action('wp_head', 'geodir_fb_like_thumbnail');

@@ -3129,46 +3129,46 @@  discard block
 
 block discarded – undo
3129 3129 
  */
3130 3130 
 function geodir_fb_like_thumbnail(){
3131 3131
3132 
-    $facebook_image = '';
3133 
-
3134 
-    if(is_single()){// single post
3135 
-        global $post;
3136 
-        if(isset($post->featured_image) && $post->featured_image){
3137 
-            $upload_dir = wp_upload_dir();
3138 
-            $facebook_image = $upload_dir['baseurl'].$post->featured_image;
3139 
-
3140 
-        }
3141 
-    }elseif(geodir_is_page('location')){// location page
3142 
-        if (function_exists('geodir_get_location_seo')) {
3143 
-            $seo = geodir_get_location_seo();
3144 
-            if (isset($seo->seo_image) && $seo->seo_image) {
3145 
-                $image = wp_get_attachment_image_src($seo->seo_image, 'full');
3146 
-                $facebook_image = isset($image[0]) ? $image[0] : '';
3147 
-            }
3148 
-        }
3149 
-
3150 
-        if(!$facebook_image){
3151 
-            global $post;
3152 
-
3153 
-            if (has_post_thumbnail( $post->ID ) ){
3154 
-                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
3155 
-                $facebook_image = isset($image[0]) ? $image[0] : '';
3156 
-            }
3157 
-        }
3158 
-    }
3159 
-
3160 
-
3161 
-    /**
3162 
-     * Filter the facebook share image.
3163 
-     *
3164 
-     * @since 1.6.22
3165 
-     * @param string $facebook_image The image URL or blank.
3166 
-     */
3167 
-    $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
3168 
-
3169 
-    if($facebook_image){
3170 
-        echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
3171 
-    }
3132 
+	$facebook_image = '';
3133 
+
3134 
+	if(is_single()){// single post
3135 
+		global $post;
3136 
+		if(isset($post->featured_image) && $post->featured_image){
3137 
+			$upload_dir = wp_upload_dir();
3138 
+			$facebook_image = $upload_dir['baseurl'].$post->featured_image;
3139 
+
3140 
+		}
3141 
+	}elseif(geodir_is_page('location')){// location page
3142 
+		if (function_exists('geodir_get_location_seo')) {
3143 
+			$seo = geodir_get_location_seo();
3144 
+			if (isset($seo->seo_image) && $seo->seo_image) {
3145 
+				$image = wp_get_attachment_image_src($seo->seo_image, 'full');
3146 
+				$facebook_image = isset($image[0]) ? $image[0] : '';
3147 
+			}
3148 
+		}
3149 
+
3150 
+		if(!$facebook_image){
3151 
+			global $post;
3152 
+
3153 
+			if (has_post_thumbnail( $post->ID ) ){
3154 
+				$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
3155 
+				$facebook_image = isset($image[0]) ? $image[0] : '';
3156 
+			}
3157 
+		}
3158 
+	}
3159 
+
3160 
+
3161 
+	/**
3162 
+	 * Filter the facebook share image.
3163 
+	 *
3164 
+	 * @since 1.6.22
3165 
+	 * @param string $facebook_image The image URL or blank.
3166 
+	 */
3167 
+	$facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
3168 
+
3169 
+	if($facebook_image){
3170 
+		echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
3171 
+	}
3172 3172
3173 3173
3174 3174 
 }
3175 3175 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +217 added lines, -217 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
901 901 
             if ($meta_value && $meta_value !== '') {
902 902 
                 $meta_value = maybe_serialize($meta_value);

@@ -915,7 +915,7 @@  discard block
 
 block discarded – undo
915 915 
          * @param string $meta_key The meta key to retrieve.
916 916 
          * @param bool $single Optional. Whether to return a single value. Default false.
917 917 
          */
918 
-        return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single );
918 
+        return apply_filters('geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single);
919 919 
     }
920 920 
 }
921 921 
 

@@ -941,13 +941,13 @@  discard block
 
 block discarded – undo
941 941
942 942 
         $post_type = get_post_type($post_id);
943 943
944 
-        $table = $plugin_prefix . $post_type . '_detail';
944 
+        $table = $plugin_prefix.$post_type.'_detail';
945 945
946 946 
         $post_images = geodir_get_images($post_id);
947 947
948 948 
         $wpdb->query(
949 949 
             $wpdb->prepare(
950 
-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",
950 
+                "UPDATE ".$table." SET featured_image = '' where post_id =%d",
951 951 
                 array($post_id)
952 952 
             )
953 953 
         );

@@ -977,12 +977,12 @@  discard block
 
 block discarded – undo
977 977 
                 $file_path = '';
978 978 
                 /* --------- start ------- */
979 979
980 
-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
980 
+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));
981 981
982 982 
                 $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
983 983
984 984
985 
-                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)))) {
985 
+                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)))) {
986 986
987 987 
                     /* --------- end ------- */
988 988 
                     $curr_img_url = $post_image[$m];

@@ -1026,7 +1026,7 @@  discard block
 
 block discarded – undo
1026 1026 
                     // If the uploaded file is the right format
1027 1027 
                     if (in_array($uploaded_file_type, $allowed_file_types)) {
1028 1028 
                         if (!function_exists('wp_handle_upload')) {
1029 
-                            require_once(ABSPATH . 'wp-admin/includes/file.php');
1029 
+                            require_once(ABSPATH.'wp-admin/includes/file.php');
1030 1030 
                         }
1031 1031
1032 1032 
                         if (!is_dir($geodir_uploadpath)) {

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

@@ -1077,14 +1077,14 @@  discard block
 
 block discarded – undo
1077 1077
1078 1078 
                         if (!empty($uploaded_file)) {
1079 1079 
                             if (!isset($file_path) || !$file_path) {
1080 
-                                $file_path = $sub_dir . '/' . $new_name;
1080 
+                                $file_path = $sub_dir.'/'.$new_name;
1081 1081 
                             }
1082 1082
1083 
-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
1083 
+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);
1084 1084
1085 1085 
                             if ($menu_order == 1) {
1086 1086
1087 
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1087 
+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
1088 1088
1089 1089 
                             }
1090 1090 
 

@@ -1102,12 +1102,12 @@  discard block
 
 block discarded – undo
1102 1102
1103 1103 
                             foreach ($attachment as $key => $val) {
1104 1104 
                                 if ($val != '')
1105 
-                                    $attachment_set .= $key . " = '" . $val . "', ";
1105 
+                                    $attachment_set .= $key." = '".$val."', ";
1106 1106 
                             }
1107 1107
1108 1108 
                             $attachment_set = trim($attachment_set, ", ");
1109 1109
1110 
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
1110 
+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
1111 1111
1112 1112 
                             $valid_file_ids[] = $wpdb->insert_id;
1113 1113 
                         }

@@ -1118,17 +1118,17 @@  discard block
 
 block discarded – undo
1118 1118 
                 } else {
1119 1119 
                     $valid_file_ids[] = $find_image;
1120 1120
1121 
-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
1121 
+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);
1122 1122
1123 1123 
                     $wpdb->query(
1124 1124 
                         $wpdb->prepare(
1125 
-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
1125 
+                            "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d",
1126 1126 
                             array($menu_order, $split_img_path[1], $post_id)
1127 1127 
                         )
1128 1128 
                     );
1129 1129
1130 1130 
                     if ($menu_order == 1)
1131 
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1131 
+                        $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1132 1132
1133 1133 
                 }
1134 1134 
 

@@ -1152,9 +1152,9 @@  discard block
 
 block discarded – undo
1152 1152
1153 1153 
                 foreach ($post_images as $img) {
1154 1154
1155 
-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
1155 
+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {
1156 1156
1157 
-                        $invalid_files[] = (object)array('src' => $img->src);
1157 
+                        $invalid_files[] = (object) array('src' => $img->src);
1158 1158
1159 1159 
                     }
1160 1160 
 

@@ -1162,12 +1162,12 @@  discard block
 
 block discarded – undo
1162 1162
1163 1163 
             }
1164 1164
1165 
-            $invalid_files = (object)$invalid_files;
1165 
+            $invalid_files = (object) $invalid_files;
1166 1166 
         }
1167 1167
1168 1168 
         $remove_files[] = $post_id;
1169 1169
1170 
-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1170 
+        $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));
1171 1171
1172 1172 
         if (!empty($invalid_files))
1173 1173 
             geodir_remove_attachments($invalid_files);

@@ -1207,7 +1207,7 @@  discard block
 
 block discarded – undo
1207 1207 
 			rmdir($dirPath);
1208 1208 
 	}	*/
1209 1209
1210 
-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;
1210 
+    $dirname = $uploads_dir.'/temp_'.$current_user->ID;
1211 1211 
     geodir_delete_directory($dirname);
1212 1212 
 }
1213 1213 
 

@@ -1229,10 +1229,10 @@  discard block
 
 block discarded – undo
1229 1229 
         return false;
1230 1230 
     while ($file = readdir($dir_handle)) {
1231 1231 
         if ($file != "." && $file != "..") {
1232 
-            if (!is_dir($dirname . "/" . $file))
1233 
-                unlink($dirname . "/" . $file);
1232 
+            if (!is_dir($dirname."/".$file))
1233 
+                unlink($dirname."/".$file);
1234 1234 
             else
1235 
-                geodir_delete_directory($dirname . '/' . $file);
1235 
+                geodir_delete_directory($dirname.'/'.$file);
1236 1236 
         }
1237 1237 
     }
1238 1238 
     closedir($dir_handle);

@@ -1261,8 +1261,8 @@  discard block
 
 block discarded – undo
1261 1261 
             foreach ($postcurr_images as $postimg) {
1262 1262 
                 $image_name_arr = explode('/', $postimg->src);
1263 1263 
                 $filename = end($image_name_arr);
1264 
-                if (file_exists($uploads_dir . '/' . $filename))
1265 
-                    unlink($uploads_dir . '/' . $filename);
1264 
+                if (file_exists($uploads_dir.'/'.$filename))
1265 
+                    unlink($uploads_dir.'/'.$filename);
1266 1266 
             }
1267 1267
1268 1268 
         } // endif

@@ -1303,28 +1303,28 @@  discard block
 
 block discarded – undo
1303 1303 
         }
1304 1304
1305 1305 
         if (!in_array($post_type, geodir_get_posttypes())) {
1306 
-            return false;// if not a GD CPT return;
1306 
+            return false; // if not a GD CPT return;
1307 1307 
         }
1308 1308
1309 1309
1310 
-        $list_img_size = get_option('geodir_listing_img_size','default');
1310 
+        $list_img_size = get_option('geodir_listing_img_size', 'default');
1311 1311
1312 
-        if( $size=='list-thumb' && $list_img_size != 'default' ){
1313 
-            $fimg = get_the_post_thumbnail_url($post_id,$list_img_size);
1314 
-            if($fimg){
1312 
+        if ($size == 'list-thumb' && $list_img_size != 'default') {
1313 
+            $fimg = get_the_post_thumbnail_url($post_id, $list_img_size);
1314 
+            if ($fimg) {
1315 1315 
                 $uploads = wp_upload_dir();
1316 1316 
                 $uploads_baseurl = $uploads['baseurl'];
1317 
-                $file = str_replace($uploads_baseurl,'',$fimg);
1317 
+                $file = str_replace($uploads_baseurl, '', $fimg);
1318 1318 
             }
1319 1319 
         }
1320 1320
1321 
-        $table = $plugin_prefix . $post_type . '_detail';
1321 
+        $table = $plugin_prefix.$post_type.'_detail';
1322 1322
1323 1323 
         if (!$file) {
1324 1324 
             if (isset($post->featured_image)) {
1325 1325 
                 $file = $post->featured_image;
1326 1326 
             } else {
1327 
-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
1327 
+                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));
1328 1328 
             }
1329 1329 
         }
1330 1330 
 

@@ -1343,7 +1343,7 @@  discard block
 
 block discarded – undo
1343 1343
1344 1344 
             $file_name = $file_info['basename'];
1345 1345
1346 
-            $uploads_url = $uploads_baseurl . $sub_dir;
1346 
+            $uploads_url = $uploads_baseurl.$sub_dir;
1347 1347 
             /*
1348 1348 
              * Allows the filter of image src for such things as CDN change.
1349 1349 
              *

@@ -1353,8 +1353,8 @@  discard block
 
 block discarded – undo
1353 1353 
              * @param string $uploads_url The server upload directory url.
1354 1354 
              * @param string $uploads_baseurl The uploads dir base url.
1355 1355 
              */
1356 
-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1357 
-            $img_arr['path'] = $uploads_path . '/' . $file_name;
1356 
+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
1357 
+            $img_arr['path'] = $uploads_path.'/'.$file_name;
1358 1358 
             $width = 0;
1359 1359 
             $height = 0;
1360 1360 
             if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1397,7 +1397,7 @@  discard block
 
 block discarded – undo
1397 1397 
                 $file_name = $file_info['basename'];
1398 1398
1399 1399 
                 $img_arr['src'] = $default_img;
1400 
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
1400 
+                $img_arr['path'] = $uploads_path.'/'.$file_name;
1401 1401
1402 1402 
                 $width = 0;
1403 1403 
                 $height = 0;

@@ -1414,7 +1414,7 @@  discard block
 
 block discarded – undo
1414 1414 
         }
1415 1415
1416 1416 
         if (!empty($img_arr))
1417 
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
1417 
+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );
1418 1418 
         else
1419 1419 
             return false;
1420 1420 
     }

@@ -1477,7 +1477,7 @@  discard block
 
 block discarded – undo
1477 1477
1478 1478 
         $arrImages = $wpdb->get_results(
1479 1479 
             $wpdb->prepare(
1480 
-                "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 ",
1480 
+                "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 ",
1481 1481 
                 array('%image%', $post_id)
1482 1482 
             )
1483 1483 
         );

@@ -1503,7 +1503,7 @@  discard block
 
 block discarded – undo
1503 1503
1504 1504 
                 $file_name = $file_info['basename'];
1505 1505
1506 
-                $uploads_url = $uploads_baseurl . $sub_dir;
1506 
+                $uploads_url = $uploads_baseurl.$sub_dir;
1507 1507 
                 /*
1508 1508 
                 * Allows the filter of image src for such things as CDN change.
1509 1509 
                 *

@@ -1513,8 +1513,8 @@  discard block
 
 block discarded – undo
1513 1513 
                 * @param string $uploads_url The server upload directory url.
1514 1514 
                 * @param string $uploads_baseurl The uploads dir base url.
1515 1515 
                 */
1516 
-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
1517 
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
1516 
+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
1517 
+                $img_arr['path'] = $uploads_path.'/'.$file_name;
1518 1518 
                 $width = 0;
1519 1519 
                 $height = 0;
1520 1520 
                 if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1531,7 +1531,7 @@  discard block
 
 block discarded – undo
1531 1531 
                 $img_arr['content'] = $attechment->content; // add the description to the array
1532 1532 
                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
1533 1533
1534 
-                $return_arr[] = (object)$img_arr;
1534 
+                $return_arr[] = (object) $img_arr;
1535 1535
1536 1536 
                 $counter++;
1537 1537 
             }

@@ -1542,7 +1542,7 @@  discard block
 
 block discarded – undo
1542 1542 
              * @since 1.6.20
1543 1543 
              * @param array $return_arr The array of image objects.
1544 1544 
              */
1545 
-            return apply_filters('geodir_get_images_arr',$return_arr);
1545 
+            return apply_filters('geodir_get_images_arr', $return_arr);
1546 1546 
         } else if ($no_images) {
1547 1547 
             $default_img = '';
1548 1548 
             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

@@ -1581,7 +1581,7 @@  discard block
 
 block discarded – undo
1581 1581 
                 $img_arr['title'] = $file_info['filename']; // add the title to the array
1582 1582 
                 $img_arr['content'] = $file_info['filename']; // add the description to the array
1583 1583
1584 
-                $return_arr[] = (object)$img_arr;
1584 
+                $return_arr[] = (object) $img_arr;
1585 1585
1586 1586 
                 /**
1587 1587 
                  * Filter the images array so things can be changed.

@@ -1589,7 +1589,7 @@  discard block
 
 block discarded – undo
1589 1589 
                  * @since 1.6.20
1590 1590 
                  * @param array $return_arr The array of image objects.
1591 1591 
                  */
1592 
-                return apply_filters('geodir_get_images_arr',$return_arr);
1592 
+                return apply_filters('geodir_get_images_arr', $return_arr);
1593 1593 
             } else
1594 1594 
                 return false;
1595 1595 
         }

@@ -1614,8 +1614,8 @@  discard block
 
 block discarded – undo
1614 1614
1615 1615 
         $html = '';
1616 1616 
         if (!empty($request)) {
1617 
-            if (!is_object($request)){
1618 
-                $request = (object)$request;
1617 
+            if (!is_object($request)) {
1618 
+                $request = (object) $request;
1619 1619 
             }
1620 1620
1621 1621 
             if (isset($request->src) && !isset($request->path)) {

@@ -1629,7 +1629,7 @@  discard block
 
 block discarded – undo
1629 1629 
             $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
1630 1630 
             $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
1631 1631 
             if (strpos($img_no_http, $upload_no_http) !== false) {
1632 
-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
1632 
+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);
1633 1633 
             }
1634 1634
1635 1635 
             $width = 0;

@@ -1646,7 +1646,7 @@  discard block
 
 block discarded – undo
1646 1646 
             $image->height = $height;
1647 1647 
             $image->title = isset($request->title) ? $request->title : '';
1648 1648
1649 
-            $max_size = (object)geodir_get_imagesize($size);
1649 
+            $max_size = (object) geodir_get_imagesize($size);
1650 1650
1651 1651 
             if (!is_wp_error($max_size)) {
1652 1652 
                 if ($image->width) {

@@ -1658,13 +1658,13 @@  discard block
 
 block discarded – undo
1658 1658 
                         $width_per = 100;
1659 1659 
                 }
1660 1660
1661 
-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
1662 
-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
1661 
+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {
1662 
+                    $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'"  /></div>';
1663 1663 
                 } else {
1664 
-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
1665 
-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
1666 
-                    }else{
1667 
-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
1664 
+                    if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {
1665 
+                        $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
1666 
+                    } else {
1667 
+                        $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
1668 1668 
                     }
1669 1669
1670 1670 
                 }

@@ -1699,15 +1699,15 @@  discard block
 
 block discarded – undo
1699 1699
1700 1700 
         $post_type = get_post_type($post_id);
1701 1701
1702 
-        $table = $plugin_prefix . $post_type . '_detail';
1702 
+        $table = $plugin_prefix.$post_type.'_detail';
1703 1703
1704 1704 
         if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
1705 1705
1706 
-            if ($taxonomy == $post_type . '_tags') {
1706 
+            if ($taxonomy == $post_type.'_tags') {
1707 1707 
                 if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
1708 1708 
                     geodir_save_post_meta($post_id, 'post_tags', $terms);
1709 1709 
                 }
1710 
-            } elseif ($taxonomy == $post_type . 'category') {
1710 
+            } elseif ($taxonomy == $post_type.'category') {
1711 1711 
                 $srcharr = array('"', '\\');
1712 1712 
                 $replarr = array("&quot;", '');
1713 1713 
 

@@ -1729,7 +1729,7 @@  discard block
 
 block discarded – undo
1729 1729
1730 1730 
                     $wpdb->get_var(
1731 1731 
                         $wpdb->prepare(
1732 
-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
1732 
+                            "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ",
1733 1733 
                             $cat_ids_array_del
1734 1734 
                         )
1735 1735 
                     );

@@ -1737,7 +1737,7 @@  discard block
 
 block discarded – undo
1737 1737
1738 1738 
                     $post_term = $wpdb->get_col(
1739 1739 
                         $wpdb->prepare(
1740 
-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
1740 
+                            "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id",
1741 1741 
                             $cat_ids_array
1742 1742 
                         )
1743 1743 
                     );

@@ -1759,16 +1759,16 @@  discard block
 
 block discarded – undo
1759 1759 
                         $lat = geodir_get_post_meta($post_id, 'post_latitude', true);
1760 1760 
                         $lng = geodir_get_post_meta($post_id, 'post_longitude', true);
1761 1761
1762 
-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
1763 
-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
1762 
+                        $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
1763 
+                        $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true);
1764 1764
1765 1765 
                         $json = '{';
1766 
-                        $json .= '"id":"' . $post_id . '",';
1767 
-                        $json .= '"lat_pos": "' . $lat . '",';
1768 
-                        $json .= '"long_pos": "' . $lng . '",';
1769 
-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
1770 
-                        $json .= '"icon":"' . $term_icon . '",';
1771 
-                        $json .= '"group":"catgroup' . $cat_id . '"';
1766 
+                        $json .= '"id":"'.$post_id.'",';
1767 
+                        $json .= '"lat_pos": "'.$lat.'",';
1768 
+                        $json .= '"long_pos": "'.$lng.'",';
1769 
+                        $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",';
1770 
+                        $json .= '"icon":"'.$term_icon.'",';
1771 
+                        $json .= '"group":"catgroup'.$cat_id.'"';
1772 1772 
                         $json .= '}';
1773 1773
1774 1774 
 

@@ -1776,9 +1776,9 @@  discard block
 
 block discarded – undo
1776 1776 
                             $post_marker_json = $json;
1777 1777
1778 1778
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)))) {
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)))) {
1780 1780
1781 
-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
1781 
+                            $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET
1782 1782 
 										post_title = %s,
1783 1783 
 										json = %s
1784 1784 
 										WHERE post_id = %d AND cat_id = %d ",

@@ -1786,7 +1786,7 @@  discard block
 
 block discarded – undo
1786 1786
1787 1787 
                         } else {
1788 1788
1789 
-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
1789 
+                            $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET
1790 1790 
 										post_id = %d,
1791 1791 
 										post_title = %s,
1792 1792 
 										cat_id = %d,

@@ -1804,17 +1804,17 @@  discard block
 
 block discarded – undo
1804 1804 
                 if (!empty($post_term) && is_array($post_term)) {
1805 1805 
                     $categories = implode(',', $post_term);
1806 1806
1807 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
1807 
+                    if ($categories != '' && $categories != 0) $categories = ','.$categories.',';
1808 1808
1809 1809 
                     if (empty($post_marker_json))
1810 1810 
                         $post_marker_json = isset($json) ? $json : '';
1811 1811
1812 
-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
1812 
+                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
1813 1813
1814 1814 
                         $wpdb->query(
1815 1815 
                             $wpdb->prepare(
1816 
-                                "UPDATE " . $table . " SET
1817 
-								" . $taxonomy . " = %s,
1816 
+                                "UPDATE ".$table." SET
1817 
+								" . $taxonomy." = %s,
1818 1818 
 								marker_json = %s
1819 1819 
 								where post_id = %d",
1820 1820 
                                 array($categories, $post_marker_json, $post_id)

@@ -1835,7 +1835,7 @@  discard block
 
 block discarded – undo
1835 1835
1836 1836 
                                     $wpdb->query(
1837 1837 
                                         $wpdb->prepare(
1838 
-                                            "UPDATE " . $table . " SET
1838 
+                                            "UPDATE ".$table." SET
1839 1839 
 											default_category = %s
1840 1840 
 											where post_id = %d",
1841 1841 
                                             array($categories[0], $post_id)

@@ -1860,9 +1860,9 @@  discard block
 
 block discarded – undo
1860 1860
1861 1861 
                         $wpdb->query(
1862 1862 
                             $wpdb->prepare(
1863 
-                                "INSERT INTO " . $table . " SET
1863 
+                                "INSERT INTO ".$table." SET
1864 1864 
 								post_id = %d,
1865 
-								" . $taxonomy . " = %s,
1865 
+								" . $taxonomy." = %s,
1866 1866 
 								marker_json = %s ",
1867 1867
1868 1868 
                                 array($post_id, $categories, $post_marker_json)

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

@@ -2002,7 +2002,7 @@  discard block
 
 block discarded – undo
2002 2002 
                                 ?>
2003 2003 
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
2004 2004 
                             <?php
2005 
-                            }else{
2005 
+                            } else {
2006 2006 
                                 echo '<div class="geodir-bubble_image"></div>';
2007 2007 
                             }
2008 2008 
                         }

@@ -2032,7 +2032,7 @@  discard block
 
 block discarded – undo
2032 2032 
                              * @param object $postinfo_obj The posts info as an object.
2033 2033 
                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
2034 2034 
                              */
2035 
-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
2035 
+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);
2036 2036 
                             ?>
2037 2037 
                         </div>
2038 2038 
                         <?php

@@ -2042,9 +2042,9 @@  discard block
 
 block discarded – undo
2042 2042 
                             <div class="geodir-bubble-meta-fade"></div>
2043 2043 
                             <div class="geodir-bubble-meta-bottom">
2044 2044 
                                 <?php if ($rating_star != '') { ?>
2045 
-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>
2045 
+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>
2046 2046 
                                 <?php } ?>
2047 
-                                <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>
2047 
+                                <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>
2048 2048 
                                 <span class="geodir-bubble-reviews">
2049 2049 
                                     <a href="<?php echo get_comments_link($ID); ?>" class="geodir-pcomments"><i class="fa fa-comments"></i> <?php echo get_comments_number($ID); ?></a>
2050 2050 
                                 </span>

@@ -2106,11 +2106,11 @@  discard block
 
 block discarded – undo
2106 2106
2107 2107 
         $post_type = get_post_type($post_id);
2108 2108
2109 
-        $table = $plugin_prefix . $post_type . '_detail';
2109 
+        $table = $plugin_prefix.$post_type.'_detail';
2110 2110
2111 2111 
         $wpdb->query(
2112 2112 
             $wpdb->prepare(
2113 
-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
2113 
+                "UPDATE ".$table." SET post_status=%s WHERE post_id=%d",
2114 2114 
                 array($status, $post_id)
2115 2115 
             )
2116 2116 
         );

@@ -2182,18 +2182,18 @@  discard block
 
 block discarded – undo
2182 2182
2183 2183 
         $post_type = get_post_type($post_id);
2184 2184
2185 
-        $table = $plugin_prefix . $post_type . '_detail';
2185 
+        $table = $plugin_prefix.$post_type.'_detail';
2186 2186
2187 2187 
         $wpdb->query(
2188 2188 
             $wpdb->prepare(
2189 
-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
2189 
+                "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d",
2190 2190 
                 array($updatingpost, $temppost)
2191 2191 
             )
2192 2192 
         );
2193 2193
2194 2194 
         $wpdb->query(
2195 2195 
             $wpdb->prepare(
2196 
-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2196 
+                "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d",
2197 2197 
                 array($updatingpost, $temppost)
2198 2198 
             )
2199 2199 
         );

@@ -2202,7 +2202,7 @@  discard block
 
 block discarded – undo
2202 2202
2203 2203 
         $wpdb->query(
2204 2204 
             $wpdb->prepare(
2205 
-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
2205 
+                "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d",
2206 2206 
                 array($updatingpost, $temppost)
2207 2207 
             )
2208 2208 
         );

@@ -2240,12 +2240,12 @@  discard block
 
 block discarded – undo
2240 2240 
         if (!in_array($post_type, $all_postypes))
2241 2241 
             return false;
2242 2242
2243 
-        $table = $plugin_prefix . $post_type . '_detail';
2243 
+        $table = $plugin_prefix.$post_type.'_detail';
2244 2244
2245 2245 
         /* Delete custom post meta*/
2246 2246 
         $wpdb->query(
2247 2247 
             $wpdb->prepare(
2248 
-                "DELETE FROM " . $table . " WHERE `post_id` = %d",
2248 
+                "DELETE FROM ".$table." WHERE `post_id` = %d",
2249 2249 
                 array($deleted_postid)
2250 2250 
             )
2251 2251 
         );

@@ -2254,7 +2254,7 @@  discard block
 
 block discarded – undo
2254 2254
2255 2255 
         $wpdb->query(
2256 2256 
             $wpdb->prepare(
2257 
-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
2257 
+                "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d",
2258 2258 
                 array($deleted_postid)
2259 2259 
             )
2260 2260 
         );

@@ -2264,7 +2264,7 @@  discard block
 
 block discarded – undo
2264 2264
2265 2265 
         $wpdb->query(
2266 2266 
             $wpdb->prepare(
2267 
-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
2267 
+                "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d",
2268 2268 
                 array($deleted_postid)
2269 2269 
             )
2270 2270 
         );

@@ -2336,7 +2336,7 @@  discard block
 
 block discarded – undo
2336 2336 
          */
2337 2337 
         do_action('geodir_before_add_from_favorite', $post_id);
2338 2338
2339 
-        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>';
2339 
+        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>';
2340 2340
2341 2341 
         /**
2342 2342 
          * Called after adding the post from favourites.

@@ -2415,7 +2415,7 @@  discard block
 
 block discarded – undo
2415 2415 
          */
2416 2416 
         do_action('geodir_before_remove_from_favorite', $post_id);
2417 2417
2418 
-        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>';
2418 
+        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>';
2419 2419
2420 2420 
         /**
2421 2421 
          * Called after removing the post from favourites.

@@ -2510,24 +2510,24 @@  discard block
 
 block discarded – undo
2510 2510 
             $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2511 2511
2512 2512 
         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
2513 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
2513 
+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a
2514 2514 
                 class="geodir-removetofav-icon" href="javascript:void(0);"
2515 
-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"
2516 
-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>
2515 
+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"
2516 
+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>
2517 2517 
             </a>   </span><?php
2518 2518
2519 2519 
         } else {
2520 2520
2521 2521 
             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
2522 
-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
2522 
+                $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\'';
2523 2523 
             } else
2524 
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2524 
+                $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';
2525 2525
2526 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
2526 
+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"
2527 2527 
                                                                                         href="javascript:void(0);"
2528 
-                                                                                        onclick="<?php echo $script_text;?>"
2529 
-                                                                                        title="<?php echo $add_favourite_text;?>"><i
2530 
-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>
2528 
+                                                                                        onclick="<?php echo $script_text; ?>"
2529 
+                                                                                        title="<?php echo $add_favourite_text; ?>"><i
2530 
+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>
2531 2531 
         <?php }
2532 2532 
     }
2533 2533 
 }

@@ -2557,7 +2557,7 @@  discard block
 
 block discarded – undo
2557 2557
2558 2558 
             $post_type = $taxonomy_obj->object_type[0];
2559 2559
2560 
-            $table = $plugin_prefix . $post_type . '_detail';
2560 
+            $table = $plugin_prefix.$post_type.'_detail';
2561 2561
2562 2562 
             /**
2563 2563 
              * Filter to modify the 'join' query

@@ -2580,8 +2580,8 @@  discard block
 
 block discarded – undo
2580 2580 
             $where = apply_filters('geodir_cat_post_count_where', $where, $term);
2581 2581
2582 2582 
             $count_query = "SELECT count(post_id) FROM
2583 
-							" . $table . " as pd " . $join . "
2584 
-							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
2583 
+							" . $table." as pd ".$join."
2584 
+							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;
2585 2585
2586 2586 
             $cat_post_count = $wpdb->get_var($count_query);
2587 2587 
             if (empty($cat_post_count) || is_wp_error($cat_post_count))

@@ -2664,7 +2664,7 @@  discard block
 
 block discarded – undo
2664 2664 
     global $post;
2665 2665 
     $all_postypes = geodir_get_posttypes();
2666 2666 
     if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
2667 
-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';
2667 
+        return ' <a href="'.get_permalink($post->ID).'">'.READ_MORE_TXT.'</a>';
2668 2668 
     }
2669 2669
2670 2670 
     return $more;

@@ -2691,14 +2691,14 @@  discard block
 
 block discarded – undo
2691 2691 
     if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
2692 2692
2693 2693 
         $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
2694 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
2694 
+        $table = $plugin_prefix.$geodir_post_type.'_detail';
2695 2695
2696 2696 
         $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
2697 
-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
2697 
+        $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png';
2698 2698
2699 2699 
         $posts = $wpdb->get_results(
2700 2700 
             $wpdb->prepare(
2701 
-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
2701 
+                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ",
2702 2702 
                 array($term_id, $taxonomy)
2703 2703 
             )
2704 2704 
         );

@@ -2710,19 +2710,19 @@  discard block
 
 block discarded – undo
2710 2710 
                 $lng = $post_obj->post_longitude;
2711 2711
2712 2712 
                 $json = '{';
2713 
-                $json .= '"id":"' . $post_obj->post_id . '",';
2714 
-                $json .= '"lat_pos": "' . $lat . '",';
2715 
-                $json .= '"long_pos": "' . $lng . '",';
2716 
-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
2717 
-                $json .= '"icon":"' . $term_icon . '",';
2718 
-                $json .= '"group":"catgroup' . $term_id . '"';
2713 
+                $json .= '"id":"'.$post_obj->post_id.'",';
2714 
+                $json .= '"lat_pos": "'.$lat.'",';
2715 
+                $json .= '"long_pos": "'.$lng.'",';
2716 
+                $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",';
2717 
+                $json .= '"icon":"'.$term_icon.'",';
2718 
+                $json .= '"group":"catgroup'.$term_id.'"';
2719 2719 
                 $json .= '}';
2720 2720
2721 2721 
                 if ($post_obj->default_category == $term_id) {
2722 2722
2723 2723 
                     $wpdb->query(
2724 2724 
                         $wpdb->prepare(
2725 
-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",
2725 
+                            "UPDATE ".$table." SET marker_json = %s where post_id = %d",
2726 2726 
                             array($json, $post_obj->post_id)
2727 2727 
                         )
2728 2728 
                     );

@@ -2730,7 +2730,7 @@  discard block
 
 block discarded – undo
2730 2730
2731 2731 
                 $wpdb->query(
2732 2732 
                     $wpdb->prepare(
2733 
-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
2733 
+                        "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d",
2734 2734 
                         array($json, $post_obj->post_id, $term_id)
2735 2735 
                     )
2736 2736 
                 );

@@ -2854,7 +2854,7 @@  discard block
 
 block discarded – undo
2854 2854 
 //	print_r($uploads ) ;
2855 2855 
     $post_first_image = $wpdb->get_results(
2856 2856 
         $wpdb->prepare(
2857 
-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
2857 
+            "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1  ", array($post_id)
2858 2858 
         )
2859 2859 
     );
2860 2860 
 

@@ -2875,9 +2875,9 @@  discard block
 
 block discarded – undo
2875 2875
2876 2876 
         $post_type = get_post_type($post_id);
2877 2877
2878 
-        $table_name = $plugin_prefix . $post_type . '_detail';
2878 
+        $table_name = $plugin_prefix.$post_type.'_detail';
2879 2879
2880 
-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
2880 
+        $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);
2881 2881
2882 2882 
         $new_attachment_name = basename($post_first_image[0]->file);
2883 2883 
 

@@ -2890,11 +2890,11 @@  discard block
 
 block discarded – undo
2890 2890 
                 wp_delete_attachment($post_thumbnail_id);
2891 2891
2892 2892 
             }
2893 
-            $filename = $uploads['basedir'] . $post_first_image[0]->file;
2893 
+            $filename = $uploads['basedir'].$post_first_image[0]->file;
2894 2894
2895 2895 
             $attachment = array(
2896 2896 
                 'post_mime_type' => $post_first_image[0]->mime_type,
2897 
-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
2897 
+                'guid' => $uploads['baseurl'].$post_first_image[0]->file,
2898 2898 
                 'post_parent' => $post_id,
2899 2899 
                 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
2900 2900 
                 'post_content' => ''

@@ -2907,7 +2907,7 @@  discard block
 
 block discarded – undo
2907 2907
2908 2908 
                 set_post_thumbnail($post_id, $id);
2909 2909
2910 
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
2910 
+                require_once(ABSPATH.'wp-admin/includes/image.php');
2911 2911 
                 wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
2912 2912
2913 2913 
             }

@@ -2940,35 +2940,35 @@  discard block
 
 block discarded – undo
2940 2940 
         $post_id = absint($_POST['post_id']);
2941 2941 
         $upload_dir = wp_upload_dir();
2942 2942 
         $post_type = get_post_type($_POST['post_id']);
2943 
-        $table = $plugin_prefix . $post_type . '_detail';
2943 
+        $table = $plugin_prefix.$post_type.'_detail';
2944 2944
2945 2945 
         $post_arr = $wpdb->get_results($wpdb->prepare(
2946 
-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2946 
+            "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
2947 2947 
             array($post_id)
2948 2948 
         )
2949 2949 
             , ARRAY_A);
2950 2950
2951 2951 
         $arrImages = $wpdb->get_results(
2952 2952 
             $wpdb->prepare(
2953 
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2953 
+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
2954 2954 
                 array('%image%', $post_id)
2955 2955 
             )
2956 2956 
         );
2957 2957 
         if ($arrImages) {
2958 2958 
             $image_arr = array();
2959 2959 
             foreach ($arrImages as $img) {
2960 
-                $image_arr[] = $upload_dir['baseurl'] . $img->file;
2960 
+                $image_arr[] = $upload_dir['baseurl'].$img->file;
2961 2961 
             }
2962 2962 
             $comma_separated = implode(",", $image_arr);
2963 2963 
             $post_arr[0]['post_images'] = $comma_separated;
2964 2964 
         }
2965 2965
2966 2966
2967 
-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
2967 
+        $cats = $post_arr[0][$post_arr[0]['post_type'].'category'];
2968 2968 
         $cat_arr = array_filter(explode(",", $cats));
2969 2969 
         $trans_cat = array();
2970 2970 
         foreach ($cat_arr as $cat) {
2971 
-            $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
2971 
+            $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'].'category', false);
2972 2972 
         }
2973 2973
2974 2974 
 

@@ -3010,7 +3010,7 @@  discard block
 
 block discarded – undo
3010 3010
3011 3011 
     $get_data = $wpdb->get_results(
3012 3012 
         $wpdb->prepare(
3013 
-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
3013 
+            "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'",
3014 3014 
             array($listing_type)
3015 3015 
         )
3016 3016 
     );

@@ -3023,12 +3023,12 @@  discard block
 
 block discarded – undo
3023 3023
3024 3024 
                 $extra_fields = unserialize($data->extra_fields);
3025 3025
3026 
-                $prefix = $data->htmlvar_name . '_';
3026 
+                $prefix = $data->htmlvar_name.'_';
3027 3027
3028 
-                $fields_info[$prefix . 'address'] = $data->field_type;
3028 
+                $fields_info[$prefix.'address'] = $data->field_type;
3029 3029
3030 3030 
                 if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3031 
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
3031 
+                    $fields_info[$prefix.'zip'] = $data->field_type;
3032 3032
3033 3033 
             } else {
3034 3034 
 

@@ -3127,18 +3127,18 @@  discard block
 
 block discarded – undo
3127 3127 
  * @since 1.6.22 Added image from location page.
3128 3128 
  * @package GeoDirectory
3129 3129 
  */
3130 
-function geodir_fb_like_thumbnail(){
3130 
+function geodir_fb_like_thumbnail() {
3131 3131
3132 3132 
     $facebook_image = '';
3133 3133
3134 
-    if(is_single()){// single post
3134 
+    if (is_single()) {// single post
3135 3135 
         global $post;
3136 
-        if(isset($post->featured_image) && $post->featured_image){
3136 
+        if (isset($post->featured_image) && $post->featured_image) {
3137 3137 
             $upload_dir = wp_upload_dir();
3138 3138 
             $facebook_image = $upload_dir['baseurl'].$post->featured_image;
3139 3139
3140 3140 
         }
3141 
-    }elseif(geodir_is_page('location')){// location page
3141 
+    }elseif (geodir_is_page('location')) {// location page
3142 3142 
         if (function_exists('geodir_get_location_seo')) {
3143 3143 
             $seo = geodir_get_location_seo();
3144 3144 
             if (isset($seo->seo_image) && $seo->seo_image) {

@@ -3147,11 +3147,11 @@  discard block
 
 block discarded – undo
3147 3147 
             }
3148 3148 
         }
3149 3149
3150 
-        if(!$facebook_image){
3150 
+        if (!$facebook_image) {
3151 3151 
             global $post;
3152 3152
3153 
-            if (has_post_thumbnail( $post->ID ) ){
3154 
-                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
3153 
+            if (has_post_thumbnail($post->ID)) {
3154 
+                $image = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), 'full');
3155 3155 
                 $facebook_image = isset($image[0]) ? $image[0] : '';
3156 3156 
             }
3157 3157 
         }

@@ -3164,9 +3164,9 @@  discard block
 
 block discarded – undo
3164 3164 
      * @since 1.6.22
3165 3165 
      * @param string $facebook_image The image URL or blank.
3166 3166 
      */
3167 
-    $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
3167 
+    $facebook_image = apply_filters('geodir_fb_share_image', $facebook_image);
3168 3168
3169 
-    if($facebook_image){
3169 
+    if ($facebook_image) {
3170 3170 
         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
3171 3171 
     }
3172 3172
Please login to merge, or discard this patch.
Braces   +169 added lines, -120 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 
 

@@ -1046,7 +1059,7 @@  discard block
 
 block discarded – undo
1046 1059 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {
1047 1060 
                                 $new_name = basename($uploaded['file']);
1048 1061 
                                 $uploaded_file = $uploaded;
1049 
-                            }else{
1062 
+                            } else{
1050 1063 
                                 print_r($uploaded);exit;
1051 1064 
                             }
1052 1065 
                             $external_img = false;

@@ -1071,8 +1084,9 @@  discard block
 
 block discarded – undo
1071 1084 
                                 $file_path = $curr_img_dir . '/' . $filename;
1072 1085 
                             }
1073 1086
1074 
-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
1075 
-                                unlink($img_path);
1087 
+                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) {
1088 
+                                                            unlink($img_path);
1089 
+                            }
1076 1090 
                         }
1077 1091
1078 1092 
                         if (!empty($uploaded_file)) {

@@ -1101,8 +1115,9 @@  discard block
 
 block discarded – undo
1101 1115 
                             $attachment_set = '';
1102 1116
1103 1117 
                             foreach ($attachment as $key => $val) {
1104 
-                                if ($val != '')
1105 
-                                    $attachment_set .= $key . " = '" . $val . "', ";
1118 
+                                if ($val != '') {
1119 
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
1120 
+                                }
1106 1121 
                             }
1107 1122
1108 1123 
                             $attachment_set = trim($attachment_set, ", ");

@@ -1127,8 +1142,9 @@  discard block
 
 block discarded – undo
1127 1142 
                         )
1128 1143 
                     );
1129 1144
1130 
-                    if ($menu_order == 1)
1131 
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1145 
+                    if ($menu_order == 1) {
1146 
+                                            $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
1147 
+                    }
1132 1148
1133 1149 
                 }
1134 1150 
 

@@ -1169,8 +1185,9 @@  discard block
 
 block discarded – undo
1169 1185
1170 1186 
         $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
1171 1187
1172 
-        if (!empty($invalid_files))
1173 
-            geodir_remove_attachments($invalid_files);
1188 
+        if (!empty($invalid_files)) {
1189 
+                    geodir_remove_attachments($invalid_files);
1190 
+        }
1174 1191 
     }
1175 1192
1176 1193 
 }

@@ -1223,16 +1240,19 @@  discard block
 
 block discarded – undo
1223 1240 
 function geodir_delete_directory($dirname)
1224 1241 
 {
1225 1242 
     $dir_handle = '';
1226 
-    if (is_dir($dirname))
1227 
-        $dir_handle = opendir($dirname);
1228 
-    if (!$dir_handle)
1229 
-        return false;
1243 
+    if (is_dir($dirname)) {
1244 
+            $dir_handle = opendir($dirname);
1245 
+    }
1246 
+    if (!$dir_handle) {
1247 
+            return false;
1248 
+    }
1230 1249 
     while ($file = readdir($dir_handle)) {
1231 1250 
         if ($file != "." && $file != "..") {
1232 
-            if (!is_dir($dirname . "/" . $file))
1233 
-                unlink($dirname . "/" . $file);
1234 
-            else
1235 
-                geodir_delete_directory($dirname . '/' . $file);
1251 
+            if (!is_dir($dirname . "/" . $file)) {
1252 
+                            unlink($dirname . "/" . $file);
1253 
+            } else {
1254 
+                            geodir_delete_directory($dirname . '/' . $file);
1255 
+            }
1236 1256 
         }
1237 1257 
     }
1238 1258 
     closedir($dir_handle);

@@ -1261,8 +1281,9 @@  discard block
 
 block discarded – undo
1261 1281 
             foreach ($postcurr_images as $postimg) {
1262 1282 
                 $image_name_arr = explode('/', $postimg->src);
1263 1283 
                 $filename = end($image_name_arr);
1264 
-                if (file_exists($uploads_dir . '/' . $filename))
1265 
-                    unlink($uploads_dir . '/' . $filename);
1284 
+                if (file_exists($uploads_dir . '/' . $filename)) {
1285 
+                                    unlink($uploads_dir . '/' . $filename);
1286 
+                }
1266 1287 
             }
1267 1288
1268 1289 
         } // endif

@@ -1379,9 +1400,9 @@  discard block
 
 block discarded – undo
1379 1400 
                 $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1380 1401 
             }
1381 1402
1382 
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1383 
-                $default_img = $default_catimg['src'];
1384 
-            elseif ($no_image) {
1403 
+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
1404 
+                            $default_img = $default_catimg['src'];
1405 
+            } elseif ($no_image) {
1385 1406 
                 $default_img = get_option('geodir_listing_no_img');
1386 1407 
             }
1387 1408 
 

@@ -1413,10 +1434,13 @@  discard block
 
 block discarded – undo
1413 1434 
             }
1414 1435 
         }
1415 1436
1416 
-        if (!empty($img_arr))
1417 
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
1418 
-        else
1419 
-            return false;
1437 
+        if (!empty($img_arr)) {
1438 
+                    return (object)$img_arr;
1439 
+        }
1440 
+        //return (object)array( 'src' => $file_url, 'path' => $file_path );
1441 
+        else {
1442 
+                    return false;
1443 
+        }
1420 1444 
     }
1421 1445 
 }
1422 1446 
 

@@ -1443,8 +1467,9 @@  discard block
 
 block discarded – undo
1443 1467 
             echo $html;
1444 1468 
         } elseif (!empty($html)) {
1445 1469 
             return $html;
1446 
-        } else
1447 
-            return false;
1470 
+        } else {
1471 
+                    return false;
1472 
+        }
1448 1473 
     }
1449 1474 
 }
1450 1475 
 

@@ -1472,8 +1497,9 @@  discard block
 
 block discarded – undo
1472 1497 
         }
1473 1498 
         $not_featured = '';
1474 1499 
         $sub_dir = '';
1475 
-        if (!$add_featured)
1476 
-            $not_featured = " AND is_featured = 0 ";
1500 
+        if (!$add_featured) {
1501 
+                    $not_featured = " AND is_featured = 0 ";
1502 
+        }
1477 1503
1478 1504 
         $arrImages = $wpdb->get_results(
1479 1505 
             $wpdb->prepare(

@@ -1494,8 +1520,9 @@  discard block
 
 block discarded – undo
1494 1520
1495 1521 
                 $file_info = pathinfo($attechment->file);
1496 1522
1497 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
1498 
-                    $sub_dir = stripslashes_deep($file_info['dirname']);
1523 
+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
1524 
+                                    $sub_dir = stripslashes_deep($file_info['dirname']);
1525 
+                }
1499 1526
1500 1527 
                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
1501 1528 
                 $uploads_baseurl = $uploads['baseurl'];

@@ -1547,9 +1574,9 @@  discard block
 
 block discarded – undo
1547 1574 
             $default_img = '';
1548 1575 
             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
1549 1576 
             $post_type = get_post_type($post_id);
1550 
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
1551 
-                $default_img = $default_catimg['src'];
1552 
-            elseif ($no_images) {
1577 
+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
1578 
+                            $default_img = $default_catimg['src'];
1579 
+            } elseif ($no_images) {
1553 1580 
                 $default_img = get_option('geodir_listing_no_img');
1554 1581 
             }
1555 1582 
 

@@ -1590,8 +1617,9 @@  discard block
 
 block discarded – undo
1590 1617 
                  * @param array $return_arr The array of image objects.
1591 1618 
                  */
1592 1619 
                 return apply_filters('geodir_get_images_arr',$return_arr);
1593 
-            } else
1594 
-                return false;
1620 
+            } else {
1621 
+                            return false;
1622 
+            }
1595 1623 
         }
1596 1624 
     }
1597 1625 
 }

@@ -1654,8 +1682,9 @@  discard block
 
 block discarded – undo
1654 1682 
                         $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);
1655 1683 
                     } else if ($image->width < ($max_size->h)) {
1656 1684 
                         $width_per = round((($image->width / $max_size->w) * 100), 2);
1657 
-                    } else
1658 
-                        $width_per = 100;
1685 
+                    } else {
1686 
+                                            $width_per = 100;
1687 
+                    }
1659 1688 
                 }
1660 1689
1661 1690 
                 if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

@@ -1663,7 +1692,7 @@  discard block
 
 block discarded – undo
1663 1692 
                 } else {
1664 1693 
                     if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
1665 1694 
                         $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
1666 
-                    }else{
1695 
+                    } else{
1667 1696 
                         $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
1668 1697 
                     }
1669 1698 
 

@@ -1675,8 +1704,9 @@  discard block
 
 block discarded – undo
1675 1704 
             echo $html;
1676 1705 
         } elseif (!empty($html)) {
1677 1706 
             return $html;
1678 
-        } else
1679 
-            return false;
1707 
+        } else {
1708 
+                    return false;
1709 
+        }
1680 1710 
     }
1681 1711 
 }
1682 1712 
 

@@ -1714,8 +1744,9 @@  discard block
 
 block discarded – undo
1714 1744 
                 $post_obj = get_post($post_id);
1715 1745
1716 1746 
                 $cat_ids = array('0');
1717 
-                if (is_array($tt_ids))
1718 
-                    $cat_ids = $tt_ids;
1747 
+                if (is_array($tt_ids)) {
1748 
+                                    $cat_ids = $tt_ids;
1749 
+                }
1719 1750
1720 1751
1721 1752 
                 if (!empty($cat_ids)) {

@@ -1772,8 +1803,9 @@  discard block
 
 block discarded – undo
1772 1803 
                         $json .= '}';
1773 1804
1774 1805
1775 
-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))
1776 
-                            $post_marker_json = $json;
1806 
+                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) {
1807 
+                                                    $post_marker_json = $json;
1808 
+                        }
1777 1809
1778 1810
1779 1811 
                         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)))) {

@@ -1804,10 +1836,13 @@  discard block
 
 block discarded – undo
1804 1836 
                 if (!empty($post_term) && is_array($post_term)) {
1805 1837 
                     $categories = implode(',', $post_term);
1806 1838
1807 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
1839 
+                    if ($categories != '' && $categories != 0) {
1840 
+                    	$categories = ',' . $categories . ',';
1841 
+                    }
1808 1842
1809 
-                    if (empty($post_marker_json))
1810 
-                        $post_marker_json = isset($json) ? $json : '';
1843 
+                    if (empty($post_marker_json)) {
1844 
+                                            $post_marker_json = isset($json) ? $json : '';
1845 
+                    }
1811 1846
1812 1847 
                     if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
1813 1848 
 

@@ -1846,8 +1881,9 @@  discard block
 
 block discarded – undo
1846 1881
1847 1882 
                                 }
1848 1883
1849 
-                                if ($default_category == '')
1850 
-                                    $default_category = $categories[0];
1884 
+                                if ($default_category == '') {
1885 
+                                                                    $default_category = $categories[0];
1886 
+                                }
1851 1887
1852 1888 
                                 geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');
1853 1889 
 

@@ -1994,7 +2030,7 @@  discard block
 
 block discarded – undo
1994 2030 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"
1995 2031 
                                                src="<?php echo $post_images[0]; ?>"/></a></div>
1996 2032 
                             <?php
1997 
-                            }else{
2033 
+                            } else{
1998 2034 
                                 echo '<div class="geodir-bubble_image"></div>';
1999 2035 
                             }
2000 2036 
                         } else {

@@ -2002,7 +2038,7 @@  discard block
 
 block discarded – undo
2002 2038 
                                 ?>
2003 2039 
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
2004 2040 
                             <?php
2005 
-                            }else{
2041 
+                            } else{
2006 2042 
                                 echo '<div class="geodir-bubble_image"></div>';
2007 2043 
                             }
2008 2044 
                         }

@@ -2083,10 +2119,11 @@  discard block
 
 block discarded – undo
2083 2119 
      */
2084 2120 
     function geodir_new_post_default_status()
2085 2121 
     {
2086 
-        if (get_option('geodir_new_post_default_status'))
2087 
-            return get_option('geodir_new_post_default_status');
2088 
-        else
2089 
-            return 'publish';
2122 
+        if (get_option('geodir_new_post_default_status')) {
2123 
+                    return get_option('geodir_new_post_default_status');
2124 
+        } else {
2125 
+                    return 'publish';
2126 
+        }
2090 2127
2091 2128 
     }
2092 2129 
 }

@@ -2237,8 +2274,9 @@  discard block
 
 block discarded – undo
2237 2274
2238 2275 
         $all_postypes = geodir_get_posttypes();
2239 2276
2240 
-        if (!in_array($post_type, $all_postypes))
2241 
-            return false;
2277 
+        if (!in_array($post_type, $all_postypes)) {
2278 
+                    return false;
2279 
+        }
2242 2280
2243 2281 
         $table = $plugin_prefix . $post_type . '_detail';
2244 2282 
 

@@ -2506,8 +2544,9 @@  discard block
 
 block discarded – undo
2506 2544 
         $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
2507 2545
2508 2546 
         $user_meta_data = '';
2509 
-        if (isset($current_user->data->ID))
2510 
-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2547 
+        if (isset($current_user->data->ID)) {
2548 
+                    $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
2549 
+        }
2511 2550
2512 2551 
         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
2513 2552 
             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

@@ -2520,8 +2559,9 @@  discard block
 
 block discarded – undo
2520 2559
2521 2560 
             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
2522 2561 
                 $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
2523 
-            } else
2524 
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2562 
+            } else {
2563 
+                            $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
2564 
+            }
2525 2565
2526 2566 
             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
2527 2567 
                                                                                         href="javascript:void(0);"

@@ -2584,14 +2624,16 @@  discard block
 
 block discarded – undo
2584 2624 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
2585 2625
2586 2626 
             $cat_post_count = $wpdb->get_var($count_query);
2587 
-            if (empty($cat_post_count) || is_wp_error($cat_post_count))
2588 
-                $cat_post_count = 0;
2627 
+            if (empty($cat_post_count) || is_wp_error($cat_post_count)) {
2628 
+                            $cat_post_count = 0;
2629 
+            }
2589 2630
2590 2631 
             return $cat_post_count;
2591 2632
2592 
-        } else
2593 
-
2594 
-            return $term->count;
2633 
+        } else {
2634 
+
2635 
+            return $term->count;
2636 
+        }
2595 2637 
     }
2596 2638 
     return false;
2597 2639 
 

@@ -2638,13 +2680,15 @@  discard block
 
 block discarded – undo
2638 2680 
 		return $length;
2639 2681 
 	}
2640 2682
2641 
-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
2642 
-        $length = get_option('geodir_desc_word_limit');
2643 
-    elseif (get_query_var('excerpt_length'))
2644 
-        $length = get_query_var('excerpt_length');
2683 
+    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit')) {
2684 
+            $length = get_option('geodir_desc_word_limit');
2685 
+    } elseif (get_query_var('excerpt_length')) {
2686 
+            $length = get_query_var('excerpt_length');
2687 
+    }
2645 2688
2646 
-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
2647 
-        $length = get_option('geodir_author_desc_word_limit');
2689 
+    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit')) {
2690 
+            $length = get_option('geodir_author_desc_word_limit');
2691 
+    }
2648 2692
2649 2693 
     return $length;
2650 2694 
 }

@@ -2777,10 +2821,11 @@  discard block
 
 block discarded – undo
2777 2821 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)
2778 2822 
 {
2779 2823 
     $listing_author_id = geodir_get_listing_author($listing_id);
2780 
-    if ($listing_author_id == $user_id)
2781 
-        return true;
2782 
-    else
2783 
-        return false;
2824 
+    if ($listing_author_id == $user_id) {
2825 
+            return true;
2826 
+    } else {
2827 
+            return false;
2828 
+    }
2784 2829
2785 2830 
 }
2786 2831 
 

@@ -2829,10 +2874,11 @@  discard block
 
 block discarded – undo
2829 2874 
     $pattern = '/-\d+x\d+\./';
2830 2875 
     preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
2831 2876
2832 
-    if (empty($matches))
2833 
-        return '';
2834 
-    else
2835 
-        return $file;
2877 
+    if (empty($matches)) {
2878 
+            return '';
2879 
+    } else {
2880 
+            return $file;
2881 
+    }
2836 2882
2837 2883 
 }
2838 2884 
 

@@ -2917,8 +2963,9 @@  discard block
 
 block discarded – undo
2917 2963 
     } else {
2918 2964 
         //set_post_thumbnail($post_id,-1);
2919 2965
2920 
-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
2921 
-            wp_delete_attachment($post_thumbnail_id);
2966 
+        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
2967 
+                    wp_delete_attachment($post_thumbnail_id);
2968 
+        }
2922 2969
2923 2970 
     }
2924 2971 
 }

@@ -3003,8 +3050,9 @@  discard block
 
 block discarded – undo
3003 3050
3004 3051 
     global $wpdb;
3005 3052
3006 
-    if ($listing_type == '')
3007 
-        $listing_type = 'gd_place';
3053 
+    if ($listing_type == '') {
3054 
+            $listing_type = 'gd_place';
3055 
+    }
3008 3056
3009 3057 
     $fields_info = array();
3010 3058 
 

@@ -3027,8 +3075,9 @@  discard block
 
 block discarded – undo
3027 3075
3028 3076 
                 $fields_info[$prefix . 'address'] = $data->field_type;
3029 3077
3030 
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
3031 
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
3078 
+                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
3079 
+                                    $fields_info[$prefix . 'zip'] = $data->field_type;
3080 
+                }
3032 3081
3033 3082 
             } else {
3034 3083 
 

@@ -3138,7 +3187,7 @@  discard block
 
 block discarded – undo
3138 3187 
             $facebook_image = $upload_dir['baseurl'].$post->featured_image;
3139 3188
3140 3189 
         }
3141 
-    }elseif(geodir_is_page('location')){// location page
3190 
+    } elseif(geodir_is_page('location')){// location page
3142 3191 
         if (function_exists('geodir_get_location_seo')) {
3143 3192 
             $seo = geodir_get_location_seo();
3144 3193 
             if (isset($seo->seo_image) && $seo->seo_image) {
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   +156 added lines, -156 removed lines patch added patch discarded remove patch 
@@ -6,33 +6,33 @@  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 
-        /*
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 
+		/*
25 25 
          * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that.
26 26 
          * As of 4.2, however, we moved to utf8mb4, which uses 4 bytes per character. This means that an index which
27 27 
          * used to have room for floor(767/3) = 255 characters, now only has room for floor(767/4) = 191 characters.
28 28 
          */
29 
-        $max_index_length = 191;
29 
+		$max_index_length = 191;
30 30
31 
-        $collate = '';
32 
-        if ($wpdb->has_cap('collation')) {
33 
-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
34 
-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
35 
-        }
31 
+		$collate = '';
32 
+		if ($wpdb->has_cap('collation')) {
33 
+			if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";
34 
+			if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";
35 
+		}
36 36
37 37 
 		/**
38 38 
 		 * Include any functions needed for upgrades.

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

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

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

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

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

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

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

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

@@ -582,51 +582,51 @@  discard block
 
 block discarded – undo
582 582 
 			PRIMARY KEY  (id)
583 583 
 			) $collate  ";
584 584
585 
-            /**
586 
-             * Filter the SQL query that creates the review DB table structure.
587 
-             *
588 
-             * @since 1.0.0
589 
-             * @param string $sql The SQL insert query string.
590 
-             */
591 
-            $review_table = apply_filters('geodir_before_review_table_create', $review_table);
592 
-            dbDelta($review_table);
585 
+			/**
586 
+			 * Filter the SQL query that creates the review DB table structure.
587 
+			 *
588 
+			 * @since 1.0.0
589 
+			 * @param string $sql The SQL insert query string.
590 
+			 */
591 
+			$review_table = apply_filters('geodir_before_review_table_create', $review_table);
592 
+			dbDelta($review_table);
593 593
594 594
595 595
596 
-        // Alter terms table
597 
-        $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
598 
-        if (!$term_icon_column) {
599 
-            $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
600 
-        }
596 
+		// Alter terms table
597 
+		$term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
598 
+		if (!$term_icon_column) {
599 
+			$wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
600 
+		}
601 601
602 
-        //require_once(geodir_plugin_path() . '/upgrade.php');
602 
+		//require_once(geodir_plugin_path() . '/upgrade.php');
603 603
604 604
605 
-    }
605 
+	}
606 606 
 } // END MAIN FUNCTION geodir_tables_install
607 607
608 608 
 if (!function_exists('geodir_create_default_fields')) {
609 
-    /**
610 
-     * Inserts default custom fields table data into database.
611 
-     *
612 
-     * @since 1.0.0
613 
-     * @package GeoDirectory
614 
-     */
615 
-    function geodir_create_default_fields()
616 
-    {
617 
-
618 
-        $fields = geodir_default_custom_fields('gd_place');
619 
-
620 
-        /**
621 
-         * Filter the array of default custom fields DB table data.
622 
-         *
623 
-         * @since 1.0.0
624 
-         * @param string $fields The default custom fields as an array.
625 
-         */
626 
-        $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
627 
-        foreach ($fields as $field_index => $field) {
628 
-            geodir_custom_field_save($field);
609 
+	/**
610 
+	 * Inserts default custom fields table data into database.
611 
+	 *
612 
+	 * @since 1.0.0
613 
+	 * @package GeoDirectory
614 
+	 */
615 
+	function geodir_create_default_fields()
616 
+	{
617 
+
618 
+		$fields = geodir_default_custom_fields('gd_place');
619 
+
620 
+		/**
621 
+		 * Filter the array of default custom fields DB table data.
622 
+		 *
623 
+		 * @since 1.0.0
624 
+		 * @param string $fields The default custom fields as an array.
625 
+		 */
626 
+		$fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
627 
+		foreach ($fields as $field_index => $field) {
628 
+			geodir_custom_field_save($field);
629 629
630 
-        }
631 
-    }
630 
+		}
631 
+	}
632 632 
 }
633 633 
\ 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.